Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qKyYy-0021SI-1y for pgsql-hackers@arkaria.postgresql.org; Sun, 16 Jul 2023 10:01:12 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1qKyXx-00CUip-IF for pgsql-hackers@arkaria.postgresql.org; Sun, 16 Jul 2023 10:00:09 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qKyXx-00CUib-5C for pgsql-hackers@lists.postgresql.org; Sun, 16 Jul 2023 10:00:09 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1qKyXt-000n31-4u for pgsql-hackers@postgresql.org; Sun, 16 Jul 2023 10:00:08 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4faaaa476a9so5518070e87.2 for ; Sun, 16 Jul 2023 03:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689501603; x=1692093603; h=subject:to:from:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=GTVfJPShDe7jb7YMEK1qPXD8G/YmoiInj8AJ02gsBhs=; b=L6YHS9Y5pkIBDki3+YQSK0I+ncoUpJRvnQa+2jX4/eUfBvKBRPVp0erghWOijfx17/ j1G76HJnXEwzj/1xCBa6UmJtbrt5yiB54yI3Y1YkJkGY+b9ImNzBflSKtWsb43LyURMl ZX1ARbOLDXtlBgtPioDa1+2dCDSHkpV4yilvimNTIwOboGTH5d9KJF8KIkF41qEDocXx 4yQqT9c7AMSv7+PxLqjTZIray1/d673ktfVk5T+I4Ale2WPPH/rhNor+LBc8e9gDPaFO NaWhiibNfDaqE1gBxC3tqGfOhA8T+sAAzEOUN5+Q3R1/p9I75e86Y4kgIKII1kNkqmYi H9Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689501603; x=1692093603; h=subject:to:from:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GTVfJPShDe7jb7YMEK1qPXD8G/YmoiInj8AJ02gsBhs=; b=QGQA7jpzQH+61mZLA2nCVXtAHHHjRW7nWjA8RVu+AaWhiTjwE0dp+FuObtuqnPBmyK cg84/Fd5XFwBZFfro3iZF+RXH3HtiVko98w30KjTxT+6sIcbm+lZ6qwIIXlzTsY8BVql Iu3G6PW6v3z+4KhbxDgrs1aI0mtgxcuWqzY03Hjuh3rS+jUSvYXrpVWBcHpwrZmQ3mpE Ov5y3O9lFjF2s4EYrsg3nsIYt7s2aNyQ3hSumzungYsFnouu7LJOyAGag7XRLHj29aDR fQWTSK7zCWTTJMCYxMddSytYjKLWKp+hhig1rBIHlmrDvUReksDKUr5T+3pjGZbHsirD KRIA== X-Gm-Message-State: ABy/qLZBYIzK2RAPqObG7RHKU4aMCNIiEFmF3hzbalpoapNrN/EdTRB0 AzglTTH4QpbJ6da3B1WkyZOLfUI2Tm8= X-Google-Smtp-Source: APBJJlHr9M+jbVw7MWsyM7tcWLzAgqaHNy2S/Gp1ELoFuTz58zr4w3U5ItIgHw5cK1/dDmfVFfBGMg== X-Received: by 2002:a05:6512:23a6:b0:4f9:5a0c:85b8 with SMTP id c38-20020a05651223a600b004f95a0c85b8mr6777153lfv.36.1689501603285; Sun, 16 Jul 2023 03:00:03 -0700 (PDT) Received: from [1.0.0.7] ([81.23.165.115]) by smtp.gmail.com with ESMTPSA id t9-20020a19ad09000000b004fb8cb97ae3sm2246077lfc.74.2023.07.16.03.00.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jul 2023 03:00:01 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------JLuQKMz75SMt2Xji36jXXT8N" Message-ID: <8ffb4650-52c4-6a81-38fc-8f99be981130@gmail.com> Date: Sun, 16 Jul 2023 13:00:00 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US From: Alexander Lakhin To: pgsql-hackers , Noah Misch Subject: Getting rid of OverrideSearhPath in namespace.c List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------JLuQKMz75SMt2Xji36jXXT8N Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hello hackers, As a follow-up for the CVE-2023-2454 fix, I think that it makes sense to completely remove unsafe functions PushOverrideSearchPath()/PopOverrideSearchPath(), which are not used in the core now. Please look at the patch attached. Beside that, maybe it's worth to rename three functions in "Override" in their names: GetOverrideSearchPath(), CopyOverrideSearchPath(), OverrideSearchPathMatchesCurrent(), and then maybe struct OverrideSearchPath. Noah Misch proposed name GetSearchPathMatcher() for the former. What do you think? Best regards, Alexander --------------JLuQKMz75SMt2Xji36jXXT8N Content-Type: text/x-patch; charset=UTF-8; name="v1-01-get-rid-of-PPOverrideSearchPath.patch" Content-Disposition: attachment; filename="v1-01-get-rid-of-PPOverrideSearchPath.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvbmFtZXNwYWNlLmMgYi9zcmMvYmFj a2VuZC9jYXRhbG9nL25hbWVzcGFjZS5jCmluZGV4IDE0ZTU3YWRlZTIuLjkzNjEwZjk0OGUg MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NhdGFsb2cvbmFtZXNwYWNlLmMKKysrIGIvc3Jj L2JhY2tlbmQvY2F0YWxvZy9uYW1lc3BhY2UuYwpAQCAtNjcsOSArNjcsNyBAQAogICogbWF5 IGJlIGluY2x1ZGVkOgogICoKICAqIDEuIElmIGEgVEVNUCB0YWJsZSBuYW1lc3BhY2UgaGFz IGJlZW4gaW5pdGlhbGl6ZWQgaW4gdGhpcyBzZXNzaW9uLCBpdAotICogaXMgaW1wbGljaXRs eSBzZWFyY2hlZCBmaXJzdC4gIChUaGUgb25seSB0aW1lIHRoaXMgZG9lc24ndCBoYXBwZW4g aXMKLSAqIHdoZW4gd2UgYXJlIG9iZXlpbmcgYW4gb3ZlcnJpZGUgc2VhcmNoIHBhdGggc3Bl YyB0aGF0IHNheXMgbm90IHRvIHVzZSB0aGUKLSAqIHRlbXAgbmFtZXNwYWNlLCBvciB0aGUg dGVtcCBuYW1lc3BhY2UgaXMgaW5jbHVkZWQgaW4gdGhlIGV4cGxpY2l0IGxpc3QuKQorICog aXMgaW1wbGljaXRseSBzZWFyY2hlZCBmaXJzdC4KICAqCiAgKiAyLiBUaGUgc3lzdGVtIGNh dGFsb2cgbmFtZXNwYWNlIGlzIGFsd2F5cyBzZWFyY2hlZC4gIElmIHRoZSBzeXN0ZW0KICAq IG5hbWVzcGFjZSBpcyBwcmVzZW50IGluIHRoZSBleHBsaWNpdCBwYXRoIHRoZW4gaXQgd2ls bCBiZSBzZWFyY2hlZCBpbgpAQCAtMTA4LDE5ICsxMDYsMTQgQEAKICAqIG5hbWVzcGFjZSAo aWYgaXQgZXhpc3RzKSwgcHJlY2VkZWQgYnkgdGhlIHVzZXIncyBwZXJzb25hbCBuYW1lc3Bh Y2UKICAqIChpZiBvbmUgZXhpc3RzKS4KICAqCi0gKiBXZSBzdXBwb3J0IGEgc3RhY2sgb2Yg Im92ZXJyaWRlIiBzZWFyY2ggcGF0aCBzZXR0aW5ncyBmb3IgdXNlIHdpdGhpbgotICogc3Bl Y2lmaWMgc2VjdGlvbnMgb2YgYmFja2VuZCBjb2RlLiAgbmFtZXNwYWNlX3NlYXJjaF9wYXRo IGlzIGlnbm9yZWQKLSAqIHdoZW5ldmVyIHRoZSBvdmVycmlkZSBzdGFjayBpcyBub25lbXB0 eS4gIGFjdGl2ZVNlYXJjaFBhdGggaXMgYWx3YXlzCi0gKiB0aGUgYWN0dWFsbHkgYWN0aXZl IHBhdGg7IGl0IHBvaW50cyBlaXRoZXIgdG8gdGhlIHNlYXJjaCBsaXN0IG9mIHRoZQotICog dG9wbW9zdCBzdGFjayBlbnRyeSwgb3IgdG8gYmFzZVNlYXJjaFBhdGggd2hpY2ggaXMgdGhl IGxpc3QgZGVyaXZlZAotICogZnJvbSBuYW1lc3BhY2Vfc2VhcmNoX3BhdGguCisgKiBhY3Rp dmVTZWFyY2hQYXRoIGlzIGFsd2F5cyB0aGUgYWN0dWFsbHkgYWN0aXZlIHBhdGg7IGl0IHBv aW50cyB0bworICogdG8gYmFzZVNlYXJjaFBhdGggd2hpY2ggaXMgdGhlIGxpc3QgZGVyaXZl ZCBmcm9tIG5hbWVzcGFjZV9zZWFyY2hfcGF0aC4KICAqCiAgKiBJZiBiYXNlU2VhcmNoUGF0 aFZhbGlkIGlzIGZhbHNlLCB0aGVuIGJhc2VTZWFyY2hQYXRoIChhbmQgb3RoZXIKICAqIGRl cml2ZWQgdmFyaWFibGVzKSBuZWVkIHRvIGJlIHJlY29tcHV0ZWQgZnJvbSBuYW1lc3BhY2Vf c2VhcmNoX3BhdGguCiAgKiBXZSBtYXJrIGl0IGludmFsaWQgdXBvbiBhbiBhc3NpZ25tZW50 IHRvIG5hbWVzcGFjZV9zZWFyY2hfcGF0aCBvciByZWNlaXB0CiAgKiBvZiBhIHN5c2NhY2hl IGludmFsaWRhdGlvbiBldmVudCBmb3IgcGdfbmFtZXNwYWNlLiAgVGhlIHJlY29tcHV0YXRp b24KLSAqIGlzIGRvbmUgZHVyaW5nIHRoZSBuZXh0IG5vbi1vdmVycmlkZGVuIGxvb2t1cCBh dHRlbXB0LiAgTm90ZSB0aGF0IGFuCi0gKiBvdmVycmlkZSBzcGVjIGlzIG5ldmVyIHN1Ympl Y3QgdG8gcmVjb21wdXRhdGlvbi4KKyAqIGlzIGRvbmUgZHVyaW5nIHRoZSBuZXh0IGxvb2t1 cCBhdHRlbXB0LgogICoKICAqIEFueSBuYW1lc3BhY2VzIG1lbnRpb25lZCBpbiBuYW1lc3Bh Y2Vfc2VhcmNoX3BhdGggdGhhdCBhcmUgbm90IHJlYWRhYmxlCiAgKiBieSB0aGUgY3VycmVu dCB1c2VyIElEIGFyZSBzaW1wbHkgbGVmdCBvdXQgb2YgYmFzZVNlYXJjaFBhdGg7IHNvCkBA IC0xNjEsMTcgKzE1NCw2IEBAIHN0YXRpYyBPaWQJbmFtZXNwYWNlVXNlciA9IEludmFsaWRP aWQ7CiAvKiBUaGUgYWJvdmUgZm91ciB2YWx1ZXMgYXJlIHZhbGlkIG9ubHkgaWYgYmFzZVNl YXJjaFBhdGhWYWxpZCAqLwogc3RhdGljIGJvb2wgYmFzZVNlYXJjaFBhdGhWYWxpZCA9IHRy dWU7CiAKLS8qIE92ZXJyaWRlIHJlcXVlc3RzIGFyZSByZW1lbWJlcmVkIGluIGEgc3RhY2sg b2YgT3ZlcnJpZGVTdGFja0VudHJ5IHN0cnVjdHMgKi8KLQotdHlwZWRlZiBzdHJ1Y3QKLXsK LQlMaXN0CSAgICpzZWFyY2hQYXRoOwkJLyogdGhlIGRlc2lyZWQgc2VhcmNoIHBhdGggKi8K LQlPaWQJCQljcmVhdGlvbk5hbWVzcGFjZTsJLyogdGhlIGRlc2lyZWQgY3JlYXRpb24gbmFt ZXNwYWNlICovCi0JaW50CQkJbmVzdExldmVsOwkJLyogc3VidHJhbnNhY3Rpb24gbmVzdGlu ZyBsZXZlbCAqLwotfSBPdmVycmlkZVN0YWNrRW50cnk7Ci0KLXN0YXRpYyBMaXN0ICpvdmVy cmlkZVN0YWNrID0gTklMOwotCiAvKgogICogbXlUZW1wTmFtZXNwYWNlIGlzIEludmFsaWRP aWQgdW50aWwgYW5kIHVubGVzcyBhIFRFTVAgbmFtZXNwYWNlIGlzIHNldCB1cAogICogaW4g YSBwYXJ0aWN1bGFyIGJhY2tlbmQgc2Vzc2lvbiAodGhpcyBoYXBwZW5zIHdoZW4gYSBDUkVB VEUgVEVNUCBUQUJMRQpAQCAtMzM5Miw4ICszMzc0LDcgQEAgU2V0VGVtcE5hbWVzcGFjZVN0 YXRlKE9pZCB0ZW1wTmFtZXNwYWNlSWQsIE9pZCB0ZW1wVG9hc3ROYW1lc3BhY2VJZCkKIAog CiAvKgotICogR2V0T3ZlcnJpZGVTZWFyY2hQYXRoIC0gZmV0Y2ggY3VycmVudCBzZWFyY2gg cGF0aCBkZWZpbml0aW9uIGluIGZvcm0KLSAqIHVzZWQgYnkgUHVzaE92ZXJyaWRlU2VhcmNo UGF0aC4KKyAqIEdldE92ZXJyaWRlU2VhcmNoUGF0aCAtIGZldGNoIGN1cnJlbnQgc2VhcmNo IHBhdGggZGVmaW5pdGlvbi4KICAqCiAgKiBUaGUgcmVzdWx0IHN0cnVjdHVyZSBpcyBhbGxv Y2F0ZWQgaW4gdGhlIHNwZWNpZmllZCBtZW1vcnkgY29udGV4dAogICogKHdoaWNoIG1pZ2h0 IG9yIG1pZ2h0IG5vdCBiZSBlcXVhbCB0byBDdXJyZW50TWVtb3J5Q29udGV4dCk7IGJ1dCBh bnkKQEAgLTM1MTIsMTg5ICszNTEyLDYgQEAgT3ZlcnJpZGVTZWFyY2hQYXRoTWF0Y2hlc0N1 cnJlbnQoT3ZlcnJpZGVTZWFyY2hQYXRoICpwYXRoKQogCXJldHVybiB0cnVlOwogfQogCi0v KgotICogUHVzaE92ZXJyaWRlU2VhcmNoUGF0aCAtIHRlbXBvcmFyaWx5IG92ZXJyaWRlIHRo ZSBzZWFyY2ggcGF0aAotICoKLSAqIERvIG5vdCB1c2UgdGhpcyBmdW5jdGlvbjsgYWxtb3N0 IGFueSB1c2FnZSBpbnRyb2R1Y2VzIGEgc2VjdXJpdHkKLSAqIHZ1bG5lcmFiaWxpdHkuICBJ dCBleGlzdHMgZm9yIHRoZSBiZW5lZml0IG9mIGxlZ2FjeSBjb2RlIHJ1bm5pbmcgaW4KLSAq IG5vbi1zZWN1cml0eS1zZW5zaXRpdmUgZW52aXJvbm1lbnRzLgotICoKLSAqIFdlIGFsbG93 IG5lc3RlZCBvdmVycmlkZXMsIGhlbmNlIHRoZSBwdXNoL3BvcCB0ZXJtaW5vbG9neS4gIFRo ZSBHVUMKLSAqIHNlYXJjaF9wYXRoIHZhcmlhYmxlIGlzIGlnbm9yZWQgd2hpbGUgYW4gb3Zl cnJpZGUgaXMgYWN0aXZlLgotICoKLSAqIEl0J3MgcG9zc2libGUgdGhhdCBuZXdwYXRoLT51 c2VUZW1wIGlzIHNldCBidXQgdGhlcmUgaXMgbm8gbG9uZ2VyIGFueQotICogYWN0aXZlIHRl bXAgbmFtZXNwYWNlLCBpZiB0aGUgcGF0aCB3YXMgc2F2ZWQgZHVyaW5nIGEgdHJhbnNhY3Rp b24gdGhhdAotICogY3JlYXRlZCBhIHRlbXAgbmFtZXNwYWNlIGFuZCB3YXMgbGF0ZXIgcm9s bGVkIGJhY2suICBJbiB0aGF0IGNhc2Ugd2UganVzdAotICogaWdub3JlIHVzZVRlbXAuICBB IHBsYXVzaWJsZSBhbHRlcm5hdGl2ZSB3b3VsZCBiZSB0byBjcmVhdGUgYSBuZXcgdGVtcAot ICogbmFtZXNwYWNlLCBidXQgZm9yIGV4aXN0aW5nIGNhbGxlcnMgdGhhdCdzIG5vdCBuZWNl c3NhcnkgYmVjYXVzZSBhbiBlbXB0eQotICogdGVtcCBuYW1lc3BhY2Ugd291bGRuJ3QgYWZm ZWN0IHRoZWlyIHJlc3VsdHMgYW55d2F5LgotICoKLSAqIEl0J3MgYWxzbyB3b3J0aCBub3Rp bmcgdGhhdCBvdGhlciBzY2hlbWFzIGxpc3RlZCBpbiBuZXdwYXRoIG1pZ2h0IG5vdAotICog ZXhpc3QgYW55bW9yZSBlaXRoZXIuICBXZSBkb24ndCB3b3JyeSBhYm91dCB0aGlzIGJlY2F1 c2UgT0lEcyB0aGF0IG1hdGNoCi0gKiBubyBleGlzdGluZyBuYW1lc3BhY2Ugd2lsbCBzaW1w bHkgbm90IHByb2R1Y2UgYW55IGhpdHMgZHVyaW5nIHNlYXJjaGVzLgotICovCi12b2lkCi1Q dXNoT3ZlcnJpZGVTZWFyY2hQYXRoKE92ZXJyaWRlU2VhcmNoUGF0aCAqbmV3cGF0aCkKLXsK LQlPdmVycmlkZVN0YWNrRW50cnkgKmVudHJ5OwotCUxpc3QJICAgKm9pZGxpc3Q7Ci0JT2lk CQkJZmlyc3ROUzsKLQlNZW1vcnlDb250ZXh0IG9sZGN4dDsKLQotCS8qCi0JICogQ29weSB0 aGUgbGlzdCBmb3Igc2FmZWtlZXBpbmcsIGFuZCBpbnNlcnQgaW1wbGljaXRseS1zZWFyY2hl ZAotCSAqIG5hbWVzcGFjZXMgYXMgbmVlZGVkLiAgVGhpcyBjb2RlIHNob3VsZCB0cmFjayBy ZWNvbXB1dGVOYW1lc3BhY2VQYXRoLgotCSAqLwotCW9sZGN4dCA9IE1lbW9yeUNvbnRleHRT d2l0Y2hUbyhUb3BNZW1vcnlDb250ZXh0KTsKLQotCW9pZGxpc3QgPSBsaXN0X2NvcHkobmV3 cGF0aC0+c2NoZW1hcyk7Ci0KLQkvKgotCSAqIFJlbWVtYmVyIHRoZSBmaXJzdCBtZW1iZXIg b2YgdGhlIGV4cGxpY2l0IGxpc3QuCi0JICovCi0JaWYgKG9pZGxpc3QgPT0gTklMKQotCQlm aXJzdE5TID0gSW52YWxpZE9pZDsKLQllbHNlCi0JCWZpcnN0TlMgPSBsaW5pdGlhbF9vaWQo b2lkbGlzdCk7Ci0KLQkvKgotCSAqIEFkZCBhbnkgaW1wbGljaXRseS1zZWFyY2hlZCBuYW1l c3BhY2VzIHRvIHRoZSBsaXN0LiAgTm90ZSB0aGVzZSBnbyBvbgotCSAqIHRoZSBmcm9udCwg bm90IHRoZSBiYWNrOyBhbHNvIG5vdGljZSB0aGF0IHdlIGRvIG5vdCBjaGVjayBVU0FHRQot CSAqIHBlcm1pc3Npb25zIGZvciB0aGVzZS4KLQkgKi8KLQlpZiAobmV3cGF0aC0+YWRkQ2F0 YWxvZykKLQkJb2lkbGlzdCA9IGxjb25zX29pZChQR19DQVRBTE9HX05BTUVTUEFDRSwgb2lk bGlzdCk7Ci0KLQlpZiAobmV3cGF0aC0+YWRkVGVtcCAmJiBPaWRJc1ZhbGlkKG15VGVtcE5h bWVzcGFjZSkpCi0JCW9pZGxpc3QgPSBsY29uc19vaWQobXlUZW1wTmFtZXNwYWNlLCBvaWRs aXN0KTsKLQotCS8qCi0JICogQnVpbGQgdGhlIG5ldyBzdGFjayBlbnRyeSwgdGhlbiBpbnNl cnQgaXQgYXQgdGhlIGhlYWQgb2YgdGhlIGxpc3QuCi0JICovCi0JZW50cnkgPSAoT3ZlcnJp ZGVTdGFja0VudHJ5ICopIHBhbGxvYyhzaXplb2YoT3ZlcnJpZGVTdGFja0VudHJ5KSk7Ci0J ZW50cnktPnNlYXJjaFBhdGggPSBvaWRsaXN0OwotCWVudHJ5LT5jcmVhdGlvbk5hbWVzcGFj ZSA9IGZpcnN0TlM7Ci0JZW50cnktPm5lc3RMZXZlbCA9IEdldEN1cnJlbnRUcmFuc2FjdGlv bk5lc3RMZXZlbCgpOwotCi0Jb3ZlcnJpZGVTdGFjayA9IGxjb25zKGVudHJ5LCBvdmVycmlk ZVN0YWNrKTsKLQotCS8qIEFuZCBtYWtlIGl0IGFjdGl2ZS4gKi8KLQlhY3RpdmVTZWFyY2hQ YXRoID0gZW50cnktPnNlYXJjaFBhdGg7Ci0JYWN0aXZlQ3JlYXRpb25OYW1lc3BhY2UgPSBl bnRyeS0+Y3JlYXRpb25OYW1lc3BhY2U7Ci0JYWN0aXZlVGVtcENyZWF0aW9uUGVuZGluZyA9 IGZhbHNlOwkvKiBYWFggaXMgdGhpcyBPSz8gKi8KLQotCS8qCi0JICogV2UgYWx3YXlzIGlu Y3JlbWVudCBhY3RpdmVQYXRoR2VuZXJhdGlvbiB3aGVuIHB1c2hpbmcvcG9wcGluZyBhbgot CSAqIG92ZXJyaWRlIHBhdGguICBJbiBjdXJyZW50IHVzYWdlLCB0aGVzZSBhY3Rpb25zIGFs d2F5cyBjaGFuZ2UgdGhlCi0JICogZWZmZWN0aXZlIHBhdGggc3RhdGUsIHNvIHRoZXJlJ3Mg bm8gdmFsdWUgaW4gY2hlY2tpbmcgdG8gc2VlIGlmIGl0Ci0JICogZGlkbid0IGNoYW5nZS4K LQkgKi8KLQlhY3RpdmVQYXRoR2VuZXJhdGlvbisrOwotCi0JTWVtb3J5Q29udGV4dFN3aXRj aFRvKG9sZGN4dCk7Ci19Ci0KLS8qCi0gKiBQb3BPdmVycmlkZVNlYXJjaFBhdGggLSB1bmRv IGEgcHJldmlvdXMgUHVzaE92ZXJyaWRlU2VhcmNoUGF0aAotICoKLSAqIEFueSBwdXNoIGR1 cmluZyBhIChzdWIpdHJhbnNhY3Rpb24gd2lsbCBiZSBwb3BwZWQgYXV0b21hdGljYWxseSBh dCBhYm9ydC4KLSAqIEJ1dCBpdCdzIGNhbGxlciBlcnJvciBpZiBhIHB1c2ggaXNuJ3QgcG9w cGVkIGluIG5vcm1hbCBjb250cm9sIGZsb3cuCi0gKi8KLXZvaWQKLVBvcE92ZXJyaWRlU2Vh cmNoUGF0aCh2b2lkKQotewotCU92ZXJyaWRlU3RhY2tFbnRyeSAqZW50cnk7Ci0KLQkvKiBT YW5pdHkgY2hlY2tzLiAqLwotCWlmIChvdmVycmlkZVN0YWNrID09IE5JTCkKLQkJZWxvZyhF UlJPUiwgImJvZ3VzIFBvcE92ZXJyaWRlU2VhcmNoUGF0aCBjYWxsIik7Ci0JZW50cnkgPSAo T3ZlcnJpZGVTdGFja0VudHJ5ICopIGxpbml0aWFsKG92ZXJyaWRlU3RhY2spOwotCWlmIChl bnRyeS0+bmVzdExldmVsICE9IEdldEN1cnJlbnRUcmFuc2FjdGlvbk5lc3RMZXZlbCgpKQot CQllbG9nKEVSUk9SLCAiYm9ndXMgUG9wT3ZlcnJpZGVTZWFyY2hQYXRoIGNhbGwiKTsKLQot CS8qIFBvcCB0aGUgc3RhY2sgYW5kIGZyZWUgc3RvcmFnZS4gKi8KLQlvdmVycmlkZVN0YWNr ID0gbGlzdF9kZWxldGVfZmlyc3Qob3ZlcnJpZGVTdGFjayk7Ci0JbGlzdF9mcmVlKGVudHJ5 LT5zZWFyY2hQYXRoKTsKLQlwZnJlZShlbnRyeSk7Ci0KLQkvKiBBY3RpdmF0ZSB0aGUgbmV4 dCBsZXZlbCBkb3duLiAqLwotCWlmIChvdmVycmlkZVN0YWNrKQotCXsKLQkJZW50cnkgPSAo T3ZlcnJpZGVTdGFja0VudHJ5ICopIGxpbml0aWFsKG92ZXJyaWRlU3RhY2spOwotCQlhY3Rp dmVTZWFyY2hQYXRoID0gZW50cnktPnNlYXJjaFBhdGg7Ci0JCWFjdGl2ZUNyZWF0aW9uTmFt ZXNwYWNlID0gZW50cnktPmNyZWF0aW9uTmFtZXNwYWNlOwotCQlhY3RpdmVUZW1wQ3JlYXRp b25QZW5kaW5nID0gZmFsc2U7CS8qIFhYWCBpcyB0aGlzIE9LPyAqLwotCX0KLQllbHNlCi0J ewotCQkvKiBJZiBub3QgYmFzZVNlYXJjaFBhdGhWYWxpZCwgdGhpcyBpcyB1c2VsZXNzIGJ1 dCBoYXJtbGVzcyAqLwotCQlhY3RpdmVTZWFyY2hQYXRoID0gYmFzZVNlYXJjaFBhdGg7Ci0J CWFjdGl2ZUNyZWF0aW9uTmFtZXNwYWNlID0gYmFzZUNyZWF0aW9uTmFtZXNwYWNlOwotCQlh Y3RpdmVUZW1wQ3JlYXRpb25QZW5kaW5nID0gYmFzZVRlbXBDcmVhdGlvblBlbmRpbmc7Ci0J fQotCi0JLyogQXMgYWJvdmUsIHRoZSBnZW5lcmF0aW9uIGFsd2F5cyBpbmNyZW1lbnRzLiAq LwotCWFjdGl2ZVBhdGhHZW5lcmF0aW9uKys7Ci19Ci0KLQotLyoKLSAqIGdldF9jb2xsYXRp b25fb2lkIC0gZmluZCBhIGNvbGxhdGlvbiBieSBwb3NzaWJseSBxdWFsaWZpZWQgbmFtZQot ICoKLSAqIE5vdGUgdGhhdCB0aGlzIHdpbGwgb25seSBmaW5kIGNvbGxhdGlvbnMgdGhhdCB3 b3JrIHdpdGggdGhlIGN1cnJlbnQKLSAqIGRhdGFiYXNlJ3MgZW5jb2RpbmcuCi0gKi8KLU9p ZAotZ2V0X2NvbGxhdGlvbl9vaWQoTGlzdCAqY29sbG5hbWUsIGJvb2wgbWlzc2luZ19vaykK LXsKLQljaGFyCSAgICpzY2hlbWFuYW1lOwotCWNoYXIJICAgKmNvbGxhdGlvbl9uYW1lOwot CWludDMyCQlkYmVuY29kaW5nID0gR2V0RGF0YWJhc2VFbmNvZGluZygpOwotCU9pZAkJCW5h bWVzcGFjZUlkOwotCU9pZAkJCWNvbGxvaWQ7Ci0JTGlzdENlbGwgICAqbDsKLQotCS8qIGRl Y29uc3RydWN0IHRoZSBuYW1lIGxpc3QgKi8KLQlEZWNvbnN0cnVjdFF1YWxpZmllZE5hbWUo Y29sbG5hbWUsICZzY2hlbWFuYW1lLCAmY29sbGF0aW9uX25hbWUpOwotCi0JaWYgKHNjaGVt YW5hbWUpCi0JewotCQkvKiB1c2UgZXhhY3Qgc2NoZW1hIGdpdmVuICovCi0JCW5hbWVzcGFj ZUlkID0gTG9va3VwRXhwbGljaXROYW1lc3BhY2Uoc2NoZW1hbmFtZSwgbWlzc2luZ19vayk7 Ci0JCWlmIChtaXNzaW5nX29rICYmICFPaWRJc1ZhbGlkKG5hbWVzcGFjZUlkKSkKLQkJCXJl dHVybiBJbnZhbGlkT2lkOwotCi0JCWNvbGxvaWQgPSBsb29rdXBfY29sbGF0aW9uKGNvbGxh dGlvbl9uYW1lLCBuYW1lc3BhY2VJZCwgZGJlbmNvZGluZyk7Ci0JCWlmIChPaWRJc1ZhbGlk KGNvbGxvaWQpKQotCQkJcmV0dXJuIGNvbGxvaWQ7Ci0JfQotCWVsc2UKLQl7Ci0JCS8qIHNl YXJjaCBmb3IgaXQgaW4gc2VhcmNoIHBhdGggKi8KLQkJcmVjb21wdXRlTmFtZXNwYWNlUGF0 aCgpOwotCi0JCWZvcmVhY2gobCwgYWN0aXZlU2VhcmNoUGF0aCkKLQkJewotCQkJbmFtZXNw YWNlSWQgPSBsZmlyc3Rfb2lkKGwpOwotCi0JCQlpZiAobmFtZXNwYWNlSWQgPT0gbXlUZW1w TmFtZXNwYWNlKQotCQkJCWNvbnRpbnVlOwkJLyogZG8gbm90IGxvb2sgaW4gdGVtcCBuYW1l c3BhY2UgKi8KLQotCQkJY29sbG9pZCA9IGxvb2t1cF9jb2xsYXRpb24oY29sbGF0aW9uX25h bWUsIG5hbWVzcGFjZUlkLCBkYmVuY29kaW5nKTsKLQkJCWlmIChPaWRJc1ZhbGlkKGNvbGxv aWQpKQotCQkJCXJldHVybiBjb2xsb2lkOwotCQl9Ci0JfQotCi0JLyogTm90IGZvdW5kIGlu IHBhdGggKi8KLQlpZiAoIW1pc3Npbmdfb2spCi0JCWVyZXBvcnQoRVJST1IsCi0JCQkJKGVy cmNvZGUoRVJSQ09ERV9VTkRFRklORURfT0JKRUNUKSwKLQkJCQkgZXJybXNnKCJjb2xsYXRp b24gXCIlc1wiIGZvciBlbmNvZGluZyBcIiVzXCIgZG9lcyBub3QgZXhpc3QiLAotCQkJCQkJ TmFtZUxpc3RUb1N0cmluZyhjb2xsbmFtZSksIEdldERhdGFiYXNlRW5jb2RpbmdOYW1lKCkp KSk7Ci0JcmV0dXJuIEludmFsaWRPaWQ7Ci19Ci0KIC8qCiAgKiBnZXRfY29udmVyc2lvbl9v aWQgLSBmaW5kIGEgY29udmVyc2lvbiBieSBwb3NzaWJseSBxdWFsaWZpZWQgbmFtZQogICov CkBAIC0zNzkwLDEwICszNjQ5LDYgQEAgcmVjb21wdXRlTmFtZXNwYWNlUGF0aCh2b2lkKQog CWJvb2wJCXBhdGhDaGFuZ2VkOwogCU1lbW9yeUNvbnRleHQgb2xkY3h0OwogCi0JLyogRG8g bm90aGluZyBpZiBhbiBvdmVycmlkZSBzZWFyY2ggc3BlYyBpcyBhY3RpdmUuICovCi0JaWYg KG92ZXJyaWRlU3RhY2spCi0JCXJldHVybjsKLQogCS8qIERvIG5vdGhpbmcgaWYgcGF0aCBp cyBhbHJlYWR5IHZhbGlkLiAqLwogCWlmIChiYXNlU2VhcmNoUGF0aFZhbGlkICYmIG5hbWVz cGFjZVVzZXIgPT0gcm9sZWlkKQogCQlyZXR1cm47CkBAIC0zOTMyLDEwICszNzg3LDcgQEAg cmVjb21wdXRlTmFtZXNwYWNlUGF0aCh2b2lkKQogCiAJLyoKIAkgKiBCdW1wIHRoZSBnZW5l cmF0aW9uIG9ubHkgaWYgc29tZXRoaW5nIGFjdHVhbGx5IGNoYW5nZWQuICAoTm90aWNlIHRo YXQKLQkgKiB3aGF0IHdlIGNvbXBhcmVkIHRvIHdhcyB0aGUgb2xkIHN0YXRlIG9mIHRoZSBi YXNlIHBhdGggdmFyaWFibGVzOyBzbwotCSAqIHRoaXMgZG9lcyBub3QgZGVhbCB3aXRoIHRo ZSBzaXR1YXRpb24gd2hlcmUgd2UgaGF2ZSBqdXN0IHBvcHBlZCBhbgotCSAqIG92ZXJyaWRl IHBhdGggYW5kIHJlc3RvcmVkIHRoZSBwcmlvciBzdGF0ZSBvZiB0aGUgYmFzZSBwYXRoLiAg SW5zdGVhZAotCSAqIHdlIHJlbHkgb24gdGhlIG92ZXJyaWRlLXBvcHBpbmcgbG9naWMgdG8g aGF2ZSBidW1wZWQgdGhlIGdlbmVyYXRpb24uKQorCSAqIHdoYXQgd2UgY29tcGFyZWQgdG8g d2FzIHRoZSBvbGQgc3RhdGUgb2YgdGhlIGJhc2UgcGF0aCB2YXJpYWJsZXMuKQogCSAqLwog CWlmIChwYXRoQ2hhbmdlZCkKIAkJYWN0aXZlUGF0aEdlbmVyYXRpb24rKzsKQEAgLTQxMzgs MjkgKzM5OTAsNiBAQCBBdEVPWGFjdF9OYW1lc3BhY2UoYm9vbCBpc0NvbW1pdCwgYm9vbCBw YXJhbGxlbCkKIAkJbXlUZW1wTmFtZXNwYWNlU3ViSUQgPSBJbnZhbGlkU3ViVHJhbnNhY3Rp b25JZDsKIAl9CiAKLQkvKgotCSAqIENsZWFuIHVwIGlmIHNvbWVvbmUgZmFpbGVkIHRvIGRv IFBvcE92ZXJyaWRlU2VhcmNoUGF0aAotCSAqLwotCWlmIChvdmVycmlkZVN0YWNrKQotCXsK LQkJaWYgKGlzQ29tbWl0KQotCQkJZWxvZyhXQVJOSU5HLCAibGVha2VkIG92ZXJyaWRlIHNl YXJjaCBwYXRoIik7Ci0JCXdoaWxlIChvdmVycmlkZVN0YWNrKQotCQl7Ci0JCQlPdmVycmlk ZVN0YWNrRW50cnkgKmVudHJ5OwotCi0JCQllbnRyeSA9IChPdmVycmlkZVN0YWNrRW50cnkg KikgbGluaXRpYWwob3ZlcnJpZGVTdGFjayk7Ci0JCQlvdmVycmlkZVN0YWNrID0gbGlzdF9k ZWxldGVfZmlyc3Qob3ZlcnJpZGVTdGFjayk7Ci0JCQlsaXN0X2ZyZWUoZW50cnktPnNlYXJj aFBhdGgpOwotCQkJcGZyZWUoZW50cnkpOwotCQl9Ci0JCS8qIElmIG5vdCBiYXNlU2VhcmNo UGF0aFZhbGlkLCB0aGlzIGlzIHVzZWxlc3MgYnV0IGhhcm1sZXNzICovCi0JCWFjdGl2ZVNl YXJjaFBhdGggPSBiYXNlU2VhcmNoUGF0aDsKLQkJYWN0aXZlQ3JlYXRpb25OYW1lc3BhY2Ug PSBiYXNlQ3JlYXRpb25OYW1lc3BhY2U7Ci0JCWFjdGl2ZVRlbXBDcmVhdGlvblBlbmRpbmcg PSBiYXNlVGVtcENyZWF0aW9uUGVuZGluZzsKLQkJLyogQWx3YXlzIGJ1bXAgZ2VuZXJhdGlv biAtLS0gc2VlIG5vdGUgaW4gcmVjb21wdXRlTmFtZXNwYWNlUGF0aCAqLwotCQlhY3RpdmVQ YXRoR2VuZXJhdGlvbisrOwotCX0KIH0KIAogLyoKQEAgLTQxNzUsNyArNDAwNCw2IEBAIHZv aWQKIEF0RU9TdWJYYWN0X05hbWVzcGFjZShib29sIGlzQ29tbWl0LCBTdWJUcmFuc2FjdGlv bklkIG15U3ViaWQsCiAJCQkJCSAgU3ViVHJhbnNhY3Rpb25JZCBwYXJlbnRTdWJpZCkKIHsK LQlPdmVycmlkZVN0YWNrRW50cnkgKmVudHJ5OwogCiAJaWYgKG15VGVtcE5hbWVzcGFjZVN1 YklEID09IG15U3ViaWQpCiAJewpAQCAtNDIwMSw1MSArNDAyOSw2IEBAIEF0RU9TdWJYYWN0 X05hbWVzcGFjZShib29sIGlzQ29tbWl0LCBTdWJUcmFuc2FjdGlvbklkIG15U3ViaWQsCiAJ CQlNeVByb2MtPnRlbXBOYW1lc3BhY2VJZCA9IEludmFsaWRPaWQ7CiAJCX0KIAl9Ci0KLQkv KgotCSAqIENsZWFuIHVwIGlmIHNvbWVvbmUgZmFpbGVkIHRvIGRvIFBvcE92ZXJyaWRlU2Vh cmNoUGF0aAotCSAqLwotCXdoaWxlIChvdmVycmlkZVN0YWNrKQotCXsKLQkJZW50cnkgPSAo T3ZlcnJpZGVTdGFja0VudHJ5ICopIGxpbml0aWFsKG92ZXJyaWRlU3RhY2spOwotCQlpZiAo ZW50cnktPm5lc3RMZXZlbCA8IEdldEN1cnJlbnRUcmFuc2FjdGlvbk5lc3RMZXZlbCgpKQot CQkJYnJlYWs7Ci0JCWlmIChpc0NvbW1pdCkKLQkJCWVsb2coV0FSTklORywgImxlYWtlZCBv dmVycmlkZSBzZWFyY2ggcGF0aCIpOwotCQlvdmVycmlkZVN0YWNrID0gbGlzdF9kZWxldGVf Zmlyc3Qob3ZlcnJpZGVTdGFjayk7Ci0JCWxpc3RfZnJlZShlbnRyeS0+c2VhcmNoUGF0aCk7 Ci0JCXBmcmVlKGVudHJ5KTsKLQkJLyogQWx3YXlzIGJ1bXAgZ2VuZXJhdGlvbiAtLS0gc2Vl IG5vdGUgaW4gcmVjb21wdXRlTmFtZXNwYWNlUGF0aCAqLwotCQlhY3RpdmVQYXRoR2VuZXJh dGlvbisrOwotCX0KLQotCS8qIEFjdGl2YXRlIHRoZSBuZXh0IGxldmVsIGRvd24uICovCi0J aWYgKG92ZXJyaWRlU3RhY2spCi0JewotCQllbnRyeSA9IChPdmVycmlkZVN0YWNrRW50cnkg KikgbGluaXRpYWwob3ZlcnJpZGVTdGFjayk7Ci0JCWFjdGl2ZVNlYXJjaFBhdGggPSBlbnRy eS0+c2VhcmNoUGF0aDsKLQkJYWN0aXZlQ3JlYXRpb25OYW1lc3BhY2UgPSBlbnRyeS0+Y3Jl YXRpb25OYW1lc3BhY2U7Ci0JCWFjdGl2ZVRlbXBDcmVhdGlvblBlbmRpbmcgPSBmYWxzZTsJ LyogWFhYIGlzIHRoaXMgT0s/ICovCi0KLQkJLyoKLQkJICogSXQncyBwcm9iYWJseSB1bm5l Y2Vzc2FyeSB0byBidW1wIGdlbmVyYXRpb24gaGVyZSwgYnV0IHRoaXMgc2hvdWxkCi0JCSAq IG5vdCBiZSBhIHBlcmZvcm1hbmNlLWNyaXRpY2FsIGNhc2UsIHNvIGJldHRlciB0byBiZSBv dmVyLWNhdXRpb3VzLgotCQkgKi8KLQkJYWN0aXZlUGF0aEdlbmVyYXRpb24rKzsKLQl9Ci0J ZWxzZQotCXsKLQkJLyogSWYgbm90IGJhc2VTZWFyY2hQYXRoVmFsaWQsIHRoaXMgaXMgdXNl bGVzcyBidXQgaGFybWxlc3MgKi8KLQkJYWN0aXZlU2VhcmNoUGF0aCA9IGJhc2VTZWFyY2hQ YXRoOwotCQlhY3RpdmVDcmVhdGlvbk5hbWVzcGFjZSA9IGJhc2VDcmVhdGlvbk5hbWVzcGFj ZTsKLQkJYWN0aXZlVGVtcENyZWF0aW9uUGVuZGluZyA9IGJhc2VUZW1wQ3JlYXRpb25QZW5k aW5nOwotCi0JCS8qCi0JCSAqIElmIHdlIHBvcHBlZCBhbiBvdmVycmlkZSBzdGFjayBlbnRy eSwgdGhlbiB3ZSBhbHJlYWR5IGJ1bXBlZCB0aGUKLQkJICogZ2VuZXJhdGlvbiBhYm92ZS4g IElmIHdlIGRpZCBub3QsIHRoZW4gdGhlIGFib3ZlIGFzc2lnbm1lbnRzIGRpZAotCQkgKiBu b3RoaW5nIGFuZCB3ZSBuZWVkIG5vdCBidW1wIHRoZSBnZW5lcmF0aW9uLgotCQkgKi8KLQl9 CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9jb21tYW5kcy9leHRlbnNpb24u YyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL2V4dGVuc2lvbi5jCmluZGV4IGIxNTA5Y2M1MDUu LjE1Y2MxZmY5OWUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL2V4dGVuc2lv bi5jCisrKyBiL3NyYy9iYWNrZW5kL2NvbW1hbmRzL2V4dGVuc2lvbi5jCkBAIC05NDcsMTEg Kzk0Nyw2IEBAIGV4ZWN1dGVfZXh0ZW5zaW9uX3NjcmlwdChPaWQgZXh0ZW5zaW9uT2lkLCBF eHRlbnNpb25Db250cm9sRmlsZSAqY29udHJvbCwKIAkgKiBzZWFyY2hlZCBhbnl3YXkuICAo TGlzdGluZyBwZ19jYXRhbG9nIGV4cGxpY2l0bHkgaW4gYSBub24tZmlyc3QKIAkgKiBwb3Np dGlvbiB3b3VsZCBiZSBiYWQgZm9yIHNlY3VyaXR5LikgIEZpbmFsbHkgYWRkIHBnX3RlbXAg dG8gZW5zdXJlCiAJICogdGhhdCB0ZW1wIG9iamVjdHMgY2FuJ3QgdGFrZSBwcmVjZWRlbmNl IG92ZXIgb3RoZXJzLgotCSAqCi0JICogTm90ZTogaXQgbWlnaHQgbG9vayB0ZW1wdGluZyB0 byB1c2UgUHVzaE92ZXJyaWRlU2VhcmNoUGF0aCBmb3IgdGhpcywKLQkgKiBidXQgd2UgY2Fu bm90IGRvIHRoYXQuICBXZSBoYXZlIHRvIGFjdHVhbGx5IHNldCB0aGUgc2VhcmNoX3BhdGgg R1VDIGluCi0JICogY2FzZSB0aGUgZXh0ZW5zaW9uIHNjcmlwdCBleGFtaW5lcyBvciBjaGFu Z2VzIGl0LiAgSW4gYW55IGNhc2UsIHRoZQotCSAqIEdVQ19BQ1RJT05fU0FWRSBtZXRob2Qg aXMganVzdCBhcyBjb252ZW5pZW50LgogCSAqLwogCWluaXRTdHJpbmdJbmZvKCZwYXRoYnVm KTsKIAlhcHBlbmRTdHJpbmdJbmZvU3RyaW5nKCZwYXRoYnVmLCBxdW90ZV9pZGVudGlmaWVy KHNjaGVtYU5hbWUpKTsKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvbmFtZXNw YWNlLmggYi9zcmMvaW5jbHVkZS9jYXRhbG9nL25hbWVzcGFjZS5oCmluZGV4IGY2NGEwZWMy NmIuLjkzZTBjMTIzNDUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvbmFtZXNw YWNlLmgKKysrIGIvc3JjL2luY2x1ZGUvY2F0YWxvZy9uYW1lc3BhY2UuaApAQCAtMTY3LDgg KzE2Nyw2IEBAIGV4dGVybiB2b2lkIFJlc2V0VGVtcFRhYmxlTmFtZXNwYWNlKHZvaWQpOwog ZXh0ZXJuIE92ZXJyaWRlU2VhcmNoUGF0aCAqR2V0T3ZlcnJpZGVTZWFyY2hQYXRoKE1lbW9y eUNvbnRleHQgY29udGV4dCk7CiBleHRlcm4gT3ZlcnJpZGVTZWFyY2hQYXRoICpDb3B5T3Zl cnJpZGVTZWFyY2hQYXRoKE92ZXJyaWRlU2VhcmNoUGF0aCAqcGF0aCk7CiBleHRlcm4gYm9v bCBPdmVycmlkZVNlYXJjaFBhdGhNYXRjaGVzQ3VycmVudChPdmVycmlkZVNlYXJjaFBhdGgg KnBhdGgpOwotZXh0ZXJuIHZvaWQgUHVzaE92ZXJyaWRlU2VhcmNoUGF0aChPdmVycmlkZVNl YXJjaFBhdGggKm5ld3BhdGgpOwotZXh0ZXJuIHZvaWQgUG9wT3ZlcnJpZGVTZWFyY2hQYXRo KHZvaWQpOwogCiBleHRlcm4gT2lkCWdldF9jb2xsYXRpb25fb2lkKExpc3QgKmNvbGxuYW1l LCBib29sIG1pc3Npbmdfb2spOwogZXh0ZXJuIE9pZAlnZXRfY29udmVyc2lvbl9vaWQoTGlz dCAqY29ubmFtZSwgYm9vbCBtaXNzaW5nX29rKTsKZGlmZiAtLWdpdCBhL3NyYy90b29scy9w Z2luZGVudC90eXBlZGVmcy5saXN0IGIvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxp c3QKaW5kZXggNDVmYzU3NTljZS4uMTlmYjRmODMwMyAxMDA2NDQKLS0tIGEvc3JjL3Rvb2xz L3BnaW5kZW50L3R5cGVkZWZzLmxpc3QKKysrIGIvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVk ZWZzLmxpc3QKQEAgLTE2NjYsNyArMTY2Niw2IEBAIE91dHB1dFBsdWdpbkNhbGxiYWNrcwog T3V0cHV0UGx1Z2luT3B0aW9ucwogT3V0cHV0UGx1Z2luT3V0cHV0VHlwZQogT3ZlcnJpZGVT ZWFyY2hQYXRoCi1PdmVycmlkZVN0YWNrRW50cnkKIE92ZXJyaWRpbmdLaW5kCiBQQUNFX0hF QURFUgogUEFDTAo= --------------JLuQKMz75SMt2Xji36jXXT8N--