159218 2016-06-28 12:19:54 -0700 PaymentMerchantSession should wrap a PKPaymentMerchantSession 2016-06-28 12:31:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1206116 0 andersca 2016-06-28 12:19:54 -0700 PaymentMerchantSession should wrap a PKPaymentMerchantSession 1206117 1 282266 andersca 2016-06-28 12:23:05 -0700 Created attachment 282266 Patch 1206122 2 andersca 2016-06-28 12:31:31 -0700 Committed r202581: <http://trac.webkit.org/changeset/202581> 282266 2016-06-28 12:23:05 -0700 2016-06-28 12:28:32 -0700 Patch bug-159218-20160628122248.patch text/plain 23088 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmJmODJmYTk5ZThlNTQx YzlhZTE5Nzk5ZTE2YzA5ZmYwMGI1NTM4Yi4uNjhkMTFmM2QzNzI0OGZhMTU2Mjg1ZmFiZTA5YmNi ZDQ0NWMyNTJiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE2LTA2LTI4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUGF5bWVudE1lcmNo YW50U2Vzc2lvbiBzaG91bGQgd3JhcCBhIFBLUGF5bWVudE1lcmNoYW50U2Vzc2lvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MjE4CisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzI2ODcyMTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBcHBsZVBheVNlc3Npb246OmNvbXBsZXRlTWVyY2hhbnRWYWxp ZGF0aW9uKToKKyAgICAgICAgVXNlIFBheW1lbnRNZXJjaGFudFNlc3Npb246OmZyb21KUy4KKwor ICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlTWVyY2hhbnRTZXNzaW9uKTogRGVsZXRlZC4KKworICAg ICAgICAqIE1vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmg6CisgICAgICAgIFBh eW1lbnRNZXJjaGFudFNlc3Npb24gaXMgbm93IGEgY2xhc3MuCisKKyAgICAgICAgKiBNb2R1bGVz L2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNsaWVudC5oOgorICAgICAgICBQYXltZW50TWVy Y2hhbnRTZXNzaW9uIGlzIG5vdyBhIGNsYXNzLgorCisgICAgICAgICogTW9kdWxlcy9hcHBsZXBh eS9QYXltZW50TWVyY2hhbnRTZXNzaW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpQYXltZW50TWVy Y2hhbnRTZXNzaW9uOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlBheW1lbnRNZXJjaGFudFNlc3Npb246On5QYXltZW50TWVyY2hhbnRTZXNzaW9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb246OnBrUGF5bWVudE1lcmNoYW50U2Vz c2lvbik6CisgICAgICAgIFN0b3JlIGEgUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uIGluIGEgUmV0 YWluUHRyIGluc2lkZSB0aGUgUGF5bWVudE1lcmNoYW50U2Vzc2lvbiBvYmplY3QuCisKKyAgICAg ICAgKiBNb2R1bGVzL2FwcGxlcGF5L2NvY29hL1BheW1lbnRNZXJjaGFudFNlc3Npb25Db2NvYS5t bToKKyAgICAgICAgKFdlYkNvcmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb246OmZyb21KUyk6Cisg ICAgICAgIENvbnZlcnQgdGhlIEpTIG9iamVjdCB0byBhIFBLUGF5bWVudE1lcmNoYW50U2Vzc2lv biBhbmQgcmV0dXJuIGEgUGF5bWVudE1lcmNoYW50U2Vzc2lvbiB0aGF0IHdyYXBzIGl0LgorCisg ICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBBZGQg bmV3IGZpbGVzLgorCisgICAgICAgICogYmluZGluZ3MvanMvRGljdGlvbmFyeS5oOgorICAgICAg ICAoV2ViQ29yZTo6RGljdGlvbmFyeTo6aW5pdGlhbGl6ZXJPYmplY3QpOgorICAgICAgICBBZGQg bmV3IGdldHRlci4KKwogMjAxNi0wNi0yOCAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5j b20+CiAKICAgICAgICAgUGhyYXNpbmcgY29udGVudCBzaG91bGQgYmUgYWNjZXB0ZWQgaW4gPG1v PiBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGNmMjYwZWVmYTE0NDVmZjlkN2UxZGQwNDVmYzIwNzVh YjFjZjU4ODIuLjNkMWE2NDQzZGJjZTBhZjAwN2U1YThhYzRmNGU1YmZiODkyODhmNWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNi0wNi0yOCAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFBheW1lbnRNZXJjaGFudFNlc3Npb24gc2hvdWxk IHdyYXAgYSBQS1BheW1lbnRNZXJjaGFudFNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTIxOAorICAgICAgICByZGFyOi8vcHJvYmxlbS8y Njg3MjExOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgorICAgICAgICAo SVBDOjpBcmd1bWVudENvZGVyPFdlYkNvcmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb24+OjplbmNv ZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFdlYkNvcmU6OlBheW1lbnRNZXJjaGFu dFNlc3Npb24+OjpkZWNvZGUpOgorICAgICAgICBVc2UgTlNDb2Rlci4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5oOgorICAgICAgICBQ YXltZW50TWVyY2hhbnRTZXNzaW9uIGlzIG5vdyBhIGNsYXNzLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Lm1lc3NhZ2VzLmluOgorICAg ICAgICBQYXltZW50TWVyY2hhbnRTZXNzaW9uIGlzIG5vdyBhIGNsYXNzLgorCisgICAgICAgICog VUlQcm9jZXNzL0FwcGxlUGF5L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29jb2Eu bW06CisgICAgICAgIChXZWJLaXQ6OldlYlBheW1lbnRDb29yZGluYXRvclByb3h5OjpwbGF0Zm9y bUNvbXBsZXRlTWVyY2hhbnRWYWxpZGF0aW9uKToKKyAgICAgICAgSnVzdCBnZXQgdGhlIHVuZGVy bHlpbmcgUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uIGZyb20gdGhlIFBheW1lbnRNZXJjaGFudFNl c3Npb24gb2JqZWN0LgorICAgICAgICAoV2ViS2l0Ojp0b1BLUGF5bWVudE1lcmNoYW50U2Vzc2lv bik6IERlbGV0ZWQuCisKIDIwMTYtMDYtMjcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQ6OldlYlBheW1lbnRDb29yZGluYXRvciBsZWFrCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5j cHAKaW5kZXggODc0NzkyOTEyZDAxNmY3ZDlmZmM2ZWQ0YTQ1OTUzMmFjOTg2YTdiNS4uYmJkODQy MzNiNWU2ZTNhZmFjYzIzMmZlYWZlODZiZTRiYWJhN2RmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXNzaW9uLmNwcApAQCAtODA4LDQ3ICs4 MDgsNiBAQCB2b2lkIEFwcGxlUGF5U2Vzc2lvbjo6YWJvcnQoRXhjZXB0aW9uQ29kZSYgZWMpCiAg ICAgZGlkUmVhY2hGaW5hbFN0YXRlKCk7CiB9CiAKLXN0YXRpYyBPcHRpb25hbDxQYXltZW50TWVy Y2hhbnRTZXNzaW9uPiBjcmVhdGVNZXJjaGFudFNlc3Npb24oRE9NV2luZG93JiB3aW5kb3csIGNv bnN0IERpY3Rpb25hcnkmIG1lcmNoYW50U2Vzc2lvbkRpY3Rpb25hcnkpCi17Ci0gICAgYXV0byBt ZXJjaGFudElkZW50aWZpZXIgPSBtZXJjaGFudFNlc3Npb25EaWN0aW9uYXJ5LmdldDxTdHJpbmc+ KCJtZXJjaGFudElkZW50aWZpZXIiKTsKLSAgICBpZiAoIW1lcmNoYW50SWRlbnRpZmllcikgewot ICAgICAgICB3aW5kb3cucHJpbnRFcnJvck1lc3NhZ2UoIk1pc3NpbmcgbWVyY2hhbnQgaWRlbnRp Zmllci4iKTsKLSAgICAgICAgcmV0dXJuIE51bGxvcHQ7Ci0gICAgfQotCi0gICAgYXV0byBzZXNz aW9uSWRlbnRpZmllciA9IG1lcmNoYW50U2Vzc2lvbkRpY3Rpb25hcnkuZ2V0PFN0cmluZz4oIm1l cmNoYW50U2Vzc2lvbklkZW50aWZpZXIiKTsKLSAgICBpZiAoIXNlc3Npb25JZGVudGlmaWVyKSB7 Ci0gICAgICAgIHdpbmRvdy5wcmludEVycm9yTWVzc2FnZSgiTWlzc2luZyBtZXJjaGFudCBzZXNz aW9uIGlkZW50aWZpZXIuIik7Ci0gICAgICAgIHJldHVybiBOdWxsb3B0OwotICAgIH0KLQotICAg IGF1dG8gbm9uY2UgPSBtZXJjaGFudFNlc3Npb25EaWN0aW9uYXJ5LmdldDxTdHJpbmc+KCJub25j ZSIpOwotICAgIGlmICghbm9uY2UpIHsKLSAgICAgICAgd2luZG93LnByaW50RXJyb3JNZXNzYWdl KCJNaXNzaW5nIG5vbmNlLiIpOwotICAgICAgICByZXR1cm4gTnVsbG9wdDsKLSAgICB9Ci0KLSAg ICBhdXRvIGRvbWFpbk5hbWUgPSBtZXJjaGFudFNlc3Npb25EaWN0aW9uYXJ5LmdldDxTdHJpbmc+ KCJkb21haW5OYW1lIik7Ci0gICAgaWYgKCFkb21haW5OYW1lKSB7Ci0gICAgICAgIHdpbmRvdy5w cmludEVycm9yTWVzc2FnZSgiTWlzc2luZyBkb21haW4gbmFtZS4iKTsKLSAgICAgICAgcmV0dXJu IE51bGxvcHQ7Ci0gICAgfQotCi0gICAgYXV0byBlcG9jaFRpbWVzdGFtcCA9IG1lcmNoYW50U2Vz c2lvbkRpY3Rpb25hcnkuZ2V0PHVpbnQ2NF90PigiZXBvY2hUaW1lc3RhbXAiKTsKLSAgICBpZiAo IWVwb2NoVGltZXN0YW1wKSB7Ci0gICAgICAgIHdpbmRvdy5wcmludEVycm9yTWVzc2FnZSgiTWlz c2luZyBlcG9jaCB0aW1lIHN0YW1wLiIpOwotICAgICAgICByZXR1cm4gTnVsbG9wdDsKLSAgICB9 Ci0KLSAgICBhdXRvIHNpZ25hdHVyZSA9IG1lcmNoYW50U2Vzc2lvbkRpY3Rpb25hcnkuZ2V0PFN0 cmluZz4oInNpZ25hdHVyZSIpOwotICAgIGlmICghc2lnbmF0dXJlKSB7Ci0gICAgICAgIHdpbmRv dy5wcmludEVycm9yTWVzc2FnZSgiTWlzc2luZyBzaWduYXR1cmUuIik7Ci0gICAgICAgIHJldHVy biBOdWxsb3B0OwotICAgIH0KLQotICAgIHJldHVybiBQYXltZW50TWVyY2hhbnRTZXNzaW9uIHsg Km1lcmNoYW50SWRlbnRpZmllciwgKnNlc3Npb25JZGVudGlmaWVyLCAqbm9uY2UsICpkb21haW5O YW1lLCAqZXBvY2hUaW1lc3RhbXAsICpzaWduYXR1cmUgfTsKLX0KLQogdm9pZCBBcHBsZVBheVNl c3Npb246OmNvbXBsZXRlTWVyY2hhbnRWYWxpZGF0aW9uKGNvbnN0IERpY3Rpb25hcnkmIG1lcmNo YW50U2Vzc2lvbkRpY3Rpb25hcnksIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlmICghY2Fu Q29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oKSkgewpAQCAtODU5LDggKzgxOCwxMCBAQCB2b2lk IEFwcGxlUGF5U2Vzc2lvbjo6Y29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oY29uc3QgRGljdGlv bmFyeSYgbWVyY2hhbnRTZXNzaQogICAgIGF1dG8mIGRvY3VtZW50ID0gKmRvd25jYXN0PERvY3Vt ZW50PihzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogICAgIGF1dG8mIHdpbmRvdyA9ICpkb2N1 bWVudC5kb21XaW5kb3coKTsKIAotICAgIGF1dG8gbWVyY2hhbnRTZXNzaW9uID0gY3JlYXRlTWVy Y2hhbnRTZXNzaW9uKHdpbmRvdywgbWVyY2hhbnRTZXNzaW9uRGljdGlvbmFyeSk7CisgICAgU3Ry aW5nIGVycm9yTWVzc2FnZTsKKyAgICBhdXRvIG1lcmNoYW50U2Vzc2lvbiA9IFBheW1lbnRNZXJj aGFudFNlc3Npb246OmZyb21KUygqbWVyY2hhbnRTZXNzaW9uRGljdGlvbmFyeS5leGVjU3RhdGUo KSwgbWVyY2hhbnRTZXNzaW9uRGljdGlvbmFyeS5pbml0aWFsaXplck9iamVjdCgpLCBlcnJvck1l c3NhZ2UpOwogICAgIGlmICghbWVyY2hhbnRTZXNzaW9uKSB7CisgICAgICAgIHdpbmRvdy5wcmlu dEVycm9yTWVzc2FnZShlcnJvck1lc3NhZ2UpOwogICAgICAgICBlYyA9IElOVkFMSURfQUNDRVNT X0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvci5oCmluZGV4IDI3MTc0ZDgzYjZlMzg4 MjYyNmFkNjY1OTk2NDczN2I4MzFiNDBkMjEuLjEzZTE0ZDZlN2NjOTkwZDZkY2YxNTlhOTZlMTlh NDJhNzdmNjJjZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkv UGF5bWVudENvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBh eS9QYXltZW50Q29vcmRpbmF0b3IuaApAQCAtMzYsMTAgKzM2LDEwIEBAIGNsYXNzIEFwcGxlUGF5 U2Vzc2lvbjsKIGNsYXNzIFBheW1lbnQ7CiBjbGFzcyBQYXltZW50Q29vcmRpbmF0b3JDbGllbnQ7 CiBjbGFzcyBQYXltZW50Q29udGFjdDsKK2NsYXNzIFBheW1lbnRNZXJjaGFudFNlc3Npb247CiBj bGFzcyBQYXltZW50TWV0aG9kOwogY2xhc3MgVVJMOwogZW51bSBjbGFzcyBQYXltZW50QXV0aG9y aXphdGlvblN0YXR1czsKLXN0cnVjdCBQYXltZW50TWVyY2hhbnRTZXNzaW9uOwogCiBjbGFzcyBQ YXltZW50Q29vcmRpbmF0b3IgewogcHVibGljOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudENvb3JkaW5hdG9yQ2xpZW50LmgKaW5kZXggODNh ZTI3MjY0ZjQyMDJmYjMwY2ExYmZmYjUyNDg4MWM1ODU0OWU3Zi4uYWY5MzZiZTFiMWRhYTRiOWRh MjNiNjEzMDk3MzhhOGVhMThmNDc3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9hcHBsZXBheS9QYXltZW50Q29vcmRpbmF0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1lbnRDb29yZGluYXRvckNsaWVudC5oCkBAIC0zMyw5ICsz Myw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgUGF5bWVudE1lcmNoYW50U2Vz c2lvbjsKIGNsYXNzIFVSTDsKIGVudW0gY2xhc3MgUGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXM7 Ci1zdHJ1Y3QgUGF5bWVudE1lcmNoYW50U2Vzc2lvbjsKIAogY2xhc3MgUGF5bWVudENvb3JkaW5h dG9yQ2xpZW50IHsKIHB1YmxpYzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv YXBwbGVwYXkvUGF5bWVudE1lcmNoYW50U2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9hcHBsZXBheS9QYXltZW50TWVyY2hhbnRTZXNzaW9uLmgKaW5kZXggNWUyNjQxMTAyNzFhNDVh NzVmODg1YWFkNjllZTlkOGYxNjRmNTVjMy4uOGU2YzhkODVlZjQ5N2E5NThkMWUzOGQ3NDRlMTk3 Y2I1OGE3ZmY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9Q YXltZW50TWVyY2hhbnRTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBs ZXBheS9QYXltZW50TWVyY2hhbnRTZXNzaW9uLmgKQEAgLTI3LDE4ICsyNywzOSBAQAogCiAjaWYg RU5BQkxFKEFQUExFX1BBWSkKIAotI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgorI2lu Y2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CisjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorCituYW1l c3BhY2UgSlNDIHsKK2NsYXNzIEV4ZWNTdGF0ZTsKK2NsYXNzIEpTVmFsdWU7Cit9CisKK09CSkNf Q0xBU1MgUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LS8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIHdyYXBwZXIgY2xhc3MgYXJvdW5kIGEgUEtQYXlt ZW50TWVyY2hhbnRTZXNzaW9uLgotc3RydWN0IFBheW1lbnRNZXJjaGFudFNlc3Npb24gewotICAg IFN0cmluZyBtZXJjaGFudElkZW50aWZpZXI7Ci0gICAgU3RyaW5nIHNlc3Npb25JZGVudGlmaWVy OwotICAgIFN0cmluZyBub25jZTsKLSAgICBTdHJpbmcgZG9tYWluTmFtZTsKLSAgICB1aW50NjRf dCBlcG9jaFRpbWVzdGFtcDsKLSAgICBTdHJpbmcgc2lnbmF0dXJlOworY2xhc3MgUGF5bWVudE1l cmNoYW50U2Vzc2lvbiB7CitwdWJsaWM6CisgICAgUGF5bWVudE1lcmNoYW50U2Vzc2lvbigpCisg ICAgeworICAgIH0KKworICAgIGV4cGxpY2l0IFBheW1lbnRNZXJjaGFudFNlc3Npb24oUEtQYXlt ZW50TWVyY2hhbnRTZXNzaW9uICpwa1BheW1lbnRNZXJjaGFudFNlc3Npb24pCisgICAgICAgIDog bV9wa1BheW1lbnRNZXJjaGFudFNlc3Npb24ocGtQYXltZW50TWVyY2hhbnRTZXNzaW9uKQorICAg IHsKKyAgICB9CisKKyAgICB+UGF5bWVudE1lcmNoYW50U2Vzc2lvbigpCisgICAgeworICAgIH0K KworICAgIHN0YXRpYyBPcHRpb25hbDxQYXltZW50TWVyY2hhbnRTZXNzaW9uPiBmcm9tSlMoSlND OjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFsdWUsIFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKKworICAg IFBLUGF5bWVudE1lcmNoYW50U2Vzc2lvbiAqcGtQYXltZW50TWVyY2hhbnRTZXNzaW9uKCkgY29u c3QgeyByZXR1cm4gbV9wa1BheW1lbnRNZXJjaGFudFNlc3Npb24uZ2V0KCk7IH0KKworcHJpdmF0 ZToKKyAgICBSZXRhaW5QdHI8UEtQYXltZW50TWVyY2hhbnRTZXNzaW9uPiBtX3BrUGF5bWVudE1l cmNoYW50U2Vzc2lvbjsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvYXBwbGVwYXkvY29jb2EvUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29hLm1tIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9jb2NvYS9QYXltZW50TWVyY2hhbnRTZXNzaW9uQ29j b2EubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uMzFjOGUzNmZmYTc4NDEyNWQ5ZWQ0MWI2YzUxZTYzOGYwOTMwZGYx MwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvY29j b2EvUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29hLm1tCkBAIC0wLDAgKzEsNjMgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K KyAqLworCisjaW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQgIlBheW1lbnRNZXJjaGFudFNlc3Np b24uaCIKKworI2lmIEVOQUJMRShBUFBMRV9QQVkpCisKKyNpbXBvcnQgIlNvZnRMaW5raW5nLmgi CisjaW1wb3J0IDxQYXNzS2l0Q29yZS9QS1BheW1lbnRNZXJjaGFudFNlc3Npb24uaD4KKyNpbXBv cnQgPHJ1bnRpbWUvSlNPTk9iamVjdC5oPgorCisjaWYgUExBVEZPUk0oTUFDKQorU09GVF9MSU5L X1BSSVZBVEVfRlJBTUVXT1JLKFBhc3NLaXQpCisjZWxzZQorU09GVF9MSU5LX0ZSQU1FV09SSyhQ YXNzS2l0KQorI2VuZGlmCisKK1NPRlRfTElOS19DTEFTUyhQYXNzS2l0LCBQS1BheW1lbnRNZXJj aGFudFNlc3Npb24pCisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworT3B0aW9uYWw8UGF5bWVudE1l cmNoYW50U2Vzc2lvbj4gUGF5bWVudE1lcmNoYW50U2Vzc2lvbjo6ZnJvbUpTKEpTQzo6RXhlY1N0 YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIHZhbHVlLCBTdHJpbmcmKQoreworICAgIC8vIEZJWE1F OiBEb24ndCByb3VuZC10cmlwIHVzaW5nIE5TU3RyaW5nLgorICAgIGF1dG8ganNvblN0cmluZyA9 IEpTT05TdHJpbmdpZnkoJnN0YXRlLCB2YWx1ZSwgMCk7CisgICAgaWYgKCFqc29uU3RyaW5nKQor ICAgICAgICByZXR1cm4gTnVsbG9wdDsKKworICAgIGF1dG8gZGljdGlvbmFyeSA9IGR5bmFtaWNf b2JqY19jYXN0PE5TRGljdGlvbmFyeT4oW05TSlNPTlNlcmlhbGl6YXRpb24gSlNPTk9iamVjdFdp dGhEYXRhOlsoTlNTdHJpbmcgKilqc29uU3RyaW5nIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0 cmluZ0VuY29kaW5nXSBvcHRpb25zOjAgZXJyb3I6bmlsXSk7CisgICAgaWYgKCFkaWN0aW9uYXJ5 IHx8ICFbZGljdGlvbmFyeSBpc0tpbmRPZkNsYXNzOltOU0RpY3Rpb25hcnkgY2xhc3NdXSkKKyAg ICAgICAgcmV0dXJuIE51bGxvcHQ7CisKKyAgICBhdXRvIHBrUGF5bWVudE1lcmNoYW50U2Vzc2lv biA9IGFkb3B0TlMoW2FsbG9jUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uSW5zdGFuY2UoKSBpbml0 V2l0aERpY3Rpb25hcnk6ZGljdGlvbmFyeV0pOworCisgICAgcmV0dXJuIFBheW1lbnRNZXJjaGFu dFNlc3Npb24ocGtQYXltZW50TWVyY2hhbnRTZXNzaW9uLmdldCgpKTsKK30KKworfQorCisjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agppbmRleCAyMGMxNjVjNTU0OTE4YzNhNDNjYmJmYTAzYTIwMGEzZTRjOTE3MDIzLi5mM2FiNjI3 YmJkNzc0MjU1NWE0YTUzOWRiMTdlYWZiNjM3ODdiMTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC04OTUsNiArODk1LDcgQEAK IAkJMUFEMjMxNkUwQ0QyNjlFNzAwQzFGMTk0IC8qIEpTU1FMVHJhbnNhY3Rpb25DdXN0b20uY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFEMjMxNkQw Q0QyNjlFNzAwQzFGMTk0IC8qIEpTU1FMVHJhbnNhY3Rpb25DdXN0b20uY3BwICovOyB9OwogCQkx QUQ4RjgxQjExQ0FCOUU5MDBFOTNFNTQgLyogUGxhdGZvcm1TdHJhdGVnaWVzLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUQ4RjgxOTExQ0FCOUU5MDBF OTNFNTQgLyogUGxhdGZvcm1TdHJhdGVnaWVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMg PSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFEOEY4MUMxMUNBQjlFOTAwRTkzRTU0IC8qIFBsYXRm b3JtU3RyYXRlZ2llcy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQUQ4RjgxQTExQ0FCOUU5MDBFOTNFNTQgLyogUGxhdGZvcm1TdHJhdGVnaWVzLmNw cCAqLzsgfTsKKwkJMUFEQTRBMUMxRDIyRjJDMDAwNUE5QTE1IC8qIFBheW1lbnRNZXJjaGFudFNl c3Npb25Db2NvYS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBREE0QTFCMUQyMkYyQzAwMDVBOUExNSAvKiBQYXltZW50TWVyY2hhbnRTZXNzaW9uQ29j b2EubW0gKi87IH07CiAJCTFBRTAwRDU5MTgyREFDOEQwMDA4N0RENyAvKiBLZXllZENvZGluZy5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFFMDBENTcx ODJEQUM4RDAwMDg3REQ3IC8qIEtleWVkQ29kaW5nLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUFFMkFBMUUwQTFDREFCNDAwQjQyQjI1IC8qIEpT SFRNTEFyZWFFbGVtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBRTJBQTBBMEExQ0RBQjMwMEI0MkIyNSAvKiBKU0hUTUxBcmVhRWxlbWVudC5j cHAgKi87IH07CiAJCTFBRTJBQTFGMEExQ0RBQjQwMEI0MkIyNSAvKiBKU0hUTUxBcmVhRWxlbWVu dC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFFMkFB MEIwQTFDREFCMzAwQjQyQjI1IC8qIEpTSFRNTEFyZWFFbGVtZW50LmggKi87IH07CkBAIC04NDIw LDYgKzg0MjEsNyBAQAogCQkxQUQyMzE2RDBDRDI2OUU3MDBDMUYxOTQgLyogSlNTUUxUcmFuc2Fj dGlvbkN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1NR TFRyYW5zYWN0aW9uQ3VzdG9tLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFE OEY4MTkxMUNBQjlFOTAwRTkzRTU0IC8qIFBsYXRmb3JtU3RyYXRlZ2llcy5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBQbGF0Zm9ybVN0cmF0ZWdpZXMuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUFEOEY4MUExMUNBQjlFOTAwRTkzRTU0IC8qIFBsYXRmb3JtU3Ry YXRlZ2llcy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQbGF0Zm9y bVN0cmF0ZWdpZXMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQURBNEExQjFE MjJGMkMwMDA1QTlBMTUgLyogUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNvY29hLm1tICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUGF5bWVudE1lcmNoYW50U2Vzc2lvbkNv Y29hLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUUwMEQ1NzE4MkRBQzhEMDAw ODdERDcgLyogS2V5ZWRDb2RpbmcuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g S2V5ZWRDb2RpbmcuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFFMkE5RjAwQTFD REE1NzAwQjQyQjI1IC8qIEhUTUxBcmVhRWxlbWVudC5pZGwgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0 aCA9IEhUTUxBcmVhRWxlbWVudC5pZGw7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFB RTJBOUYxMEExQ0RBNTcwMEI0MkIyNSAvKiBIVE1MQmFzZUZvbnRFbGVtZW50LmlkbCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5 cGUgPSB0ZXh0OyBwYXRoID0gSFRNTEJhc2VGb250RWxlbWVudC5pZGw7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CkBAIC0xNjI5OCwxMCArMTYzMDAsMTAgQEAKIAkJCWNoaWxkcmVuID0gKAog CQkJCTFBOEE2NDY5MUQxOUZGODcwMEQwRTAwRiAvKiBQYXltZW50Q29jb2EubW0gKi8sCiAJCQkJ MUE4QTY0NkExRDE5RkY4NzAwRDBFMDBGIC8qIFBheW1lbnRDb250YWN0Q29jb2EubW0gKi8sCisJ CQkJMUFEQTRBMUIxRDIyRjJDMDAwNUE5QTE1IC8qIFBheW1lbnRNZXJjaGFudFNlc3Npb25Db2Nv YS5tbSAqLywKIAkJCQkxQThBNjQ2QjFEMTlGRjg3MDBEMEUwMEYgLyogUGF5bWVudE1ldGhvZENv Y29hLm1tICovLAogCQkJKTsKLQkJCW5hbWUgPSBjb2NvYTsKLQkJCXBhdGggPSBhcHBsZXBheS9j b2NvYTsKKwkJCXBhdGggPSBjb2NvYTsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CiAJCX07 CiAJCTFBODhBOTAxMTc1NTNDRDcwMDBDNzRGOSAvKiBmb3JtcyAqLyA9IHsKQEAgLTMxNzMzLDYg KzMxNzM1LDcgQEAKIAkJCQlCQ0VDMDFCRDBDMjc0REFDMDA5RjRFQzkgLyogU2NyZWVuLmNwcCBp biBTb3VyY2VzICovLAogCQkJCUE4NEQ4MkMyMTFEMzQ3NDgwMDk3Mjk5MCAvKiBTY3JpcHRhYmxl RG9jdW1lbnRQYXJzZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQTVGOENEMTMxRDE4RjMzMTAw QUMwRTUzIC8qIFBhZ2VIZWFwQWdlbnQuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMUFEQTRBMUMx RDIyRjJDMDAwNUE5QTE1IC8qIFBheW1lbnRNZXJjaGFudFNlc3Npb25Db2NvYS5tbSBpbiBTb3Vy Y2VzICovLAogCQkJCTQxRjFEMjIwMEVGMzVDMkEwMERBODc1MyAvKiBTY3JpcHRDYWNoZWRGcmFt ZURhdGEuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTNCNzBENkYwOUVCMEM3QzAwOUQ4NDY4IC8q IFNjcmlwdENvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQTgzRTFDNzQwRTQ5MDQy QzAwMTQwQjlDIC8qIFNjcmlwdENvbnRyb2xsZXJNYWMubW0gaW4gU291cmNlcyAqLywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0RpY3Rpb25hcnkuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0RpY3Rpb25hcnkuaAppbmRleCAwZjQ0MzE0NWNkNmM3ZWJmY2Rh MmVhMTdiMTEzMjRlMTcyNzA0NjNjLi5iODgzMzUzMDFhNDQwMTNkNWY0ZjU4OWVkYjg4MWViN2I3 ZGNiNjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9EaWN0aW9uYXJ5 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvRGljdGlvbmFyeS5oCkBAIC02MSw2 ICs2MSw3IEBAIHB1YmxpYzoKICAgICBib29sIGdldFdpdGhVbmRlZmluZWRPck51bGxDaGVjayhj b25zdCBjaGFyKiBwcm9wZXJ0eU5hbWUsIFN0cmluZyYgdmFsdWUpIGNvbnN0OwogCiAgICAgSlND OjpFeGVjU3RhdGUqIGV4ZWNTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZGljdGlvbmFyeS5leGVj U3RhdGUoKTsgfQorICAgIEpTQzo6SlNPYmplY3QqIGluaXRpYWxpemVyT2JqZWN0KCkgY29uc3Qg eyByZXR1cm4gbV9kaWN0aW9uYXJ5LmluaXRpYWxpemVyT2JqZWN0KCk7IH0KIAogcHJpdmF0ZToK ICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBKU0M6OkpTT2JqZWN0KiBhc0pTT2JqZWN0KFQqKSBj b25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJn dW1lbnRDb2RlcnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9XZWJDb3Jl QXJndW1lbnRDb2RlcnNDb2NvYS5tbQppbmRleCA2YjViMmU1MTRiNWVjNDk4ZGFiZGE5NGQ2Yzlh YjQyN2MwYWI5MWNkLi41MzRhNzQ3N2IwMTg3MzIyNjY4M2I2NDYwMTU5ZGI5NmQ3MGJkN2FhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1 bWVudENvZGVyc0NvY29hLm1tCkBAIC00MSw2ICs0MSw3IEBAIFNPRlRfTElOS19GUkFNRVdPUkso UGFzc0tpdCkKIFNPRlRfTElOS19DTEFTUyhQYXNzS2l0LCBQS0NvbnRhY3QpOwogU09GVF9MSU5L X0NMQVNTKFBhc3NLaXQsIFBLUGF5bWVudCk7CiBTT0ZUX0xJTktfQ0xBU1MoUGFzc0tpdCwgUEtQ YXltZW50TWV0aG9kKTsKK1NPRlRfTElOS19DTEFTUyhQYXNzS2l0LCBQS1BheW1lbnRNZXJjaGFu dFNlc3Npb24pOwogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTE2LDI4ICsxMTcs MzUgQEAgYm9vbCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlBheW1lbnRDb250YWN0Pjo6ZGVjb2Rl KEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2UKIAogdm9pZCBBcmd1bWVudENvZGVyPFdlYkNv cmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb24+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNv ZGVyLCBjb25zdCBXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uJiBwYXltZW50TWVyY2hh bnRTZXNzaW9uKQogewotICAgIGVuY29kZXIgPDwgcGF5bWVudE1lcmNoYW50U2Vzc2lvbi5tZXJj aGFudElkZW50aWZpZXI7Ci0gICAgZW5jb2RlciA8PCBwYXltZW50TWVyY2hhbnRTZXNzaW9uLnNl c3Npb25JZGVudGlmaWVyOwotICAgIGVuY29kZXIgPDwgcGF5bWVudE1lcmNoYW50U2Vzc2lvbi5u b25jZTsKLSAgICBlbmNvZGVyIDw8IHBheW1lbnRNZXJjaGFudFNlc3Npb24uZG9tYWluTmFtZTsK LSAgICBlbmNvZGVyIDw8IHBheW1lbnRNZXJjaGFudFNlc3Npb24uZXBvY2hUaW1lc3RhbXA7Ci0g ICAgZW5jb2RlciA8PCBwYXltZW50TWVyY2hhbnRTZXNzaW9uLnNpZ25hdHVyZTsKKyAgICBhdXRv IGRhdGEgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGF0YSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8g YXJjaGl2ZXIgPSBhZG9wdE5TKFtbTlNLZXllZEFyY2hpdmVyIGFsbG9jXSBpbml0Rm9yV3JpdGlu Z1dpdGhNdXRhYmxlRGF0YTpkYXRhLmdldCgpXSk7CisKKyAgICBbYXJjaGl2ZXIgc2V0UmVxdWly ZXNTZWN1cmVDb2Rpbmc6WUVTXTsKKworICAgIFthcmNoaXZlciBlbmNvZGVPYmplY3Q6cGF5bWVu dE1lcmNoYW50U2Vzc2lvbi5wa1BheW1lbnRNZXJjaGFudFNlc3Npb24oKSBmb3JLZXk6TlNLZXll ZEFyY2hpdmVSb290T2JqZWN0S2V5XTsKKyAgICBbYXJjaGl2ZXIgZmluaXNoRW5jb2RpbmddOwor CisgICAgZW5jb2RlciA8PCBEYXRhUmVmZXJlbmNlKHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3Qq PihbZGF0YSBieXRlc10pLCBbZGF0YSBsZW5ndGhdKTsKIH0KIAogYm9vbCBBcmd1bWVudENvZGVy PFdlYkNvcmU6OlBheW1lbnRNZXJjaGFudFNlc3Npb24+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVy JiBkZWNvZGVyLCBXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uJiBwYXltZW50TWVyY2hh bnRTZXNzaW9uKQogewotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGF5bWVudE1lcmNoYW50U2Vz c2lvbi5tZXJjaGFudElkZW50aWZpZXIpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYg KCFkZWNvZGVyLmRlY29kZShwYXltZW50TWVyY2hhbnRTZXNzaW9uLnNlc3Npb25JZGVudGlmaWVy KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGF5bWVu dE1lcmNoYW50U2Vzc2lvbi5ub25jZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHBheW1lbnRNZXJjaGFudFNlc3Npb24uZG9tYWluTmFtZSkpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBheW1lbnRNZXJjaGFu dFNlc3Npb24uZXBvY2hUaW1lc3RhbXApKQorICAgIElQQzo6RGF0YVJlZmVyZW5jZSBkYXRhUmVm ZXJlbmNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZGF0YVJlZmVyZW5jZSkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBheW1lbnRNZXJjaGFudFNl c3Npb24uc2lnbmF0dXJlKSkKKworICAgIGF1dG8gZGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxs b2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6Y29uc3RfY2FzdDx2b2lkKj4oc3RhdGljX2Nhc3Q8Y29u c3Qgdm9pZCo+KGRhdGFSZWZlcmVuY2UuZGF0YSgpKSkgbGVuZ3RoOmRhdGFSZWZlcmVuY2Uuc2l6 ZSgpIGZyZWVXaGVuRG9uZTpOT10pOworICAgIGF1dG8gdW5hcmNoaXZlciA9IGFkb3B0TlMoW1tO U0tleWVkVW5hcmNoaXZlciBhbGxvY10gaW5pdEZvclJlYWRpbmdXaXRoRGF0YTpkYXRhLmdldCgp XSk7CisgICAgW3VuYXJjaGl2ZXIgc2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6WUVTXTsKKyAgICBA dHJ5IHsKKyAgICAgICAgUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uICpwa1BheW1lbnRNZXJjaGFu dFNlc3Npb24gPSBbdW5hcmNoaXZlciBkZWNvZGVPYmplY3RPZkNsYXNzOmdldFBLUGF5bWVudE1l cmNoYW50U2Vzc2lvbkNsYXNzKCkgZm9yS2V5Ok5TS2V5ZWRBcmNoaXZlUm9vdE9iamVjdEtleV07 CisgICAgICAgIHBheW1lbnRNZXJjaGFudFNlc3Npb24gPSBQYXltZW50TWVyY2hhbnRTZXNzaW9u KHBrUGF5bWVudE1lcmNoYW50U2Vzc2lvbik7CisgICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpl eGNlcHRpb24pIHsKKyAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gZGVjb2RlIFBLUGF5bWVu dE1lcmNoYW50U2Vzc2lvbjogJUAiLCBleGNlcHRpb24pOwogICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfQorCisgICAgW3VuYXJjaGl2ZXIgZmluaXNoRGVjb2RpbmddOwogCiAgICAgcmV0dXJu IHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGVQYXkv V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B cHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5oCmluZGV4IDJjMmQ2MWUzZjBmZTk0 ZjlmYWUyMDNmM2RmMzI0YTNjNDcyM2Q4MjIuLjc0MzVlZTc0ZDFjYTgxZTVmMzk1ZTE2Nzk4Nzc4 ZTg5OWNiODM2YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsZVBh eS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5oCkBAIC00MSw5ICs0MSw5 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGVudW0gY2xhc3MgUGF5bWVudEF1dGhvcml6YXRpb25T dGF0dXM7CiBjbGFzcyBQYXltZW50OwogY2xhc3MgUGF5bWVudENvbnRhY3Q7CitjbGFzcyBQYXlt ZW50TWVyY2hhbnRTZXNzaW9uOwogY2xhc3MgUGF5bWVudE1ldGhvZDsKIGNsYXNzIFVSTDsKLXN0 cnVjdCBQYXltZW50TWVyY2hhbnRTZXNzaW9uOwogfQogCiBPQkpDX0NMQVNTIE5TV2luZG93Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxlUGF5L1dlYlBheW1lbnRD b29yZGluYXRvclByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Fw cGxlUGF5L1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDUzOGNi NWRiMjBhMjA3YmY3ZGIxZmNkZWNjNGFhMTRhMmEyODgwN2EuLmViZWMyYjc5MjE4N2JkZDJiMTBl NzJkN2RlNzE3YzFjYmQyZjU0MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BcHBsZVBheS9XZWJQYXltZW50Q29vcmRpbmF0b3JQcm94eS5tZXNzYWdlcy5pbgorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGVQYXkvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHkubWVzc2FnZXMuaW4KQEAgLTMwLDcgKzMwLDcgQEAgbWVzc2FnZXMgLT4gV2ViUGF5bWVudENv b3JkaW5hdG9yUHJveHkgewogICAgIENhbk1ha2VQYXltZW50c1dpdGhBY3RpdmVDYXJkKFN0cmlu ZyBtZXJjaGFudElkZW50aWZpZXIsIFN0cmluZyBkb21haW5OYW1lLCB1aW50NjRfdCByZXF1ZXN0 SUQpCiAKICAgICBTaG93UGF5bWVudFVJKFN0cmluZyBvcmlnaW5hdGluZ1VSTFN0cmluZywgVmVj dG9yPFN0cmluZz4gbGlua0ljb25VUkxTdHJpbmdzLCBXZWJDb3JlOjpQYXltZW50UmVxdWVzdCBw YXltZW50UmVxdWVzdCkKLSAgICBDb21wbGV0ZU1lcmNoYW50VmFsaWRhdGlvbihzdHJ1Y3QgV2Vi Q29yZTo6UGF5bWVudE1lcmNoYW50U2Vzc2lvbiBwYXltZW50TWVyY2hhbnRTZXNzaW9uKTsKKyAg ICBDb21wbGV0ZU1lcmNoYW50VmFsaWRhdGlvbihXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNz aW9uIHBheW1lbnRNZXJjaGFudFNlc3Npb24pOwogICAgIENvbXBsZXRlU2hpcHBpbmdNZXRob2RT ZWxlY3Rpb24odWludDMyX3Qgb3BhcXVlU3RhdHVzLCBPcHRpb25hbDxXZWJDb3JlOjpQYXltZW50 UmVxdWVzdDo6VG90YWxBbmRMaW5lSXRlbXM+IG5ld1RvdGFsQW5kSXRlbXMpCiAgICAgQ29tcGxl dGVTaGlwcGluZ0NvbnRhY3RTZWxlY3Rpb24odWludDMyX3Qgb3BhcXVlU3RhdHVzLCBWZWN0b3I8 V2ViQ29yZTo6UGF5bWVudFJlcXVlc3Q6OlNoaXBwaW5nTWV0aG9kPiBuZXdTaGlwcGluZ01ldGhv ZHMsIE9wdGlvbmFsPFdlYkNvcmU6OlBheW1lbnRSZXF1ZXN0OjpUb3RhbEFuZExpbmVJdGVtcz4g bmV3VG90YWxBbmRJdGVtcykKICAgICBDb21wbGV0ZVBheW1lbnRNZXRob2RTZWxlY3Rpb24oT3B0 aW9uYWw8V2ViQ29yZTo6UGF5bWVudFJlcXVlc3Q6OlRvdGFsQW5kTGluZUl0ZW1zPiBuZXdUb3Rh bEFuZEl0ZW1zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxlUGF5 L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQXBwbGVQYXkvY29jb2EvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlDb2Nv YS5tbQppbmRleCAyYmY0MDYyYWNjMTg1MGFjM2Q5MDlmNjdlODUxM2E5MDU2Nzg1Yzc2Li4yMjBi YTBjY2ZkNjBjMjQyOGEzYjgwYWRmNjBkY2ZiNzZjMzUzMWEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGVQYXkvY29jb2EvV2ViUGF5bWVudENvb3JkaW5hdG9yUHJv eHlDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXBwbGVQYXkvY29jb2Ev V2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHlDb2NvYS5tbQpAQCAtMzMwLDIwICszMzAsNiBAQCBz dGF0aWMgUmV0YWluUHRyPFBLU2hpcHBpbmdNZXRob2Q+IHRvUEtTaGlwcGluZ01ldGhvZChjb25z dCBXZWJDb3JlOjpQYXltZW50UmVxdQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBS ZXRhaW5QdHI8UEtQYXltZW50TWVyY2hhbnRTZXNzaW9uPiB0b1BLUGF5bWVudE1lcmNoYW50U2Vz c2lvbihjb25zdCBXZWJDb3JlOjpQYXltZW50TWVyY2hhbnRTZXNzaW9uJiBwYXltZW50TWVyY2hh bnRTZXNzaW9uKQotewotICAgIE5TRGljdGlvbmFyeSAqZGljdGlvbmFyeSA9IEB7Ci0gICAgICAg IEAibWVyY2hhbnRTZXNzaW9uSWRlbnRpZmllciIgOiBwYXltZW50TWVyY2hhbnRTZXNzaW9uLnNl c3Npb25JZGVudGlmaWVyLAotICAgICAgICBAIm1lcmNoYW50SWRlbnRpZmllciIgOiBwYXltZW50 TWVyY2hhbnRTZXNzaW9uLm1lcmNoYW50SWRlbnRpZmllciwKLSAgICAgICAgQCJuT25jZSIgOiBw YXltZW50TWVyY2hhbnRTZXNzaW9uLm5vbmNlLAotICAgICAgICBAImVwb2NoVGltZXN0YW1wIiA6 IEAoc3RhdGljX2Nhc3Q8TlNVSW50ZWdlcj4ocGF5bWVudE1lcmNoYW50U2Vzc2lvbi5lcG9jaFRp bWVzdGFtcCkpLAotICAgICAgICBAIkZRRE4iIDogcGF5bWVudE1lcmNoYW50U2Vzc2lvbi5kb21h aW5OYW1lLAotICAgICAgICBAInNpZ25hdHVyZSIgOiBwYXltZW50TWVyY2hhbnRTZXNzaW9uLnNp Z25hdHVyZSwKLSAgICB9OwotCi0gICAgcmV0dXJuIGFkb3B0TlMoW2FsbG9jUEtQYXltZW50TWVy Y2hhbnRTZXNzaW9uSW5zdGFuY2UoKSBpbml0V2l0aERpY3Rpb25hcnk6ZGljdGlvbmFyeV0pOwot fQotCiBSZXRhaW5QdHI8UEtQYXltZW50UmVxdWVzdD4gdG9QS1BheW1lbnRSZXF1ZXN0KGNvbnN0 IFdlYkNvcmU6OlVSTCYgb3JpZ2luYXRpbmdVUkwsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpVUkw+ JiBsaW5rSWNvblVSTHMsIGNvbnN0IFdlYkNvcmU6OlBheW1lbnRSZXF1ZXN0JiBwYXltZW50UmVx dWVzdCkKIHsKICAgICBhdXRvIHJlc3VsdCA9IGFkb3B0TlMoW2FsbG9jUEtQYXltZW50UmVxdWVz dEluc3RhbmNlKCkgaW5pdF0pOwpAQCAtNDM0LDcgKzQyMCw3IEBAIHZvaWQgV2ViUGF5bWVudENv b3JkaW5hdG9yUHJveHk6OnBsYXRmb3JtQ29tcGxldGVNZXJjaGFudFZhbGlkYXRpb24oY29uc3Qg V2ViQ29yCiAgICAgQVNTRVJUKG1fcGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlcik7 CiAgICAgQVNTRVJUKG1fcGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlckRlbGVnYXRl KTsKIAotICAgIG1fcGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlckRlbGVnYXRlLT5f c2Vzc2lvbkJsb2NrKHRvUEtQYXltZW50TWVyY2hhbnRTZXNzaW9uKHBheW1lbnRNZXJjaGFudFNl c3Npb24pLmdldCgpLCBudWxscHRyKTsKKyAgICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0Nv bnRyb2xsZXJEZWxlZ2F0ZS0+X3Nlc3Npb25CbG9jayhwYXltZW50TWVyY2hhbnRTZXNzaW9uLnBr UGF5bWVudE1lcmNoYW50U2Vzc2lvbigpLCBudWxscHRyKTsKICAgICBtX3BheW1lbnRBdXRob3Jp emF0aW9uVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZS0+X3Nlc3Npb25CbG9jayA9IG51bGxwdHI7CiB9 CiAK