178162 2017-10-11 03:46:31 -0700 [JSC] Drop Instantiate hook in ES6 module loader 2017-10-11 05:31:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 177959 1 ysuzuki ysuzuki buildbot keith_miller mark.lam msaboff rniwa saam sam webkit-bug-importer oldest_to_newest 1359104 0 ysuzuki 2017-10-11 03:46:31 -0700 [JSC] Drop Instantiate hook in ES6 module loader 1359110 1 323404 ysuzuki 2017-10-11 03:52:56 -0700 Created attachment 323404 Patch 1359137 2 ysuzuki 2017-10-11 05:30:42 -0700 Committed r223173: <http://trac.webkit.org/changeset/223173> 1359139 3 ysuzuki 2017-10-11 05:31:20 -0700 Landed, thanks! 1359140 4 webkit-bug-importer 2017-10-11 05:31:29 -0700 <rdar://problem/34931724> 323404 2017-10-11 03:52:56 -0700 2017-10-11 05:25:02 -0700 Patch bug-178162-20171011195254.patch text/plain 22982 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 NjU3MGUyOWQ2MTMyZGE3ZGM5NDA3NWQyODZjYWJjNWI5ZjZhNzRhLi5hYzA3OTY3YjI0ZDYyMzMw ODEzM2RlMzhhMmE2Yzc4ZDRjMTkwMzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MiBAQAorMjAxNy0xMC0xMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBEcm9wIEluc3RhbnRpYXRlIGhvb2sgaW4gRVM2IG1vZHVs ZSBsb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3ODE2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggaXMgYSBwYXJ0IG9mIHBhdGNoIHNlcmllcyBmb3IgbW9kdWxlIGxvYWRlciBy ZWZhY3RvcmluZyB0byBhZG9wdAorICAgICAgICBpbnRlZ3JpdHk9IiIgcGFyYW1ldGVycyBhbmQg aW50cm9kdWNlIG5ldyB3aGF0d2cgbW9kdWxlIGltcG9ydCBtZWNoYW5pc20uCisKKyAgICAgICAg SW4gdGhpcyBwYXRjaCwgd2UgZHJvcCBpbnN0YW50aWF0ZSBob29rIGluIG1vZHVsZSBsb2FkZXIu IFRoaXMgaG9vayBpcyBvcmlnaW5hbGx5CisgICAgICAgIGludHJvZHVjZWQgYmVjYXVzZSBpdCBp cyBkZWZpbmVkIGluIHdoYXR3Zy9sb2FkZXIgc3BlYy4gQnV0IHRoaXMgaG9vayBpcyBub3QKKyAg ICAgICAgdXNlZCBpbiBvdXIgaW1wbGVtZW50YXRpb24sIGFuZCB0aGlzIGhvb2sgd29uJ3QgYmUg dXNlZCBzaW5jZSAoMSkgd2hhdHdnL2xvYWRlcgorICAgICAgICBzcGVjIGlzIGFiYW5kb25lZCwg YW5kICgyKSB0aGlzIHR5cGUgb2YgaG9va3Mgc2hvdWxkIGJlIGRvbmUgaW4gU2VydmljZSBXb3Jr ZXJzLgorCisgICAgICAgIEluIGFkZGl0aW9uLCB0aGlzIHBhdGNoIGFwcGxpZXMgc29tZSBjbGVh bmluZyB1cCBvZiBvdXIgbW9kdWxlIGxvYWRlciBKUyBjb2RlCisgICAgICAgIHRvIHNpbXBsaWZ5 IHRoaW5ncy4gVGhpcyBjaGFuZ2UgcGF2ZXMgdGhlIHdheSB0byBtb3JlIGVmZmljaWVudCBsb2Fk ZXIgaW1wbGVtZW50YXRpb24KKyAgICAgICAgd2l0aCBncmVhdCBmbGV4aWJpbGl0eSB0byBhZG9w dCBpbnRlZ3JpdHk9IiIgcGFyYW1ldGVycy4KKworICAgICAgICAqIGJ1aWx0aW5zL01vZHVsZUxv YWRlclByb3RvdHlwZS5qczoKKyAgICAgICAgKHJlcXVlc3RJbnN0YW50aWF0ZSk6CisgICAgICAg IChwcm92aWRlRmV0Y2gpOgorICAgICAgICBwcm92aWRlIGlzIGNoYW5nZWQgdG8gcHJvdmlkZUZl dGNoIHNpbmNlIHdlIG9ubHkgdXNlZCB0aGlzIGZ1bmN0aW9uIHdpdGggRmV0Y2ggc3RhZ2UgcGFy YW1ldGVyLgorCisgICAgICAgIChmdWxmaWxsSW5zdGFudGlhdGUpOiBEZWxldGVkLgorICAgICAg ICAoY29tbWl0SW5zdGFudGlhdGVkKTogRGVsZXRlZC4KKyAgICAgICAgKGluc3RhbnRpYXRpb24p OiBEZWxldGVkLgorICAgICAgICBUaGV5IGFyZSBtZXJnZWQgaW50byByZXF1ZXN0SW5zdGFudGlh dGUgY29kZS4gVGhpcyBpcyBzaW1wbGVyLgorCisgICAgICAgIChwcm92aWRlKTogRGVsZXRlZC4K KyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvQ29tcGxldGlvbi5jcHA6Cisg ICAgICAgIChKU0M6OmxvYWRBbmRFdmFsdWF0ZU1vZHVsZSk6CisgICAgICAgIChKU0M6OmxvYWRN b2R1bGUpOgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwOgorICAgICAgICAq IHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAgKiBydW50aW1lL0pTTW9kdWxlTG9h ZGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SlNNb2R1bGVMb2FkZXI6OnByb3ZpZGVGZXRjaCk6Cisg ICAgICAgIChKU0M6OkpTTW9kdWxlTG9hZGVyOjpwcm92aWRlKTogRGVsZXRlZC4KKyAgICAgICAg Q2hhbmdlZCB0byBwcm92aWRlRmV0Y2guCisKKyAgICAgICAgKEpTQzo6SlNNb2R1bGVMb2FkZXI6 Omluc3RhbnRpYXRlKTogRGVsZXRlZC4KKyAgICAgICAgRHJvcCB0aGlzIGhvb2suCisKKyAgICAg ICAgKiBydW50aW1lL0pTTW9kdWxlTG9hZGVyLmg6CisgICAgICAgICogcnVudGltZS9Nb2R1bGVM b2FkZXJQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjptb2R1bGVMb2FkZXJQcm90b3R5cGVJ bnN0YW50aWF0ZSk6IERlbGV0ZWQuCisgICAgICAgIERyb3AgdGhpcyBob29rLgorCiAyMDE3LTEw LTEwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIFByb3RvdHlw ZSBzdHJ1Y3R1cmUgdHJhbnNpdGlvbiBzaG91bGQgYmUgYSBkZWZlcnJlZCB0cmFuc2l0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggOWEwNTI0MGZmYjgxYTg5NmYwNjJiMzllOWQzNDYwZTU2OGNkNzViYy4uODE2 MWIzNTFkMTk3ODU5ZTFmY2IwMWI1YmE1YjI2OWZjYjI3NjU3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTEwLTExICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwu Y29tPgorCisgICAgICAgIFtKU0NdIERyb3AgSW5zdGFudGlhdGUgaG9vayBpbiBFUzYgbW9kdWxl IGxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc4MTYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RHJvcCBpbnN0YW50aWF0ZSBob29rcy4KKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNwcDoKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9KU1dvcmtlckdsb2JhbFNjb3BlQmFzZS5jcHA6CisKIDIwMTctMTAtMTAgIFhhYmll ciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0 cmVhbWVyXSBGaXggZG91YmxlIHNlZWsgcmVxdWVzdGVkIGJ5IGRvd25sb2FkYnVmZmVyIEdTdHJl YW1lciBlbGVtZW50IGluIHdlYmtpYndlYnNyYwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J1aWx0aW5zL01vZHVsZUxvYWRlclByb3RvdHlwZS5qcyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9idWlsdGlucy9Nb2R1bGVMb2FkZXJQcm90b3R5cGUuanMKaW5kZXggNTM1YTI0MDBj NjE5NDZiYWFiYTZiNTQyZWM5YTllYjEyNWNiMWEzZi4uYmQ5N2QzMDk3NmZjZjkxM2NkNTRlOGZh MWNkYTE3NTI1NzAxNTk0OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0 aW5zL01vZHVsZUxvYWRlclByb3RvdHlwZS5qcworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YnVpbHRpbnMvTW9kdWxlTG9hZGVyUHJvdG90eXBlLmpzCkBAIC0zMCw3ICszMCw2IEBACiAvLyBD dXJyZW50bHksIHRoZXJlIGFyZSA0IGhvb2tzLgogLy8gICAgMS4gTG9hZGVyLnJlc29sdmUKIC8v ICAgIDIuIExvYWRlci5mZXRjaAotLy8gICAgMy4gTG9hZGVyLmluc3RhbnRpYXRlCiAKIEBnbG9i YWxQcml2YXRlCiBmdW5jdGlvbiBzZXRTdGF0ZVRvTWF4KGVudHJ5LCBuZXdTdGF0ZSkKQEAgLTEz OSw2OSArMTM4LDYgQEAgZnVuY3Rpb24gZnVsZmlsbEZldGNoKGVudHJ5LCBzb3VyY2UpCiAgICAg QHNldFN0YXRlVG9NYXgoZW50cnksIEBNb2R1bGVJbnN0YW50aWF0ZSk7CiB9CiAKLWZ1bmN0aW9u IGZ1bGZpbGxJbnN0YW50aWF0ZShlbnRyeSwgb3B0aW9uYWxJbnN0YW5jZSwgc291cmNlKQotewot ICAgIC8vIGh0dHBzOi8vd2hhdHdnLmdpdGh1Yi5pby9sb2FkZXIvI2Z1bGZpbGwtaW5zdGFudGlh dGUKLQotICAgICJ1c2Ugc3RyaWN0IjsKLQotICAgIGlmICghZW50cnkuaW5zdGFudGlhdGUpCi0g ICAgICAgIGVudHJ5Lmluc3RhbnRpYXRlID0gQG5ld1Byb21pc2VDYXBhYmlsaXR5KEBJbnRlcm5h bFByb21pc2UpLkBwcm9taXNlOwotICAgIHRoaXMuY29tbWl0SW5zdGFudGlhdGVkKGVudHJ5LCBv cHRpb25hbEluc3RhbmNlLCBzb3VyY2UpOwotCi0gICAgLy8gRklYTUU6IFRoZSBkcmFmdCBmdWxm aWxscyB0aGUgcHJvbWlzZSBpbiB0aGUgQ29tbWl0SW5zdGFudGlhdGVkIG9wZXJhdGlvbi4KLSAg ICAvLyBCdXQgaXQgQ29tbWl0SW5zdGFudGlhdGVkIGlzIGFsc28gdXNlZCBpbiB0aGUgcmVxdWVz dEluc3RhbnRpYXRlIGFuZAotICAgIC8vIHdlIHNob3VsZCBub3QgImZvcmNlIGZ1bGZpbGwiIHRo ZXJlLgotICAgIC8vIFNvIHdlIHNlcGFyYXRlICJmb3JjZSBmdWxmaWxsIiBvcGVyYXRpb24gZnJv bSB0aGUgQ29tbWl0SW5zdGFudGlhdGVkIG9wZXJhdGlvbi4KLSAgICAvLyBodHRwczovL2dpdGh1 Yi5jb20vd2hhdHdnL2xvYWRlci9wdWxsLzY3Ci0gICAgdGhpcy5mb3JjZUZ1bGZpbGxQcm9taXNl KGVudHJ5Lmluc3RhbnRpYXRlLCBlbnRyeSk7Ci19Ci0KLWZ1bmN0aW9uIGNvbW1pdEluc3RhbnRp YXRlZChlbnRyeSwgb3B0aW9uYWxJbnN0YW5jZSwgc291cmNlKQotewotICAgIC8vIGh0dHBzOi8v d2hhdHdnLmdpdGh1Yi5pby9sb2FkZXIvI2NvbW1pdC1pbnN0YW50aWF0ZWQKLQotICAgICJ1c2Ug c3RyaWN0IjsKLQotICAgIHZhciBtb2R1bGVSZWNvcmQgPSB0aGlzLmluc3RhbnRpYXRpb24ob3B0 aW9uYWxJbnN0YW5jZSwgc291cmNlLCBlbnRyeSk7Ci0KLSAgICAvLyBGSVhNRTogRGVzY3JpYmVk IGluIHRoZSBkcmFmdCwKLSAgICAvLyAgIDQuIEZ1bGZpbGwgZW50cnkuW1tJbnN0YW50aWF0ZV1d IHdpdGggaW5zdGFuY2UuCi0gICAgLy8gQnV0LCBpbnN0YW50aWF0ZSBwcm9taXNlIHNob3VsZCBi ZSBmdWxmaWxsZWQgd2l0aCB0aGUgZW50cnkuCi0gICAgLy8gV2UgcmVtb3ZlIHRoaXMgc3RhdGVt ZW50IGJlY2F1c2UgaW5zdGFudGlhdGUgcHJvbWlzZSB3aWxsIGJlCi0gICAgLy8gZnVsZmlsbGVk IHdpdGhvdXQgdGhpcyAiZm9yY2UgZnVsZmlsbCIgb3BlcmF0aW9uLgotICAgIC8vIGh0dHBzOi8v Z2l0aHViLmNvbS93aGF0d2cvbG9hZGVyL3B1bGwvNjcKLQotICAgIHZhciBkZXBlbmRlbmNpZXMg PSBbXTsKLSAgICB2YXIgZGVwZW5kZW5jaWVzTWFwID0gbW9kdWxlUmVjb3JkLmRlcGVuZGVuY2ll c01hcDsKLSAgICBtb2R1bGVSZWNvcmQucmVnaXN0cnlFbnRyeSA9IGVudHJ5OwotICAgIHZhciBy ZXF1ZXN0ZWRNb2R1bGVzID0gdGhpcy5yZXF1ZXN0ZWRNb2R1bGVzKG1vZHVsZVJlY29yZCk7Ci0g ICAgZm9yICh2YXIgaSA9IDAsIGxlbmd0aCA9IHJlcXVlc3RlZE1vZHVsZXMubGVuZ3RoOyBpIDwg bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgdmFyIGRlcEtleSA9IHJlcXVlc3RlZE1vZHVsZXNbaV07 Ci0gICAgICAgIHZhciBwYWlyID0gewotICAgICAgICAgICAga2V5OiBkZXBLZXksCi0gICAgICAg ICAgICB2YWx1ZTogQHVuZGVmaW5lZAotICAgICAgICB9OwotICAgICAgICBAcHV0QnlWYWxEaXJl Y3QoZGVwZW5kZW5jaWVzLCBkZXBlbmRlbmNpZXMubGVuZ3RoLCBwYWlyKTsKLSAgICAgICAgZGVw ZW5kZW5jaWVzTWFwLkBzZXQoZGVwS2V5LCBwYWlyKTsKLSAgICB9Ci0gICAgZW50cnkuZGVwZW5k ZW5jaWVzID0gZGVwZW5kZW5jaWVzOwotICAgIGVudHJ5LmRlcGVuZGVuY2llc01hcCA9IGRlcGVu ZGVuY2llc01hcDsKLSAgICBlbnRyeS5tb2R1bGUgPSBtb2R1bGVSZWNvcmQ7Ci0gICAgQHNldFN0 YXRlVG9NYXgoZW50cnksIEBNb2R1bGVTYXRpc2Z5KTsKLX0KLQotZnVuY3Rpb24gaW5zdGFudGlh dGlvbihyZXN1bHQsIHNvdXJjZSwgZW50cnkpCi17Ci0gICAgLy8gaHR0cHM6Ly93aGF0d2cuZ2l0 aHViLmlvL2xvYWRlci8jaW5zdGFudGlhdGlvbgotICAgIC8vIEZJWE1FOiBDdXJyZW50IGltcGxl bWVudGF0aW9uIGRvZXMgbm90IHN1cHBvcnQgb3B0aW9uYWxJbnN0YW5jZS4KLSAgICAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MTcxCi0KLSAgICAidXNlIHN0 cmljdCI7Ci0KLSAgICByZXR1cm4gdGhpcy5wYXJzZU1vZHVsZShlbnRyeS5rZXksIHNvdXJjZSk7 Ci19Ci0KIC8vIExvYWRlci4KIAogZnVuY3Rpb24gcmVxdWVzdEZldGNoKGtleSwgZmV0Y2hlcikK QEAgLTIzOSwxNyArMTc1LDMzIEBAIGZ1bmN0aW9uIHJlcXVlc3RJbnN0YW50aWF0ZShrZXksIGZl dGNoZXIpCiAgICAgICAgIHJldHVybiBlbnRyeS5pbnN0YW50aWF0ZTsKIAogICAgIHZhciBpbnN0 YW50aWF0ZVByb21pc2UgPSB0aGlzLnJlcXVlc3RGZXRjaChrZXksIGZldGNoZXIpLnRoZW4oKHNv dXJjZSkgPT4gewotICAgICAgICAvLyBIb29rIHBvaW50LgotICAgICAgICAvLyAzLiBMb2FkZXIu aW5zdGFudGlhdGUKLSAgICAgICAgLy8gICAgIGh0dHBzOi8vd2hhdHdnLmdpdGh1Yi5pby9sb2Fk ZXIvI2Jyb3dzZXItaW5zdGFudGlhdGUKLSAgICAgICAgLy8gICAgIFRha2UgdGhlIGtleSBhbmQg dGhlIGZldGNoZWQgc291cmNlIGNvZGUsIGFuZCBpbnN0YW50aWF0ZSB0aGUgbW9kdWxlIHJlY29y ZAotICAgICAgICAvLyAgICAgYnkgcGFyc2luZyB0aGUgbW9kdWxlIHNvdXJjZSBjb2RlLgotICAg ICAgICAvLyAgICAgSXQgaGFzIHRoZSBjaGFuY2UgdG8gcHJvdmlkZSB0aGUgb3B0aW9uYWwgbW9k dWxlIGluc3RhbmNlIHRoYXQgaXMgZGlmZmVyZW50IGZyb20KLSAgICAgICAgLy8gICAgIHRoZSBv cmRpbmFyeSBvbmUuCi0gICAgICAgIHJldHVybiB0aGlzLmluc3RhbnRpYXRlKGtleSwgc291cmNl LCBmZXRjaGVyKS50aGVuKChvcHRpb25hbEluc3RhbmNlKSA9PiB7Ci0gICAgICAgICAgICB0aGlz LmNvbW1pdEluc3RhbnRpYXRlZChlbnRyeSwgb3B0aW9uYWxJbnN0YW5jZSwgc291cmNlKTsKLSAg ICAgICAgICAgIHJldHVybiBlbnRyeTsKLSAgICAgICAgfSk7CisgICAgICAgIHZhciBtb2R1bGVS ZWNvcmQgPSB0aGlzLnBhcnNlTW9kdWxlKGVudHJ5LmtleSwgc291cmNlKTsKKworICAgICAgICAv LyBGSVhNRTogRGVzY3JpYmVkIGluIHRoZSBkcmFmdCwKKyAgICAgICAgLy8gICA0LiBGdWxmaWxs IGVudHJ5LltbSW5zdGFudGlhdGVdXSB3aXRoIGluc3RhbmNlLgorICAgICAgICAvLyBCdXQsIGlu c3RhbnRpYXRlIHByb21pc2Ugc2hvdWxkIGJlIGZ1bGZpbGxlZCB3aXRoIHRoZSBlbnRyeS4KKyAg ICAgICAgLy8gV2UgcmVtb3ZlIHRoaXMgc3RhdGVtZW50IGJlY2F1c2UgaW5zdGFudGlhdGUgcHJv bWlzZSB3aWxsIGJlCisgICAgICAgIC8vIGZ1bGZpbGxlZCB3aXRob3V0IHRoaXMgImZvcmNlIGZ1 bGZpbGwiIG9wZXJhdGlvbi4KKyAgICAgICAgLy8gaHR0cHM6Ly9naXRodWIuY29tL3doYXR3Zy9s b2FkZXIvcHVsbC82NworCisgICAgICAgIHZhciBkZXBlbmRlbmNpZXMgPSBbXTsKKyAgICAgICAg dmFyIGRlcGVuZGVuY2llc01hcCA9IG1vZHVsZVJlY29yZC5kZXBlbmRlbmNpZXNNYXA7CisgICAg ICAgIG1vZHVsZVJlY29yZC5yZWdpc3RyeUVudHJ5ID0gZW50cnk7CisgICAgICAgIHZhciByZXF1 ZXN0ZWRNb2R1bGVzID0gdGhpcy5yZXF1ZXN0ZWRNb2R1bGVzKG1vZHVsZVJlY29yZCk7CisgICAg ICAgIGZvciAodmFyIGkgPSAwLCBsZW5ndGggPSByZXF1ZXN0ZWRNb2R1bGVzLmxlbmd0aDsgaSA8 IGxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICB2YXIgZGVwS2V5ID0gcmVxdWVzdGVkTW9kdWxl c1tpXTsKKyAgICAgICAgICAgIHZhciBwYWlyID0geworICAgICAgICAgICAgICAgIGtleTogZGVw S2V5LAorICAgICAgICAgICAgICAgIHZhbHVlOiBAdW5kZWZpbmVkCisgICAgICAgICAgICB9Owor ICAgICAgICAgICAgQHB1dEJ5VmFsRGlyZWN0KGRlcGVuZGVuY2llcywgZGVwZW5kZW5jaWVzLmxl bmd0aCwgcGFpcik7CisgICAgICAgICAgICBkZXBlbmRlbmNpZXNNYXAuQHNldChkZXBLZXksIHBh aXIpOworICAgICAgICB9CisgICAgICAgIGVudHJ5LmRlcGVuZGVuY2llcyA9IGRlcGVuZGVuY2ll czsKKyAgICAgICAgZW50cnkuZGVwZW5kZW5jaWVzTWFwID0gZGVwZW5kZW5jaWVzTWFwOworICAg ICAgICBlbnRyeS5tb2R1bGUgPSBtb2R1bGVSZWNvcmQ7CisgICAgICAgIEBzZXRTdGF0ZVRvTWF4 KGVudHJ5LCBATW9kdWxlU2F0aXNmeSk7CisgICAgICAgIHJldHVybiBlbnRyeTsKICAgICB9KTsK ICAgICBlbnRyeS5pbnN0YW50aWF0ZSA9IGluc3RhbnRpYXRlUHJvbWlzZTsKICAgICByZXR1cm4g aW5zdGFudGlhdGVQcm9taXNlOwpAQCAtNDAwLDMwICszNTIsMTUgQEAgZnVuY3Rpb24gbW9kdWxl RXZhbHVhdGlvbihtb2R1bGVSZWNvcmQsIGZldGNoZXIpCiAKIC8vIEFQSXMgdG8gY29udHJvbCB0 aGUgbW9kdWxlIGxvYWRlci4KIAotZnVuY3Rpb24gcHJvdmlkZShrZXksIHN0YWdlLCB2YWx1ZSkK K2Z1bmN0aW9uIHByb3ZpZGVGZXRjaChrZXksIHZhbHVlKQogewogICAgICJ1c2Ugc3RyaWN0IjsK IAogICAgIHZhciBlbnRyeSA9IHRoaXMuZW5zdXJlUmVnaXN0ZXJlZChrZXkpOwogCi0gICAgaWYg KHN0YWdlID09PSBATW9kdWxlRmV0Y2gpIHsKLSAgICAgICAgaWYgKGVudHJ5LnN0YXRlID4gQE1v ZHVsZUZldGNoKQotICAgICAgICAgICAgQHRocm93VHlwZUVycm9yKCJSZXF1ZXN0ZWQgbW9kdWxl IGlzIGFscmVhZHkgZmV0Y2hlZC4iKTsKLSAgICAgICAgdGhpcy5mdWxmaWxsRmV0Y2goZW50cnks IHZhbHVlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGlmIChzdGFnZSA9PT0gQE1v ZHVsZUluc3RhbnRpYXRlKSB7Ci0gICAgICAgIGlmIChlbnRyeS5zdGF0ZSA+IEBNb2R1bGVJbnN0 YW50aWF0ZSkKLSAgICAgICAgICAgIEB0aHJvd1R5cGVFcnJvcigiUmVxdWVzdGVkIG1vZHVsZSBp cyBhbHJlYWR5IGluc3RhbnRpYXRlZC4iKTsKLSAgICAgICAgdGhpcy5mdWxmaWxsRmV0Y2goZW50 cnksIEB1bmRlZmluZWQpOwotICAgICAgICBlbnRyeS5mZXRjaC50aGVuKChzb3VyY2UpID0+IHsK LSAgICAgICAgICAgIHRoaXMuZnVsZmlsbEluc3RhbnRpYXRlKGVudHJ5LCB2YWx1ZSwgc291cmNl KTsKLSAgICAgICAgfSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBAdGhyb3dUeXBl RXJyb3IoIlJlcXVlc3RlZCBtb2R1bGUgaXMgYWxyZWFkeSByZWFkeSB0byBiZSBleGVjdXRlZC4i KTsKKyAgICBpZiAoZW50cnkuc3RhdGUgPiBATW9kdWxlRmV0Y2gpCisgICAgICAgIEB0aHJvd1R5 cGVFcnJvcigiUmVxdWVzdGVkIG1vZHVsZSBpcyBhbHJlYWR5IGZldGNoZWQuIik7CisgICAgdGhp cy5mdWxmaWxsRmV0Y2goZW50cnksIHZhbHVlKTsKIH0KIAogZnVuY3Rpb24gbG9hZEFuZEV2YWx1 YXRlTW9kdWxlKG1vZHVsZU5hbWUsIHJlZmVycmVyLCBmZXRjaGVyKQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNw cAppbmRleCBiZmI1OTM1N2RkYzg5ZmE1MmM1MTJlYTUzZjJkMDk2YzNlNmJiNzE2Li5jOGRhNDFi ZDQzY2E5YjA3NWNkODc4Njg3MGMzZmU3NDc4ZjdlZDI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvanNjLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcApA QCAtMTY3Myw3ICsxNjczLDYgQEAgY29uc3QgR2xvYmFsT2JqZWN0TWV0aG9kVGFibGUgR2xvYmFs T2JqZWN0OjpzX2dsb2JhbE9iamVjdE1ldGhvZFRhYmxlID0gewogICAgICZtb2R1bGVMb2FkZXJJ bXBvcnRNb2R1bGUsCiAgICAgJm1vZHVsZUxvYWRlclJlc29sdmUsCiAgICAgJm1vZHVsZUxvYWRl ckZldGNoLAotICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlckluc3RhbnRpYXRlCiAgICAgJm1v ZHVsZUxvYWRlckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzLAogICAgIG51bGxwdHIsIC8vIG1v ZHVsZUxvYWRlckV2YWx1YXRlCiAgICAgbnVsbHB0ciwgLy8gcHJvbWlzZVJlamVjdGlvblRyYWNr ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24u Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tcGxldGlvbi5jcHAKaW5kZXgg MzUxMmU1Mzc3OWU0M2NkMWQ5ZDNiZGM0OGExZGZjYjMwYWQ5YmYzYS4uYmZhMjBmNjIzZTE4YjUz OWQwZWVhYzJmYzQ3MjIwMTcwZTM4ZWU2NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvQ29tcGxldGlvbi5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvQ29tcGxldGlvbi5jcHAKQEAgLTE4Nyw3ICsxODcsNyBAQCBKU0ludGVybmFsUHJvbWlz ZSogbG9hZEFuZEV2YWx1YXRlTW9kdWxlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgU291cmNlQ29k ZSYgc291cgogICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBleGVjLT52bUVudHJ5 R2xvYmFsT2JqZWN0KCk7CiAKICAgICAvLyBJbnNlcnQgdGhlIGdpdmVuIHNvdXJjZSBjb2RlIHRv IHRoZSBNb2R1bGVMb2FkZXIgcmVnaXN0cnkgYXMgdGhlIGZldGNoZWQgcmVnaXN0cnkgZW50cnku Ci0gICAgZ2xvYmFsT2JqZWN0LT5tb2R1bGVMb2FkZXIoKS0+cHJvdmlkZShleGVjLCBrZXksIEpT TW9kdWxlTG9hZGVyOjpTdGF0dXM6OkZldGNoLCBzb3VyY2UpOworICAgIGdsb2JhbE9iamVjdC0+ bW9kdWxlTG9hZGVyKCktPnByb3ZpZGVGZXRjaChleGVjLCBrZXksIHNvdXJjZSk7CiAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgcmVqZWN0UHJvbWlzZShleGVjLCBnbG9iYWxPYmplY3Qp KTsKIAogICAgIHJldHVybiBsb2FkQW5kRXZhbHVhdGVNb2R1bGUobG9jaywgZXhlYywgZ2xvYmFs T2JqZWN0LCBrZXksIGpzVW5kZWZpbmVkKCksIHNjcmlwdEZldGNoZXIpOwpAQCAtMjI3LDcgKzIy Nyw3IEBAIEpTSW50ZXJuYWxQcm9taXNlKiBsb2FkTW9kdWxlKEV4ZWNTdGF0ZSogZXhlYywgY29u c3QgU291cmNlQ29kZSYgc291cmNlLCBKU1ZhbHVlCiAKICAgICAvLyBJbnNlcnQgdGhlIGdpdmVu IHNvdXJjZSBjb2RlIHRvIHRoZSBNb2R1bGVMb2FkZXIgcmVnaXN0cnkgYXMgdGhlIGZldGNoZWQg cmVnaXN0cnkgZW50cnkuCiAgICAgLy8gRklYTUU6IEludHJvZHVjZSBKU1NvdXJjZUNvZGUgb2Jq ZWN0IHRvIHdyYXAgYXJvdW5kIHRoaXMgc291cmNlLgotICAgIGdsb2JhbE9iamVjdC0+bW9kdWxl TG9hZGVyKCktPnByb3ZpZGUoZXhlYywga2V5LCBKU01vZHVsZUxvYWRlcjo6U3RhdHVzOjpGZXRj aCwgc291cmNlKTsKKyAgICBnbG9iYWxPYmplY3QtPm1vZHVsZUxvYWRlcigpLT5wcm92aWRlRmV0 Y2goZXhlYywga2V5LCBzb3VyY2UpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHJl amVjdFByb21pc2UoZXhlYywgZ2xvYmFsT2JqZWN0KSk7CiAKICAgICByZXR1cm4gbG9hZE1vZHVs ZShsb2NrLCBleGVjLCBnbG9iYWxPYmplY3QsIGtleSwganNVbmRlZmluZWQoKSwgc2NyaXB0RmV0 Y2hlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2Jh bE9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVj dC5jcHAKaW5kZXggZjE5MmM0ZjM3Y2EwYjJlMGFhM2YzZGE1MjUyODRhMzNlMzFhNjVmYy4uNDEz MzVhNzMwZTc3MmU3NjI1NWU0MjE4NjNiYTk4ZjMxMTE2OGRlYyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcApAQCAtMjU0LDcgKzI1NCw2 IEBAIGNvbnN0IEdsb2JhbE9iamVjdE1ldGhvZFRhYmxlIEpTR2xvYmFsT2JqZWN0OjpzX2dsb2Jh bE9iamVjdE1ldGhvZFRhYmxlID0gewogICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlckltcG9y dE1vZHVsZQogICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlclJlc29sdmUKICAgICBudWxscHRy LCAvLyBtb2R1bGVMb2FkZXJGZXRjaAotICAgIG51bGxwdHIsIC8vIG1vZHVsZUxvYWRlckluc3Rh bnRpYXRlCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVyQ3JlYXRlSW1wb3J0TWV0YVByb3Bl cnRpZXMKICAgICBudWxscHRyLCAvLyBtb2R1bGVMb2FkZXJFdmFsdWF0ZQogICAgIG51bGxwdHIs IC8vIHByb21pc2VSZWplY3Rpb25UcmFja2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNHbG9iYWxPYmplY3QuaAppbmRleCA4NmEwMTY0ZTMyMTBkMTA4YThjMDhmMTRhOTYz Nzg1NzYzZDEyMTQ0Li5mMWE4ZWRkMjQ0ZmY4NzNiZmJjYTRkZmMxOTM4YWI0YzNkZTE0MjdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5o CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKQEAg LTE5NSw5ICsxOTUsNiBAQCBzdHJ1Y3QgR2xvYmFsT2JqZWN0TWV0aG9kVGFibGUgewogICAgIHR5 cGVkZWYgSlNJbnRlcm5hbFByb21pc2UqICgqTW9kdWxlTG9hZGVyRmV0Y2hQdHIpKEpTR2xvYmFs T2JqZWN0KiwgRXhlY1N0YXRlKiwgSlNNb2R1bGVMb2FkZXIqLCBKU1ZhbHVlLCBKU1ZhbHVlKTsK ICAgICBNb2R1bGVMb2FkZXJGZXRjaFB0ciBtb2R1bGVMb2FkZXJGZXRjaDsKIAotICAgIHR5cGVk ZWYgSlNJbnRlcm5hbFByb21pc2UqICgqTW9kdWxlTG9hZGVySW5zdGFudGlhdGVQdHIpKEpTR2xv YmFsT2JqZWN0KiwgRXhlY1N0YXRlKiwgSlNNb2R1bGVMb2FkZXIqLCBKU1ZhbHVlLCBKU1ZhbHVl LCBKU1ZhbHVlKTsKLSAgICBNb2R1bGVMb2FkZXJJbnN0YW50aWF0ZVB0ciBtb2R1bGVMb2FkZXJJ bnN0YW50aWF0ZTsKLQogICAgIHR5cGVkZWYgSlNPYmplY3QqICgqTW9kdWxlTG9hZGVyQ3JlYXRl SW1wb3J0TWV0YVByb3BlcnRpZXNQdHIpKEpTR2xvYmFsT2JqZWN0KiwgRXhlY1N0YXRlKiwgSlNN b2R1bGVMb2FkZXIqLCBKU1ZhbHVlLCBKU01vZHVsZVJlY29yZCosIEpTVmFsdWUpOwogICAgIE1v ZHVsZUxvYWRlckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzUHRyIG1vZHVsZUxvYWRlckNyZWF0 ZUltcG9ydE1ldGFQcm9wZXJ0aWVzOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU01vZHVsZUxvYWRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU01vZHVsZUxvYWRlci5jcHAKaW5kZXggM2Q3NTJhNmU4ZDBiZGE2MTBkNTFlODA5NTk5 ZjBhYmUwNTkwYWY3MC4uNWFkYzAyYzY0YTZjMDJmNDRhMTU1ODA4MTYzMDM2ZGYyNWU1ZWMxOSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTG9hZGVyLmNw cApAQCAtNzksMTIgKzc5LDEyIEBAIHN0YXRpYyBTdHJpbmcgcHJpbnRhYmxlTW9kdWxlS2V5KEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBrZXkpCiAgICAgcmV0dXJuIHZtLnByb3BlcnR5TmFtZXMt PmVtcHR5SWRlbnRpZmllci5pbXBsKCk7CiB9CiAKLUpTVmFsdWUgSlNNb2R1bGVMb2FkZXI6OnBy b3ZpZGUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGtleSwgU3RhdHVzIHN0YXR1cywgY29uc3Qg U291cmNlQ29kZSYgc291cmNlQ29kZSkKK0pTVmFsdWUgSlNNb2R1bGVMb2FkZXI6OnByb3ZpZGVG ZXRjaChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUga2V5LCBjb25zdCBTb3VyY2VDb2RlJiBzb3Vy Y2VDb2RlKQogewogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfVEhST1dfU0NPUEUodm0pOwogCi0gICAgSlNPYmplY3QqIGZ1bmN0aW9uID0ganNDYXN0 PEpTT2JqZWN0Kj4oZ2V0KGV4ZWMsIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLnBy b3ZpZGVQdWJsaWNOYW1lKCkpKTsKKyAgICBKU09iamVjdCogZnVuY3Rpb24gPSBqc0Nhc3Q8SlNP YmplY3QqPihnZXQoZXhlYywgdm0ucHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkucHJvdmlk ZUZldGNoUHVibGljTmFtZSgpKSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9 KTsKICAgICBDYWxsRGF0YSBjYWxsRGF0YTsKICAgICBDYWxsVHlwZSBjYWxsVHlwZSA9IEpTQzo6 Z2V0Q2FsbERhdGEoZnVuY3Rpb24sIGNhbGxEYXRhKTsKQEAgLTkzLDcgKzkzLDYgQEAgSlNWYWx1 ZSBKU01vZHVsZUxvYWRlcjo6cHJvdmlkZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUga2V5LCBT dGF0dXMgc3RhdHVzLCBjb24KICAgICBTb3VyY2VDb2RlIHNvdXJjZSB7IHNvdXJjZUNvZGUgfTsK ICAgICBNYXJrZWRBcmd1bWVudEJ1ZmZlciBhcmd1bWVudHM7CiAgICAgYXJndW1lbnRzLmFwcGVu ZChrZXkpOwotICAgIGFyZ3VtZW50cy5hcHBlbmQoanNOdW1iZXIoc3RhdHVzKSk7CiAgICAgYXJn dW1lbnRzLmFwcGVuZChKU1NvdXJjZUNvZGU6OmNyZWF0ZSh2bSwgV1RGTW92ZShzb3VyY2UpKSk7 CiAKICAgICBzY29wZS5yZWxlYXNlKCk7CkBAIC0yMzcsMTkgKzIzNiw2IEBAIEpTSW50ZXJuYWxQ cm9taXNlKiBKU01vZHVsZUxvYWRlcjo6ZmV0Y2goRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGtl eSwgSlNWYWx1ZSBzCiAgICAgcmV0dXJuIGRlZmVycmVkLT5wcm9taXNlKCk7CiB9CiAKLUpTSW50 ZXJuYWxQcm9taXNlKiBKU01vZHVsZUxvYWRlcjo6aW5zdGFudGlhdGUoRXhlY1N0YXRlKiBleGVj LCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSBzb3VyY2UsIEpTVmFsdWUgc2NyaXB0RmV0Y2hlcikKLXsK LSAgICBpZiAoT3B0aW9uczo6ZHVtcE1vZHVsZUxvYWRpbmdTdGF0ZSgpKQotICAgICAgICBkYXRh TG9nKCJMb2FkZXIgW2luc3RhbnRpYXRlXSAiLCBwcmludGFibGVNb2R1bGVLZXkoZXhlYywga2V5 KSwgIlxuIik7Ci0KLSAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gZXhlYy0+bGV4 aWNhbEdsb2JhbE9iamVjdCgpOwotICAgIGlmIChnbG9iYWxPYmplY3QtPmdsb2JhbE9iamVjdE1l dGhvZFRhYmxlKCktPm1vZHVsZUxvYWRlckluc3RhbnRpYXRlKQotICAgICAgICByZXR1cm4gZ2xv YmFsT2JqZWN0LT5nbG9iYWxPYmplY3RNZXRob2RUYWJsZSgpLT5tb2R1bGVMb2FkZXJJbnN0YW50 aWF0ZShnbG9iYWxPYmplY3QsIGV4ZWMsIHRoaXMsIGtleSwgc291cmNlLCBzY3JpcHRGZXRjaGVy KTsKLSAgICBKU0ludGVybmFsUHJvbWlzZURlZmVycmVkKiBkZWZlcnJlZCA9IEpTSW50ZXJuYWxQ cm9taXNlRGVmZXJyZWQ6OmNyZWF0ZShleGVjLCBnbG9iYWxPYmplY3QpOwotICAgIGRlZmVycmVk LT5yZXNvbHZlKGV4ZWMsIGpzVW5kZWZpbmVkKCkpOwotICAgIHJldHVybiBkZWZlcnJlZC0+cHJv bWlzZSgpOwotfQotCiBKU09iamVjdCogSlNNb2R1bGVMb2FkZXI6OmNyZWF0ZUltcG9ydE1ldGFQ cm9wZXJ0aWVzKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBrZXksIEpTTW9kdWxlUmVjb3JkKiBt b2R1bGVSZWNvcmQsIEpTVmFsdWUgc2NyaXB0RmV0Y2hlcikKIHsKICAgICBKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0ID0gZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTG9hZGVyLmgKaW5kZXggZmY2MTZmOWNi ZjA1NWM5MDc1MGRlZmYzYjVjMzM4YzUyZDg2MzRkMy4uOTNkMzhmNzM5Nzc2MTY3M2Y4MjBjNDhh YWE4NTYxNjYzOTQ5NGMzMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNNb2R1bGVMb2FkZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U01vZHVsZUxvYWRlci5oCkBAIC02Myw3ICs2Myw3IEBAIGNsYXNzIEpTTW9kdWxlTG9hZGVyIDog cHVibGljIEpTTm9uRmluYWxPYmplY3QgewogICAgIH0KIAogICAgIC8vIEFQSXMgdG8gY29udHJv bCB0aGUgbW9kdWxlIGxvYWRlci4KLSAgICBKU1ZhbHVlIHByb3ZpZGUoRXhlY1N0YXRlKiwgSlNW YWx1ZSBrZXksIFN0YXR1cywgY29uc3QgU291cmNlQ29kZSYpOworICAgIEpTVmFsdWUgcHJvdmlk ZUZldGNoKEV4ZWNTdGF0ZSosIEpTVmFsdWUga2V5LCBjb25zdCBTb3VyY2VDb2RlJik7CiAgICAg SlNJbnRlcm5hbFByb21pc2UqIGxvYWRBbmRFdmFsdWF0ZU1vZHVsZShFeGVjU3RhdGUqLCBKU1Zh bHVlIG1vZHVsZU5hbWUsIEpTVmFsdWUgcmVmZXJyZXIsIEpTVmFsdWUgc2NyaXB0RmV0Y2hlcik7 CiAgICAgSlNJbnRlcm5hbFByb21pc2UqIGxvYWRNb2R1bGUoRXhlY1N0YXRlKiwgSlNWYWx1ZSBt b2R1bGVOYW1lLCBKU1ZhbHVlIHJlZmVycmVyLCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOwogICAg IEpTVmFsdWUgbGlua0FuZEV2YWx1YXRlTW9kdWxlKEV4ZWNTdGF0ZSosIEpTVmFsdWUgbW9kdWxl S2V5LCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOwpAQCAtNzMsNyArNzMsNiBAQCBjbGFzcyBKU01v ZHVsZUxvYWRlciA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0IHsKICAgICBKU0ludGVybmFsUHJv bWlzZSogaW1wb3J0TW9kdWxlKEV4ZWNTdGF0ZSosIEpTU3RyaW5nKiBtb2R1bGVOYW1lLCBjb25z dCBTb3VyY2VPcmlnaW4mIHJlZmVycmVyKTsKICAgICBKU0ludGVybmFsUHJvbWlzZSogcmVzb2x2 ZShFeGVjU3RhdGUqLCBKU1ZhbHVlIG5hbWUsIEpTVmFsdWUgcmVmZXJyZXIsIEpTVmFsdWUgc2Ny aXB0RmV0Y2hlcik7CiAgICAgSlNJbnRlcm5hbFByb21pc2UqIGZldGNoKEV4ZWNTdGF0ZSosIEpT VmFsdWUga2V5LCBKU1ZhbHVlIHNjcmlwdEZldGNoZXIpOwotICAgIEpTSW50ZXJuYWxQcm9taXNl KiBpbnN0YW50aWF0ZShFeGVjU3RhdGUqLCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSBzb3VyY2UsIEpT VmFsdWUgc2NyaXB0RmV0Y2hlcik7CiAgICAgSlNPYmplY3QqIGNyZWF0ZUltcG9ydE1ldGFQcm9w ZXJ0aWVzKEV4ZWNTdGF0ZSosIEpTVmFsdWUga2V5LCBKU01vZHVsZVJlY29yZCosIEpTVmFsdWUg c2NyaXB0RmV0Y2hlcik7CiAKICAgICAvLyBBZGRpdGlvbmFsIHBsYXRmb3JtIGRlcGVuZGVudCBo b29rZWQgQVBJcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01v ZHVsZUxvYWRlclByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9N b2R1bGVMb2FkZXJQcm90b3R5cGUuY3BwCmluZGV4IDdmZjFjY2YxMzQ4MzA5ZTM0MTRlM2M0MTU3 M2NkMzdkYjU4ZWI5NjEuLjQ1ZTI2ZGVkZjU2MjU1Y2ZmNzY1NThhODBiNDUzYTY5YzRkMTI5ZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01vZHVsZUxvYWRlclBy b3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTW9kdWxlTG9h ZGVyUHJvdG90eXBlLmNwcApAQCAtNTMsNyArNTMsNiBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCBtb2R1bGVMb2FkZXJQcm90b3R5cGVFdmFsdWF0ZShFeGVjU3RhdGUqKTsK IHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG1vZHVsZUxvYWRlclByb3RvdHlw ZU1vZHVsZURlY2xhcmF0aW9uSW5zdGFudGlhdGlvbihFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG1vZHVsZUxvYWRlclByb3RvdHlwZVJlc29sdmUoRXhl Y1N0YXRlKik7CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBtb2R1bGVMb2Fk ZXJQcm90b3R5cGVGZXRjaChFeGVjU3RhdGUqKTsKLXN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIG1vZHVsZUxvYWRlclByb3RvdHlwZUluc3RhbnRpYXRlKEV4ZWNTdGF0ZSopOwog c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgbW9kdWxlTG9hZGVyUHJvdG90eXBl R2V0TW9kdWxlTmFtZXNwYWNlT2JqZWN0KEV4ZWNTdGF0ZSopOwogCiB9CkBAIC03MSw5ICs3MCw2 IEBAIGNvbnN0IENsYXNzSW5mbyBNb2R1bGVMb2FkZXJQcm90b3R5cGU6OnNfaW5mbyA9IHsgIk1v ZHVsZUxvYWRlciIsICZCYXNlOjpzX2luZm8sCiAgICAgZW5zdXJlUmVnaXN0ZXJlZCAgICAgICAg ICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBEb250RW51bXxGdW5jdGlvbiAxCiAgICAgZm9yY2VGdWxmaWxsUHJvbWlzZSAgICAgICAgICAg IEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250 RW51bXxGdW5jdGlvbiAyCiAgICAgZnVsZmlsbEZldGNoICAgICAgICAgICAgICAgICAgIEpTQnVp bHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxG dW5jdGlvbiAyCi0gICAgZnVsZmlsbEluc3RhbnRpYXRlICAgICAgICAgICAgIEpTQnVpbHRpbiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlv biAyCi0gICAgY29tbWl0SW5zdGFudGlhdGVkICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCi0g ICAgaW5zdGFudGlhdGlvbiAgICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCiAgICAgcmVx dWVzdEZldGNoICAgICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCiAgICAgcmVxdWVzdElu c3RhbnRpYXRlICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCiAgICAgcmVxdWVzdFNhdGlzZnkg ICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCkBAIC04Myw3ICs3OSw3IEBAIGNvbnN0IENs YXNzSW5mbyBNb2R1bGVMb2FkZXJQcm90b3R5cGU6OnNfaW5mbyA9IHsgIk1vZHVsZUxvYWRlciIs ICZCYXNlOjpzX2luZm8sCiAgICAgbW9kdWxlRGVjbGFyYXRpb25JbnN0YW50aWF0aW9uIG1vZHVs ZUxvYWRlclByb3RvdHlwZU1vZHVsZURlY2xhcmF0aW9uSW5zdGFudGlhdGlvbiBEb250RW51bXxG dW5jdGlvbiAzCiAgICAgbW9kdWxlRXZhbHVhdGlvbiAgICAgICAgICAgICAgIEpTQnVpbHRpbiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlv biAyCiAgICAgZXZhbHVhdGUgICAgICAgICAgICAgICAgICAgICAgIG1vZHVsZUxvYWRlclByb3Rv dHlwZUV2YWx1YXRlICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCi0g ICAgcHJvdmlkZSAgICAgICAgICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCisgICAgcHJv dmlkZUZldGNoICAgICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCiAgICAgbG9hZEFuZEV2 YWx1YXRlTW9kdWxlICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCiAgICAgbG9hZE1vZHVsZSAgICAg ICAgICAgICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCiAgICAgbGlua0FuZEV2YWx1YXRlTW9kdWxl ICAgICAgICAgIEpTQnVpbHRpbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBEb250RW51bXxGdW5jdGlvbiAyCkBAIC05Myw3ICs4OSw2IEBAIGNvbnN0IENsYXNzSW5m byBNb2R1bGVMb2FkZXJQcm90b3R5cGU6OnNfaW5mbyA9IHsgIk1vZHVsZUxvYWRlciIsICZCYXNl OjpzX2luZm8sCiAgICAgcmVxdWVzdGVkTW9kdWxlcyAgICAgICAgICAgICAgIG1vZHVsZUxvYWRl clByb3RvdHlwZVJlcXVlc3RlZE1vZHVsZXMgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlv biAxCiAgICAgcmVzb2x2ZSAgICAgICAgICAgICAgICAgICAgICAgIG1vZHVsZUxvYWRlclByb3Rv dHlwZVJlc29sdmUgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCiAg ICAgZmV0Y2ggICAgICAgICAgICAgICAgICAgICAgICAgIG1vZHVsZUxvYWRlclByb3RvdHlwZUZl dGNoICAgICAgICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAyCi0gICAgaW5z dGFudGlhdGUgICAgICAgICAgICAgICAgICAgIG1vZHVsZUxvYWRlclByb3RvdHlwZUluc3RhbnRp YXRlICAgICAgICAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCiBAZW5kCiAqLwogCkBA IC0yMDMsMjEgKzE5OCw2IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgbW9kdWxlTG9h ZGVyUHJvdG90eXBlRmV0Y2goRXhlY1N0YXRlKiBleGVjKQogICAgIHJldHVybiBKU1ZhbHVlOjpl bmNvZGUobG9hZGVyLT5mZXRjaChleGVjLCBleGVjLT5hcmd1bWVudCgwKSwgZXhlYy0+YXJndW1l bnQoMSkpKTsKIH0KIAotRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBtb2R1bGVMb2FkZXJQ cm90b3R5cGVJbnN0YW50aWF0ZShFeGVjU3RhdGUqIGV4ZWMpCi17Ci0gICAgVk0mIHZtID0gZXhl Yy0+dm0oKTsKLSAgICAvLyBIb29rIHBvaW50LCBMb2FkZXIuaW5zdGFudGlhdGUKLSAgICAvLyBo dHRwczovL3doYXR3Zy5naXRodWIuaW8vbG9hZGVyLyNicm93c2VyLWluc3RhbnRpYXRlCi0gICAg Ly8gVGFrZSB0aGUga2V5IGFuZCB0aGUgZmV0Y2hlZCBzb3VyY2UgY29kZSwgYW5kIGluc3RhbnRp YXRlIHRoZSBtb2R1bGUgcmVjb3JkCi0gICAgLy8gYnkgcGFyc2luZyB0aGUgbW9kdWxlIHNvdXJj ZSBjb2RlLgotICAgIC8vIEl0IGhhcyB0aGUgY2hhbmNlIHRvIHByb3ZpZGUgdGhlIG9wdGlvbmFs IG1vZHVsZSBpbnN0YW5jZSB0aGF0IGlzIGRpZmZlcmVudCBmcm9tCi0gICAgLy8gdGhlIG9yZGlu YXJ5IG9uZS4KLSAgICBKU01vZHVsZUxvYWRlciogbG9hZGVyID0ganNEeW5hbWljQ2FzdDxKU01v ZHVsZUxvYWRlcio+KHZtLCBleGVjLT50aGlzVmFsdWUoKSk7Ci0gICAgaWYgKCFsb2FkZXIpCi0g ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShsb2FkZXItPmluc3RhbnRpYXRlKGV4ZWMsIGV4ZWMtPmFyZ3VtZW50 KDApLCBleGVjLT5hcmd1bWVudCgxKSwgZXhlYy0+YXJndW1lbnQoMikpKTsKLX0KLQogRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBtb2R1bGVMb2FkZXJQcm90b3R5cGVHZXRNb2R1bGVOYW1l c3BhY2VPYmplY3QoRXhlY1N0YXRlKiBleGVjKQogewogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNwcAppbmRl eCBmN2QzNDEyYTU4NmE5NmM3Y2IzZmFlMWUzNzc4YzZlNWM2NmNjYjU5Li4zMDU3YzI2MTg4MGU3 MWVhOTM0ZjBlOGZmNzA1MzViZTg5NGJiN2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAKQEAgLTcyLDcgKzcyLDYgQEAgY29uc3QgR2xvYmFs T2JqZWN0TWV0aG9kVGFibGUgSlNET01XaW5kb3dCYXNlOjpzX2dsb2JhbE9iamVjdE1ldGhvZFRh YmxlID0gewogICAgICZtb2R1bGVMb2FkZXJJbXBvcnRNb2R1bGUsCiAgICAgJm1vZHVsZUxvYWRl clJlc29sdmUsCiAgICAgJm1vZHVsZUxvYWRlckZldGNoLAotICAgIG51bGxwdHIsIC8vIG1vZHVs ZUxvYWRlckluc3RhbnRpYXRlCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVyQ3JlYXRlSW1w b3J0TWV0YVByb3BlcnRpZXMKICAgICAmbW9kdWxlTG9hZGVyRXZhbHVhdGUsCiAgICAgJnByb21p c2VSZWplY3Rpb25UcmFja2VyLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNXb3JrZXJHbG9iYWxTY29wZUJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNXb3JrZXJHbG9iYWxTY29wZUJhc2UuY3BwCmluZGV4IGUxOGIwMzE2NTFkNTgwMjQ4OGYy MjA3NmEyOGFjOTBiZjc1NDkzYWMuLjUyZWU5NzA3MmQ4OTEyZDM4YzVkZDMyYmZjYmEyMGNjNmIz MjU2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyR2xv YmFsU2NvcGVCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtl ckdsb2JhbFNjb3BlQmFzZS5jcHAKQEAgLTU5LDcgKzU5LDYgQEAgY29uc3QgR2xvYmFsT2JqZWN0 TWV0aG9kVGFibGUgSlNXb3JrZXJHbG9iYWxTY29wZUJhc2U6OnNfZ2xvYmFsT2JqZWN0TWV0aG9k VGFibGUKICAgICBudWxscHRyLCAvLyBtb2R1bGVMb2FkZXJJbXBvcnRNb2R1bGUKICAgICBudWxs cHRyLCAvLyBtb2R1bGVMb2FkZXJSZXNvbHZlCiAgICAgbnVsbHB0ciwgLy8gbW9kdWxlTG9hZGVy RmV0Y2gKLSAgICBudWxscHRyLCAvLyBtb2R1bGVMb2FkZXJJbnN0YW50aWF0ZQogICAgIG51bGxw dHIsIC8vIG1vZHVsZUxvYWRlckNyZWF0ZUltcG9ydE1ldGFQcm9wZXJ0aWVzCiAgICAgbnVsbHB0 ciwgLy8gbW9kdWxlTG9hZGVyRXZhbHVhdGUKICAgICBudWxscHRyLCAvLyBwcm9taXNlUmVqZWN0 aW9uVHJhY2tlcgo=