205772 2020-01-04 17:19:55 -0800 Proxy's [[OwnPropertyKeys]] is correct only in PropertyNameMode::StringsAndSymbols 2020-01-08 10:59:20 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203818 InRadar P2 Minor --- 1 ashvayka ashvayka commit-queue ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1602802 0 ashvayka 2020-01-04 17:19:55 -0800 ECMA262: https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys (step 11) 1. If Object.getOwnPropertyNames is called on Proxy with "ownKeys" trap, symbol keys of Proxy's target are ignored during invariants validation. Test262: https://test262.report/browse/built-ins/Object/getOwnPropertyNames/proxy-invariant-absent-not-configurable-symbol-key.js https://test262.report/browse/built-ins/Object/getOwnPropertyNames/proxy-invariant-not-extensible-absent-symbol-key.js https://test262.report/browse/built-ins/Object/getOwnPropertyNames/proxy-invariant-not-extensible-extra-symbol-key.js 2. If Object.getOwnPropertySymbols is called on Proxy with "ownKeys" trap, string keys of Proxy's target are ignored during invariants validation. Test262: https://test262.report/browse/built-ins/Object/getOwnPropertySymbols/proxy-invariant-absent-not-configurable-string-key.js https://test262.report/browse/built-ins/Object/getOwnPropertySymbols/proxy-invariant-not-extensible-absent-string-key.js https://test262.report/browse/built-ins/Object/getOwnPropertySymbols/proxy-invariant-not-extensible-extra-string-key.js 1602813 1 386780 ashvayka 2020-01-04 20:03:12 -0800 Created attachment 386780 Patch 1603194 2 386874 ashvayka 2020-01-06 12:05:10 -0800 Created attachment 386874 Patch Rebase patch. 1603724 3 387017 ashvayka 2020-01-07 12:18:39 -0800 Created attachment 387017 Patch Remove `seenKeys` and explanation comment about it. 1603875 4 387017 ross.kirsling 2020-01-07 16:45:40 -0800 Comment on attachment 387017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387017&action=review r=me > Source/JavaScriptCore/ChangeLog:9 > + (step 11 of https://tc39.es/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys) Seems like it's more than just step 11 though, right? 1604085 5 387104 ashvayka 2020-01-08 07:27:06 -0800 Created attachment 387104 Patch Set reviewer and tweak ChangeLog. 1604158 6 387104 commit-queue 2020-01-08 10:58:47 -0800 Comment on attachment 387104 Patch Clearing flags on attachment: 387104 Committed r254205: <https://trac.webkit.org/changeset/254205> 1604159 7 commit-queue 2020-01-08 10:58:48 -0800 All reviewed patches have been landed. Closing bug. 1604160 8 webkit-bug-importer 2020-01-08 10:59:20 -0800 <rdar://problem/58414163> 386780 2020-01-04 20:03:12 -0800 2020-01-06 12:05:06 -0800 Patch bug-205772-20200105060310.patch text/plain 5865 ashvayka SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTQwMzYpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTA0ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo QGdtYWlsLmNvbT4KKworICAgICAgICBQcm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgY29y cmVjdCBvbmx5IGluIFByb3BlcnR5TmFtZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU3NzIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3QyNjIvZXhwZWN0 YXRpb25zLnlhbWw6IE1hcmsgMTIgdGVzdCBjYXNlcyBhcyBwYXNzaW5nLgorCiAyMDIwLTAxLTAz ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0 ZSB0ZXN0MjYyIHRlc3RzIHRvIGNvbW1pdCAxNTdiMThkCkluZGV4OiBKU1Rlc3RzL3Rlc3QyNjIv ZXhwZWN0YXRpb25zLnlhbWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0 aW9ucy55YW1sCShyZXZpc2lvbiAyNTQwMzIpCisrKyBKU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRp b25zLnlhbWwJKHdvcmtpbmcgY29weSkKQEAgLTExNjEsMjQgKzExNjEsNiBAQCB0ZXN0L2J1aWx0 LWlucy9OdW1iZXIvYmlnaW50LWNvbnZlcnNpb24uCiB0ZXN0L2J1aWx0LWlucy9OdW1iZXIvcHJv dG8tZnJvbS1jdG9yLXJlYWxtLmpzOgogICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3Rl ZCBTYW1lVmFsdWUowqswwrssIMKrMMK7KSB0byBiZSB0cnVlJwogICBzdHJpY3QgbW9kZTogJ1Rl c3QyNjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMKrMMK7LCDCqzDCuykgdG8gYmUgdHJ1ZScK LXRlc3QvYnVpbHQtaW5zL09iamVjdC9nZXRPd25Qcm9wZXJ0eU5hbWVzL3Byb3h5LWludmFyaWFu dC1hYnNlbnQtbm90LWNvbmZpZ3VyYWJsZS1zeW1ib2wta2V5LmpzOgotICBkZWZhdWx0OiAnVGVz dDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2Vw dGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLSAgc3RyaWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4 cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJv d24gYXQgYWxsJwotdGVzdC9idWlsdC1pbnMvT2JqZWN0L2dldE93blByb3BlcnR5TmFtZXMvcHJv eHktaW52YXJpYW50LW5vdC1leHRlbnNpYmxlLWFic2VudC1zeW1ib2wta2V5LmpzOgotICBkZWZh dWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0 IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLSAgc3RyaWN0IG1vZGU6ICdUZXN0MjYy RXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9u IHdhcyB0aHJvd24gYXQgYWxsJwotdGVzdC9idWlsdC1pbnMvT2JqZWN0L2dldE93blByb3BlcnR5 TmFtZXMvcHJveHktaW52YXJpYW50LW5vdC1leHRlbnNpYmxlLWV4dHJhLXN5bWJvbC1rZXkuanM6 Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRo cm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTog J1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBl eGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi10ZXN0L2J1aWx0LWlucy9PYmplY3QvZ2V0T3du UHJvcGVydHlTeW1ib2xzL3Byb3h5LWludmFyaWFudC1hYnNlbnQtbm90LWNvbmZpZ3VyYWJsZS1z dHJpbmcta2V5LmpzOgotICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVF cnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLSAg c3RyaWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRo cm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotdGVzdC9idWlsdC1pbnMv T2JqZWN0L2dldE93blByb3BlcnR5U3ltYm9scy9wcm94eS1pbnZhcmlhbnQtbm90LWV4dGVuc2li bGUtYWJzZW50LXN0cmluZy1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVj dGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24g YXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJy b3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi10ZXN0 L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlTeW1ib2xzL3Byb3h5LWludmFyaWFudC1u b3QtZXh0ZW5zaWJsZS1leHRyYS1zdHJpbmcta2V5LmpzOgotICBkZWZhdWx0OiAnVGVzdDI2MkVy cm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3 YXMgdGhyb3duIGF0IGFsbCcKLSAgc3RyaWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVk IGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQg YWxsJwogdGVzdC9idWlsdC1pbnMvT2JqZWN0L2ludGVybmFscy9EZWZpbmVPd25Qcm9wZXJ0eS9j b25zaXN0ZW50LXZhbHVlLWZ1bmN0aW9uLWFyZ3VtZW50cy5qczoKICAgZGVmYXVsdDogJ1Rlc3Qy NjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMKrbnVsbMK7LCDCq1tvYmplY3QgQXJndW1lbnRz XcK7KSB0byBiZSB0cnVlJwogdGVzdC9idWlsdC1pbnMvT2JqZWN0L2ludGVybmFscy9EZWZpbmVP d25Qcm9wZXJ0eS9jb25zaXN0ZW50LXZhbHVlLWZ1bmN0aW9uLWNhbGxlci5qczoKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU0MDMyKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAx LTA0ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KKworICAgICAgICBQ cm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgY29ycmVjdCBvbmx5IGluIFByb3BlcnR5TmFt ZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDU3NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBmaXhlcyB0d28gc3BlYyBjb21wYXRpYmlsaXR5 IGlzc3VlczoKKyAgICAgICAgKHN0ZXAgMTEgb2YgaHR0cHM6Ly90YzM5LmVzL2VjbWEyNjIvI3Nl Yy1wcm94eS1vYmplY3QtaW50ZXJuYWwtbWV0aG9kcy1hbmQtaW50ZXJuYWwtc2xvdHMtb3ducHJv cGVydHlrZXlzKQorCisgICAgICAgIDEuIElmIE9iamVjdC5nZXRPd25Qcm9wZXJ0eU5hbWVzIGlz IGNhbGxlZCBvbiBQcm94eSB3aXRoICJvd25LZXlzIiB0cmFwLAorICAgICAgICBzeW1ib2wga2V5 cyBvZiBQcm94eSdzIHRhcmdldCBhcmUgaWdub3JlZCBkdXJpbmcgaW52YXJpYW50cyB2YWxpZGF0 aW9uLgorCisgICAgICAgIDIuIElmIE9iamVjdC5nZXRPd25Qcm9wZXJ0eVN5bWJvbHMgaXMgY2Fs bGVkIG9uIFByb3h5IHdpdGggIm93bktleXMiIHRyYXAsCisgICAgICAgIHN0cmluZyBrZXlzIG9m IFByb3h5J3MgdGFyZ2V0IGFyZSBpZ25vcmVkIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24u CisKKyAgICAgICAgU3BlY2lmeWluZyBQcml2YXRlU3ltYm9sTW9kZTo6RXhjbHVkZSBlbGltaW5h dGVzIGFueSBjaGFuY2Ugb2YgZmFsc2UgVHlwZUVycm9ycworICAgICAgICBkdXJpbmcgaW52YXJp YW50cyB2YWxpZGF0aW9uLCBzaW5jZSB1c2VyIGNvZGUgY2FuJ3QgcG9zc2libHkgcmV0dXJuIGEg cHJpdmF0ZSBzeW1ib2wKKyAgICAgICAgZnJvbSAib3duS2V5cyIgdHJhcCwgeWV0IGFuIG9iamVj dCB3aXRoIHByaXZhdGUgc3ltYm9scyBjYW4gYmUgUHJveHkncyB0YXJnZXQuCisKKyAgICAgICAg KiBydW50aW1lL1Byb3h5T2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OnBl cmZvcm1HZXRPd25Qcm9wZXJ0eU5hbWVzKToKKwogMjAyMC0wMS0wMiAgWXVzdWtlIFN1enVraSAg PHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIE1hcmtlZEJsb2NrOjpIYW5kbGUg YW5kIEJsb2NrRGlyZWN0b3J5IHNob3VsZCBiZSBzaHJ1bmsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAJKHJldmlzaW9uIDI1NDAzMikKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTkxLDExICs5OTEsMTEgQEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93 blByb3BlcnR5TgogICAgICAgICAgICAgICAgIHJldHVybiBkb0V4aXRFYXJseTsKICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgaWYgKCEodHlwZSAmIHJlc3VsdEZpbHRlcikpCi0gICAgICAg ICAgICAgICAgcmV0dXJuIGRvbnRFeGl0RWFybHk7Ci0KICAgICAgICAgICAgIHVuY2hlY2tlZFJl c3VsdEtleXMuYWRkKGlkZW50LmltcGwoKSk7Ci0gICAgICAgICAgICB0cmFwUmVzdWx0LmFkZChp ZGVudC5pbXBsKCkpOworCisgICAgICAgICAgICBpZiAodHlwZSAmIHJlc3VsdEZpbHRlcikKKyAg ICAgICAgICAgICAgICB0cmFwUmVzdWx0LmFkZChpZGVudC5pbXBsKCkpOworCiAgICAgICAgICAg ICByZXR1cm4gZG9udEV4aXRFYXJseTsKICAgICAgICAgfTsKIApAQCAtMTAwNyw3ICsxMDA3LDcg QEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TgogICAgIGJvb2wgdGFy Z2V0SXNFeGVuc2libGUgPSB0YXJnZXQtPmlzRXh0ZW5zaWJsZShnbG9iYWxPYmplY3QpOwogICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CiAKLSAgICBQcm9wZXJ0eU5hbWVB cnJheSB0YXJnZXRLZXlzKHZtLCBwcm9wZXJ0eU5hbWVzLnByb3BlcnR5TmFtZU1vZGUoKSwgcHJv cGVydHlOYW1lcy5wcml2YXRlU3ltYm9sTW9kZSgpKTsKKyAgICBQcm9wZXJ0eU5hbWVBcnJheSB0 YXJnZXRLZXlzKHZtLCBQcm9wZXJ0eU5hbWVNb2RlOjpTdHJpbmdzQW5kU3ltYm9scywgUHJpdmF0 ZVN5bWJvbE1vZGU6OkV4Y2x1ZGUpOwogICAgIHRhcmdldC0+bWV0aG9kVGFibGUodm0pLT5nZXRP d25Qcm9wZXJ0eU5hbWVzKHRhcmdldCwgZ2xvYmFsT2JqZWN0LCB0YXJnZXRLZXlzLCBlbnVtZXJh dGlvbk1vZGUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CiAgICAg VmVjdG9yPFVuaXF1ZWRTdHJpbmdJbXBsKj4gdGFyZ2V0Q29uZmlndXJhYmxlS2V5czsK 386874 2020-01-06 12:05:10 -0800 2020-01-07 12:18:34 -0800 Patch bug-205772-20200106220508.patch text/plain 5928 ashvayka SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTQwNzIpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTA2ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo QGdtYWlsLmNvbT4KKworICAgICAgICBQcm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgY29y cmVjdCBvbmx5IGluIFByb3BlcnR5TmFtZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU3NzIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3QyNjIvZXhwZWN0 YXRpb25zLnlhbWw6IE1hcmsgMTIgdGVzdCBjYXNlcyBhcyBwYXNzaW5nLgorCiAyMDIwLTAxLTA2 ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBQcm94 eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgaW5jb3JyZWN0IGluIERvbnRFbnVtUHJvcGVydGll c01vZGU6OkV4Y2x1ZGUKSW5kZXg6IEpTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBKU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwJKHJldmlzaW9u IDI1NDA3MikKKysrIEpTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAkod29ya2luZyBj b3B5KQpAQCAtMTE1OCwyNCArMTE1OCw2IEBAIHRlc3QvYnVpbHQtaW5zL051bWJlci9iaWdpbnQt Y29udmVyc2lvbi4KIHRlc3QvYnVpbHQtaW5zL051bWJlci9wcm90by1mcm9tLWN0b3ItcmVhbG0u anM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjCqzDCuywg wqswwrspIHRvIGJlIHRydWUnCiAgIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3Rl ZCBTYW1lVmFsdWUowqswwrssIMKrMMK7KSB0byBiZSB0cnVlJwotdGVzdC9idWlsdC1pbnMvT2Jq ZWN0L2dldE93blByb3BlcnR5TmFtZXMvcHJveHktaW52YXJpYW50LWFic2VudC1ub3QtY29uZmln dXJhYmxlLXN5bWJvbC1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVk IGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQg YWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3Ig dG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi10ZXN0L2J1 aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlOYW1lcy9wcm94eS1pbnZhcmlhbnQtbm90LWV4 dGVuc2libGUtYWJzZW50LXN5bWJvbC1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6 IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0 aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBU eXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwn Ci10ZXN0L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlOYW1lcy9wcm94eS1pbnZhcmlh bnQtbm90LWV4dGVuc2libGUtZXh0cmEtc3ltYm9sLWtleS5qczoKLSAgZGVmYXVsdDogJ1Rlc3Qy NjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRp b24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBl Y3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3du IGF0IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVjdC9nZXRPd25Qcm9wZXJ0eVN5bWJvbHMvcHJv eHktaW52YXJpYW50LWFic2VudC1ub3QtY29uZmlndXJhYmxlLXN0cmluZy1rZXkuanM6Ci0gIGRl ZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBi dXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3Qy NjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRp b24gd2FzIHRocm93biBhdCBhbGwnCi10ZXN0L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVy dHlTeW1ib2xzL3Byb3h5LWludmFyaWFudC1ub3QtZXh0ZW5zaWJsZS1hYnNlbnQtc3RyaW5nLWtl eS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8g YmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmljdCBt b2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0 IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVjdC9n ZXRPd25Qcm9wZXJ0eVN5bWJvbHMvcHJveHktaW52YXJpYW50LW5vdC1leHRlbnNpYmxlLWV4dHJh LXN0cmluZy1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlw ZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwot ICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUg dGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCiB0ZXN0L2J1aWx0LWlu cy9PYmplY3QvaW50ZXJuYWxzL0RlZmluZU93blByb3BlcnR5L2NvbnNpc3RlbnQtdmFsdWUtZnVu Y3Rpb24tYXJndW1lbnRzLmpzOgogICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBT YW1lVmFsdWUowqtudWxswrssIMKrW29iamVjdCBBcmd1bWVudHNdwrspIHRvIGJlIHRydWUnCiB0 ZXN0L2J1aWx0LWlucy9PYmplY3QvaW50ZXJuYWxzL0RlZmluZU93blByb3BlcnR5L2NvbnNpc3Rl bnQtdmFsdWUtZnVuY3Rpb24tY2FsbGVyLmpzOgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTQwNzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDEtMDYgIEFsZXhleSBTaHZheWth ICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgorCisgICAgICAgIFByb3h5J3MgW1tPd25Qcm9wZXJ0 eUtleXNdXSBpcyBjb3JyZWN0IG9ubHkgaW4gUHJvcGVydHlOYW1lTW9kZTo6U3RyaW5nc0FuZFN5 bWJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw NTc3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgY2hhbmdlIGZpeGVzIHR3byBzcGVjIGNvbXBhdGliaWxpdHkgaXNzdWVzOgorICAgICAgICAo c3RlcCAxMSBvZiBodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLXByb3h5LW9iamVjdC1pbnRl cm5hbC1tZXRob2RzLWFuZC1pbnRlcm5hbC1zbG90cy1vd25wcm9wZXJ0eWtleXMpCisKKyAgICAg ICAgMS4gSWYgT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMgaXMgY2FsbGVkIG9uIFByb3h5IHdp dGggIm93bktleXMiIHRyYXAsCisgICAgICAgIHN5bWJvbCBrZXlzIG9mIFByb3h5J3MgdGFyZ2V0 IGFyZSBpZ25vcmVkIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24uCisKKyAgICAgICAgMi4g SWYgT2JqZWN0LmdldE93blByb3BlcnR5U3ltYm9scyBpcyBjYWxsZWQgb24gUHJveHkgd2l0aCAi b3duS2V5cyIgdHJhcCwKKyAgICAgICAgc3RyaW5nIGtleXMgb2YgUHJveHkncyB0YXJnZXQgYXJl IGlnbm9yZWQgZHVyaW5nIGludmFyaWFudHMgdmFsaWRhdGlvbi4KKworICAgICAgICBTcGVjaWZ5 aW5nIFByaXZhdGVTeW1ib2xNb2RlOjpFeGNsdWRlIGVsaW1pbmF0ZXMgYW55IGNoYW5jZSBvZiBm YWxzZSBUeXBlRXJyb3JzCisgICAgICAgIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24sIHNp bmNlIHVzZXIgY29kZSBjYW4ndCBwb3NzaWJseSByZXR1cm4gYSBwcml2YXRlIHN5bWJvbAorICAg ICAgICBmcm9tICJvd25LZXlzIiB0cmFwLCB5ZXQgYW4gb2JqZWN0IHdpdGggcHJpdmF0ZSBzeW1i b2xzIGNhbiBiZSBQcm94eSdzIHRhcmdldC4KKworICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmpl Y3QuY3BwOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5 TmFtZXMpOgorCiAyMDIwLTAxLTA2ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWls LmNvbT4KIAogICAgICAgICBQcm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgaW5jb3JyZWN0 IGluIERvbnRFbnVtUHJvcGVydGllc01vZGU6OkV4Y2x1ZGUKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAJKHJldmlzaW9uIDI1NDA3MikKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTkxLDExICs5OTEsMTEgQEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93 blByb3BlcnR5TgogICAgICAgICAgICAgICAgIHJldHVybiBkb0V4aXRFYXJseTsKICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgaWYgKCEodHlwZSAmIHJlc3VsdEZpbHRlcikpCi0gICAgICAg ICAgICAgICAgcmV0dXJuIGRvbnRFeGl0RWFybHk7Ci0KICAgICAgICAgICAgIHVuY2hlY2tlZFJl c3VsdEtleXMuYWRkKGlkZW50LmltcGwoKSk7Ci0gICAgICAgICAgICBwcm9wZXJ0eU5hbWVzLmFk ZChpZGVudC5pbXBsKCkpOworCisgICAgICAgICAgICBpZiAodHlwZSAmIHJlc3VsdEZpbHRlcikK KyAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWVzLmFkZChpZGVudC5pbXBsKCkpOworCiAgICAg ICAgICAgICByZXR1cm4gZG9udEV4aXRFYXJseTsKICAgICAgICAgfTsKIApAQCAtMTAwNyw3ICsx MDA3LDcgQEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TgogICAgIGJv b2wgdGFyZ2V0SXNFeGVuc2libGUgPSB0YXJnZXQtPmlzRXh0ZW5zaWJsZShnbG9iYWxPYmplY3Qp OwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CiAKLSAgICBQcm9wZXJ0 eU5hbWVBcnJheSB0YXJnZXRLZXlzKHZtLCBwcm9wZXJ0eU5hbWVzLnByb3BlcnR5TmFtZU1vZGUo KSwgcHJvcGVydHlOYW1lcy5wcml2YXRlU3ltYm9sTW9kZSgpKTsKKyAgICBQcm9wZXJ0eU5hbWVB cnJheSB0YXJnZXRLZXlzKHZtLCBQcm9wZXJ0eU5hbWVNb2RlOjpTdHJpbmdzQW5kU3ltYm9scywg UHJpdmF0ZVN5bWJvbE1vZGU6OkV4Y2x1ZGUpOwogICAgIHRhcmdldC0+bWV0aG9kVGFibGUodm0p LT5nZXRPd25Qcm9wZXJ0eU5hbWVzKHRhcmdldCwgZ2xvYmFsT2JqZWN0LCB0YXJnZXRLZXlzLCBl bnVtZXJhdGlvbk1vZGUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7 CiAgICAgVmVjdG9yPFVuaXF1ZWRTdHJpbmdJbXBsKj4gdGFyZ2V0Q29uZmlndXJhYmxlS2V5czsK 387017 2020-01-07 12:18:39 -0800 2020-01-08 07:27:06 -0800 Patch bug-205772-20200107221837.patch text/plain 7297 ashvayka SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTQxNDQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTA3ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo QGdtYWlsLmNvbT4KKworICAgICAgICBQcm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgY29y cmVjdCBvbmx5IGluIFByb3BlcnR5TmFtZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU3NzIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3QyNjIvZXhwZWN0 YXRpb25zLnlhbWw6IE1hcmsgMTIgdGVzdCBjYXNlcyBhcyBwYXNzaW5nLgorCiAyMDIwLTAxLTA2 ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBTdHJp bmcucHJvdG90eXBlLnJlcGxhY2UoKSBpbmNvcnJlY3RseSBoYW5kbGVzIG5hbWVkIHJlZmVyZW5j ZXMgb24gUmVnRXhwIHcvbyBuYW1lZCBncm91cHMKSW5kZXg6IEpTVGVzdHMvdGVzdDI2Mi9leHBl Y3RhdGlvbnMueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25z LnlhbWwJKHJldmlzaW9uIDI1NDExNCkKKysrIEpTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMu eWFtbAkod29ya2luZyBjb3B5KQpAQCAtMTE1OCwyNCArMTE1OCw2IEBAIHRlc3QvYnVpbHQtaW5z L051bWJlci9iaWdpbnQtY29udmVyc2lvbi4KIHRlc3QvYnVpbHQtaW5zL051bWJlci9wcm90by1m cm9tLWN0b3ItcmVhbG0uanM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNh bWVWYWx1ZSjCqzDCuywgwqswwrspIHRvIGJlIHRydWUnCiAgIHN0cmljdCBtb2RlOiAnVGVzdDI2 MkVycm9yOiBFeHBlY3RlZCBTYW1lVmFsdWUowqswwrssIMKrMMK7KSB0byBiZSB0cnVlJwotdGVz dC9idWlsdC1pbnMvT2JqZWN0L2dldE93blByb3BlcnR5TmFtZXMvcHJveHktaW52YXJpYW50LWFi c2VudC1ub3QtY29uZmlndXJhYmxlLXN5bWJvbC1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYy RXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9u IHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0 ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBh dCBhbGwnCi10ZXN0L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlOYW1lcy9wcm94eS1p bnZhcmlhbnQtbm90LWV4dGVuc2libGUtYWJzZW50LXN5bWJvbC1rZXkuanM6Ci0gIGRlZmF1bHQ6 ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8g ZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJv cjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2Fz IHRocm93biBhdCBhbGwnCi10ZXN0L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlOYW1l cy9wcm94eS1pbnZhcmlhbnQtbm90LWV4dGVuc2libGUtZXh0cmEtc3ltYm9sLWtleS5qczoKLSAg ZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3du IGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVz dDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2Vw dGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVjdC9nZXRPd25Qcm9w ZXJ0eVN5bWJvbHMvcHJveHktaW52YXJpYW50LWFic2VudC1ub3QtY29uZmlndXJhYmxlLXN0cmlu Zy1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9y IHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJp Y3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3du IGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi10ZXN0L2J1aWx0LWlucy9PYmpl Y3QvZ2V0T3duUHJvcGVydHlTeW1ib2xzL3Byb3h5LWludmFyaWFudC1ub3QtZXh0ZW5zaWJsZS1h YnNlbnQtc3RyaW5nLWtleS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQg YSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBh bGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0 byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLXRlc3QvYnVp bHQtaW5zL09iamVjdC9nZXRPd25Qcm9wZXJ0eVN5bWJvbHMvcHJveHktaW52YXJpYW50LW5vdC1l eHRlbnNpYmxlLWV4dHJhLXN0cmluZy1rZXkuanM6Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6 IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0 aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBU eXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwn CiB0ZXN0L2J1aWx0LWlucy9PYmplY3QvaW50ZXJuYWxzL0RlZmluZU93blByb3BlcnR5L2NvbnNp c3RlbnQtdmFsdWUtZnVuY3Rpb24tYXJndW1lbnRzLmpzOgogICBkZWZhdWx0OiAnVGVzdDI2MkVy cm9yOiBFeHBlY3RlZCBTYW1lVmFsdWUowqtudWxswrssIMKrW29iamVjdCBBcmd1bWVudHNdwrsp IHRvIGJlIHRydWUnCiB0ZXN0L2J1aWx0LWlucy9PYmplY3QvaW50ZXJuYWxzL0RlZmluZU93blBy b3BlcnR5L2NvbnNpc3RlbnQtdmFsdWUtZnVuY3Rpb24tY2FsbGVyLmpzOgpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTQxMTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMDEtMDcg IEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgorCisgICAgICAgIFByb3h5 J3MgW1tPd25Qcm9wZXJ0eUtleXNdXSBpcyBjb3JyZWN0IG9ubHkgaW4gUHJvcGVydHlOYW1lTW9k ZTo6U3RyaW5nc0FuZFN5bWJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNTc3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIGZpeGVzIHR3byBzcGVjIGNvbXBhdGliaWxpdHkgaXNz dWVzOgorICAgICAgICAoc3RlcCAxMSBvZiBodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLXBy b3h5LW9iamVjdC1pbnRlcm5hbC1tZXRob2RzLWFuZC1pbnRlcm5hbC1zbG90cy1vd25wcm9wZXJ0 eWtleXMpCisKKyAgICAgICAgMS4gSWYgT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMgaXMgY2Fs bGVkIG9uIFByb3h5IHdpdGggIm93bktleXMiIHRyYXAsCisgICAgICAgIHN5bWJvbCBrZXlzIG9m IFByb3h5J3MgdGFyZ2V0IGFyZSBpZ25vcmVkIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24u CisKKyAgICAgICAgMi4gSWYgT2JqZWN0LmdldE93blByb3BlcnR5U3ltYm9scyBpcyBjYWxsZWQg b24gUHJveHkgd2l0aCAib3duS2V5cyIgdHJhcCwKKyAgICAgICAgc3RyaW5nIGtleXMgb2YgUHJv eHkncyB0YXJnZXQgYXJlIGlnbm9yZWQgZHVyaW5nIGludmFyaWFudHMgdmFsaWRhdGlvbi4KKwor ICAgICAgICBHaXZlbiB0aGF0IHBlciBzcGVjIGB1bmNoZWNrZWRSZXN1bHRLZXlzYCBjb250YWlu cyBib3RoIHN0cmluZ3MgYW5kIHN5bWJvbHMsCisgICAgICAgIGBzZWVuS2V5c2AgYW5kIGV4cGxh bmF0aW9uIGNvbW1lbnQgYWJvdXQgaXQgaXMgcmVtb3ZlZC4KKworICAgICAgICBTcGVjaWZ5aW5n IFByaXZhdGVTeW1ib2xNb2RlOjpFeGNsdWRlIGVsaW1pbmF0ZXMgYW55IGNoYW5jZSBvZiBmYWxz ZSBUeXBlRXJyb3JzCisgICAgICAgIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24sIHNpbmNl IHVzZXIgY29kZSBjYW4ndCBwb3NzaWJseSByZXR1cm4gYSBwcml2YXRlIHN5bWJvbAorICAgICAg ICBmcm9tICJvd25LZXlzIiB0cmFwLCB5ZXQgYW4gb2JqZWN0IHdpdGggcHJpdmF0ZSBzeW1ib2xz IGNhbiBiZSBQcm94eSdzIHRhcmdldC4KKworICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmplY3Qu Y3BwOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TmFt ZXMpOgorCiAyMDIwLTAxLTA2ICBZb3NoaWFraSBKaXRzdWthd2EgIDx5b3NoaWFraS5qaXRzdWth d2FAc29ueS5jb20+CiAKICAgICAgICAgW1BsYXlTdGF0aW9uXSBVcGRhdGUgcG9ydCBjbWFrZQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAko cmV2aXNpb24gMjU0MTE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlP YmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NTYsOCArOTU2LDYgQEAgdm9pZCBQcm94eU9i amVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TgogCiAgICAgSGFzaFNldDxVbmlxdWVkU3RyaW5n SW1wbCo+IHVuY2hlY2tlZFJlc3VsdEtleXM7CiAgICAgewotICAgICAgICBIYXNoU2V0PFJlZlB0 cjxVbmlxdWVkU3RyaW5nSW1wbD4+IHNlZW5LZXlzOwotCiAgICAgICAgIFJ1bnRpbWVUeXBlTWFz ayByZXN1bHRGaWx0ZXIgPSAwOwogICAgICAgICBzd2l0Y2ggKHByb3BlcnR5TmFtZXMucHJvcGVy dHlOYW1lTW9kZSgpKSB7CiAgICAgICAgIGNhc2UgUHJvcGVydHlOYW1lTW9kZTo6U3ltYm9sczoK QEAgLTk3OSwyMyArOTc3LDE0IEBAIHZvaWQgUHJveHlPYmplY3Q6OnBlcmZvcm1HZXRPd25Qcm9w ZXJ0eU4KICAgICAgICAgICAgIElkZW50aWZpZXIgaWRlbnQgPSB2YWx1ZS50b1Byb3BlcnR5S2V5 KGdsb2JhbE9iamVjdCk7CiAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBk b0V4aXRFYXJseSk7CiAKLSAgICAgICAgICAgIC8vIElmIHRyYXBSZXN1bHQgY29udGFpbnMgYW55 IGR1cGxpY2F0ZSBlbnRyaWVzLCB0aHJvdyBhIFR5cGVFcnJvciBleGNlcHRpb24uCi0gICAgICAg ICAgICAvLyAgICAKLSAgICAgICAgICAgIC8vIFBlciBzcGVjWzFdLCBmaWx0ZXJpbmcgYnkgdHlw ZSBzaG91bGQgb2NjdXIgX2FmdGVyXyBbW093blByb3BlcnR5S2V5c11dLCBzbyBkdXBsaWNhdGVz Ci0gICAgICAgICAgICAvLyBhcmUgdHJhY2tlZCBpbiBhIHNlcGFyYXRlIGhhc2h0YWJsZSBmcm9t IHVuY2hlY2tlZFJlc3VsdEtleXMgKHdoaWNoIG9ubHkgY29udGFpbiB0aGUKLSAgICAgICAgICAg IC8vIGtleXMgZmlsdGVyZWQgYnkgdHlwZSkuCi0gICAgICAgICAgICAvLwotICAgICAgICAgICAg Ly8gWzFdIFBlciBodHRwczovL3RjMzkuZ2l0aHViLmlvL2VjbWEyNjIvI3NlYy1wcm94eS1vYmpl Y3QtaW50ZXJuYWwtbWV0aG9kcy1hbmQtaW50ZXJuYWwtc2xvdHMtb3ducHJvcGVydHlrZXlzbXVz dCBub3QgY29udGFpbiBhbnkgZHVwbGljYXRlIG5hbWVzIl9zKTsKLSAgICAgICAgICAgIGlmICgh c2VlbktleXMuYWRkKGlkZW50LmltcGwoKSkuaXNOZXdFbnRyeSkgeworICAgICAgICAgICAgaWYg KCF1bmNoZWNrZWRSZXN1bHRLZXlzLmFkZChpZGVudC5pbXBsKCkpLmlzTmV3RW50cnkpIHsKICAg ICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkg aGFuZGxlcidzICdvd25LZXlzJyB0cmFwIHJlc3VsdCBtdXN0IG5vdCBjb250YWluIGFueSBkdXBs aWNhdGUgbmFtZXMiX3MpOwogICAgICAgICAgICAgICAgIHJldHVybiBkb0V4aXRFYXJseTsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKCEodHlwZSAmIHJlc3VsdEZpbHRlcikpCi0g ICAgICAgICAgICAgICAgcmV0dXJuIGRvbnRFeGl0RWFybHk7CisgICAgICAgICAgICBpZiAodHlw ZSAmIHJlc3VsdEZpbHRlcikKKyAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWVzLmFkZChpZGVu dC5pbXBsKCkpOwogCi0gICAgICAgICAgICB1bmNoZWNrZWRSZXN1bHRLZXlzLmFkZChpZGVudC5p bXBsKCkpOwotICAgICAgICAgICAgcHJvcGVydHlOYW1lcy5hZGQoaWRlbnQuaW1wbCgpKTsKICAg ICAgICAgICAgIHJldHVybiBkb250RXhpdEVhcmx5OwogICAgICAgICB9OwogCkBAIC0xMDA3LDcg Kzk5Niw3IEBAIHZvaWQgUHJveHlPYmplY3Q6OnBlcmZvcm1HZXRPd25Qcm9wZXJ0eU4KICAgICBi b29sIHRhcmdldElzRXhlbnNpYmxlID0gdGFyZ2V0LT5pc0V4dGVuc2libGUoZ2xvYmFsT2JqZWN0 KTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwogCi0gICAgUHJvcGVy dHlOYW1lQXJyYXkgdGFyZ2V0S2V5cyh2bSwgcHJvcGVydHlOYW1lcy5wcm9wZXJ0eU5hbWVNb2Rl KCksIHByb3BlcnR5TmFtZXMucHJpdmF0ZVN5bWJvbE1vZGUoKSk7CisgICAgUHJvcGVydHlOYW1l QXJyYXkgdGFyZ2V0S2V5cyh2bSwgUHJvcGVydHlOYW1lTW9kZTo6U3RyaW5nc0FuZFN5bWJvbHMs IFByaXZhdGVTeW1ib2xNb2RlOjpFeGNsdWRlKTsKICAgICB0YXJnZXQtPm1ldGhvZFRhYmxlKHZt KS0+Z2V0T3duUHJvcGVydHlOYW1lcyh0YXJnZXQsIGdsb2JhbE9iamVjdCwgdGFyZ2V0S2V5cywg ZW51bWVyYXRpb25Nb2RlKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkp OwogICAgIFZlY3RvcjxVbmlxdWVkU3RyaW5nSW1wbCo+IHRhcmdldENvbmZpZ3VyYWJsZUtleXM7 Cg== 387104 2020-01-08 07:27:06 -0800 2020-01-08 10:58:47 -0800 Patch bug-205772-20200107221837-2.patch text/plain 7298 ashvayka SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNTQxNDQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDIwLTAxLTA3ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNo QGdtYWlsLmNvbT4KKworICAgICAgICBQcm94eSdzIFtbT3duUHJvcGVydHlLZXlzXV0gaXMgY29y cmVjdCBvbmx5IGluIFByb3BlcnR5TmFtZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU3NzIKKworICAgICAg ICBSZXZpZXdlZCBieSBSb3NzIEtpcnNsaW5nLgorCisgICAgICAgICogdGVzdDI2Mi9leHBlY3Rh dGlvbnMueWFtbDogTWFyayAxMiB0ZXN0IGNhc2VzIGFzIHBhc3NpbmcuCisKIDIwMjAtMDEtMDYg IEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIFN0cmlu Zy5wcm90b3R5cGUucmVwbGFjZSgpIGluY29ycmVjdGx5IGhhbmRsZXMgbmFtZWQgcmVmZXJlbmNl cyBvbiBSZWdFeHAgdy9vIG5hbWVkIGdyb3VwcwpJbmRleDogSlNUZXN0cy90ZXN0MjYyL2V4cGVj dGF0aW9ucy55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMu eWFtbAkocmV2aXNpb24gMjU0MTE0KQorKysgSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55 YW1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMTU4LDI0ICsxMTU4LDYgQEAgdGVzdC9idWlsdC1pbnMv TnVtYmVyL2JpZ2ludC1jb252ZXJzaW9uLgogdGVzdC9idWlsdC1pbnMvTnVtYmVyL3Byb3RvLWZy b20tY3Rvci1yZWFsbS5qczoKICAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgU2Ft ZVZhbHVlKMKrMMK7LCDCqzDCuykgdG8gYmUgdHJ1ZScKICAgc3RyaWN0IG1vZGU6ICdUZXN0MjYy RXJyb3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjCqzDCuywgwqswwrspIHRvIGJlIHRydWUnCi10ZXN0 L2J1aWx0LWlucy9PYmplY3QvZ2V0T3duUHJvcGVydHlOYW1lcy9wcm94eS1pbnZhcmlhbnQtYWJz ZW50LW5vdC1jb25maWd1cmFibGUtc3ltYm9sLWtleS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJF cnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24g d2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3Rl ZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0 IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVjdC9nZXRPd25Qcm9wZXJ0eU5hbWVzL3Byb3h5LWlu dmFyaWFudC1ub3QtZXh0ZW5zaWJsZS1hYnNlbnQtc3ltYm9sLWtleS5qczoKLSAgZGVmYXVsdDog J1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBl eGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9y OiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMg dGhyb3duIGF0IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVjdC9nZXRPd25Qcm9wZXJ0eU5hbWVz L3Byb3h5LWludmFyaWFudC1ub3QtZXh0ZW5zaWJsZS1leHRyYS1zeW1ib2wta2V5LmpzOgotICBk ZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24g YnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLSAgc3RyaWN0IG1vZGU6ICdUZXN0 MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQgbm8gZXhjZXB0 aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotdGVzdC9idWlsdC1pbnMvT2JqZWN0L2dldE93blByb3Bl cnR5U3ltYm9scy9wcm94eS1pbnZhcmlhbnQtYWJzZW50LW5vdC1jb25maWd1cmFibGUtc3RyaW5n LWtleS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3Ig dG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmlj dCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24g YnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKLXRlc3QvYnVpbHQtaW5zL09iamVj dC9nZXRPd25Qcm9wZXJ0eVN5bWJvbHMvcHJveHktaW52YXJpYW50LW5vdC1leHRlbnNpYmxlLWFi c2VudC1zdHJpbmcta2V5LmpzOgotICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBh IFR5cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFs bCcKLSAgc3RyaWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRv IGJlIHRocm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotdGVzdC9idWls dC1pbnMvT2JqZWN0L2dldE93blByb3BlcnR5U3ltYm9scy9wcm94eS1pbnZhcmlhbnQtbm90LWV4 dGVuc2libGUtZXh0cmEtc3RyaW5nLWtleS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjog RXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRo cm93biBhdCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5 cGVFcnJvciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcK IHRlc3QvYnVpbHQtaW5zL09iamVjdC9pbnRlcm5hbHMvRGVmaW5lT3duUHJvcGVydHkvY29uc2lz dGVudC12YWx1ZS1mdW5jdGlvbi1hcmd1bWVudHMuanM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyRXJy b3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjCq251bGzCuywgwqtbb2JqZWN0IEFyZ3VtZW50c13Cuykg dG8gYmUgdHJ1ZScKIHRlc3QvYnVpbHQtaW5zL09iamVjdC9pbnRlcm5hbHMvRGVmaW5lT3duUHJv cGVydHkvY29uc2lzdGVudC12YWx1ZS1mdW5jdGlvbi1jYWxsZXIuanM6CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDExNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyOSBAQAorMjAyMC0wMS0wNyAg QWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CisKKyAgICAgICAgUHJveHkn cyBbW093blByb3BlcnR5S2V5c11dIGlzIGNvcnJlY3Qgb25seSBpbiBQcm9wZXJ0eU5hbWVNb2Rl OjpTdHJpbmdzQW5kU3ltYm9scworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA1NzcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9zcyBLaXJzbGluZy4K KworICAgICAgICBUaGlzIGNoYW5nZSBmaXhlcyB0d28gc3BlYyBjb21wYXRpYmlsaXR5IGlzc3Vl czoKKyAgICAgICAgKHN0ZXBzIDgtMTEgb2YgaHR0cHM6Ly90YzM5LmVzL2VjbWEyNjIvI3NlYy1w cm94eS1vYmplY3QtaW50ZXJuYWwtbWV0aG9kcy1hbmQtaW50ZXJuYWwtc2xvdHMtb3ducHJvcGVy dHlrZXlzKQorCisgICAgICAgIDEuIElmIE9iamVjdC5nZXRPd25Qcm9wZXJ0eU5hbWVzIGlzIGNh bGxlZCBvbiBQcm94eSB3aXRoICJvd25LZXlzIiB0cmFwLAorICAgICAgICBzeW1ib2wga2V5cyBv ZiBQcm94eSdzIHRhcmdldCBhcmUgaWdub3JlZCBkdXJpbmcgaW52YXJpYW50cyB2YWxpZGF0aW9u LgorCisgICAgICAgIDIuIElmIE9iamVjdC5nZXRPd25Qcm9wZXJ0eVN5bWJvbHMgaXMgY2FsbGVk IG9uIFByb3h5IHdpdGggIm93bktleXMiIHRyYXAsCisgICAgICAgIHN0cmluZyBrZXlzIG9mIFBy b3h5J3MgdGFyZ2V0IGFyZSBpZ25vcmVkIGR1cmluZyBpbnZhcmlhbnRzIHZhbGlkYXRpb24uCisK KyAgICAgICAgR2l2ZW4gdGhhdCBwZXIgc3BlYyBgdW5jaGVja2VkUmVzdWx0S2V5c2AgY29udGFp bnMgYm90aCBzdHJpbmdzIGFuZCBzeW1ib2xzLAorICAgICAgICBgc2VlbktleXNgIGFuZCBleHBs YW5hdGlvbiBjb21tZW50IGFib3V0IGl0IGlzIHJlbW92ZWQuCisKKyAgICAgICAgU3BlY2lmeWlu ZyBQcml2YXRlU3ltYm9sTW9kZTo6RXhjbHVkZSBlbGltaW5hdGVzIGFueSBjaGFuY2Ugb2YgZmFs c2UgVHlwZUVycm9ycworICAgICAgICBkdXJpbmcgaW52YXJpYW50cyB2YWxpZGF0aW9uLCBzaW5j ZSB1c2VyIGNvZGUgY2FuJ3QgcG9zc2libHkgcmV0dXJuIGEgcHJpdmF0ZSBzeW1ib2wKKyAgICAg ICAgZnJvbSAib3duS2V5cyIgdHJhcCwgeWV0IGFuIG9iamVjdCB3aXRoIHByaXZhdGUgc3ltYm9s cyBjYW4gYmUgUHJveHkncyB0YXJnZXQuCisKKyAgICAgICAgKiBydW50aW1lL1Byb3h5T2JqZWN0 LmNwcDoKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OnBlcmZvcm1HZXRPd25Qcm9wZXJ0eU5h bWVzKToKKwogMjAyMC0wMS0wNiAgWW9zaGlha2kgSml0c3VrYXdhICA8eW9zaGlha2kuaml0c3Vr YXdhQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gVXBkYXRlIHBvcnQgY21ha2UK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAJ KHJldmlzaW9uIDI1NDExNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5 T2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTU2LDggKzk1Niw2IEBAIHZvaWQgUHJveHlP YmplY3Q6OnBlcmZvcm1HZXRPd25Qcm9wZXJ0eU4KIAogICAgIEhhc2hTZXQ8VW5pcXVlZFN0cmlu Z0ltcGwqPiB1bmNoZWNrZWRSZXN1bHRLZXlzOwogICAgIHsKLSAgICAgICAgSGFzaFNldDxSZWZQ dHI8VW5pcXVlZFN0cmluZ0ltcGw+PiBzZWVuS2V5czsKLQogICAgICAgICBSdW50aW1lVHlwZU1h c2sgcmVzdWx0RmlsdGVyID0gMDsKICAgICAgICAgc3dpdGNoIChwcm9wZXJ0eU5hbWVzLnByb3Bl cnR5TmFtZU1vZGUoKSkgewogICAgICAgICBjYXNlIFByb3BlcnR5TmFtZU1vZGU6OlN5bWJvbHM6 CkBAIC05NzksMjMgKzk3NywxNCBAQCB2b2lkIFByb3h5T2JqZWN0OjpwZXJmb3JtR2V0T3duUHJv cGVydHlOCiAgICAgICAgICAgICBJZGVudGlmaWVyIGlkZW50ID0gdmFsdWUudG9Qcm9wZXJ0eUtl eShnbG9iYWxPYmplY3QpOwogICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZG9FeGl0RWFybHkpOwogCi0gICAgICAgICAgICAvLyBJZiB0cmFwUmVzdWx0IGNvbnRhaW5zIGFu eSBkdXBsaWNhdGUgZW50cmllcywgdGhyb3cgYSBUeXBlRXJyb3IgZXhjZXB0aW9uLgotICAgICAg ICAgICAgLy8gICAgCi0gICAgICAgICAgICAvLyBQZXIgc3BlY1sxXSwgZmlsdGVyaW5nIGJ5IHR5 cGUgc2hvdWxkIG9jY3VyIF9hZnRlcl8gW1tPd25Qcm9wZXJ0eUtleXNdXSwgc28gZHVwbGljYXRl cwotICAgICAgICAgICAgLy8gYXJlIHRyYWNrZWQgaW4gYSBzZXBhcmF0ZSBoYXNodGFibGUgZnJv bSB1bmNoZWNrZWRSZXN1bHRLZXlzICh3aGljaCBvbmx5IGNvbnRhaW4gdGhlCi0gICAgICAgICAg ICAvLyBrZXlzIGZpbHRlcmVkIGJ5IHR5cGUpLgotICAgICAgICAgICAgLy8KLSAgICAgICAgICAg IC8vIFsxXSBQZXIgaHR0cHM6Ly90YzM5LmdpdGh1Yi5pby9lY21hMjYyLyNzZWMtcHJveHktb2Jq ZWN0LWludGVybmFsLW1ldGhvZHMtYW5kLWludGVybmFsLXNsb3RzLW93bnByb3BlcnR5a2V5c211 c3Qgbm90IGNvbnRhaW4gYW55IGR1cGxpY2F0ZSBuYW1lcyJfcyk7Ci0gICAgICAgICAgICBpZiAo IXNlZW5LZXlzLmFkZChpZGVudC5pbXBsKCkpLmlzTmV3RW50cnkpIHsKKyAgICAgICAgICAgIGlm ICghdW5jaGVja2VkUmVzdWx0S2V5cy5hZGQoaWRlbnQuaW1wbCgpKS5pc05ld0VudHJ5KSB7CiAg ICAgICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5 IGhhbmRsZXIncyAnb3duS2V5cycgdHJhcCByZXN1bHQgbXVzdCBub3QgY29udGFpbiBhbnkgZHVw bGljYXRlIG5hbWVzIl9zKTsKICAgICAgICAgICAgICAgICByZXR1cm4gZG9FeGl0RWFybHk7CiAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICghKHR5cGUgJiByZXN1bHRGaWx0ZXIpKQot ICAgICAgICAgICAgICAgIHJldHVybiBkb250RXhpdEVhcmx5OworICAgICAgICAgICAgaWYgKHR5 cGUgJiByZXN1bHRGaWx0ZXIpCisgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lcy5hZGQoaWRl bnQuaW1wbCgpKTsKIAotICAgICAgICAgICAgdW5jaGVja2VkUmVzdWx0S2V5cy5hZGQoaWRlbnQu aW1wbCgpKTsKLSAgICAgICAgICAgIHByb3BlcnR5TmFtZXMuYWRkKGlkZW50LmltcGwoKSk7CiAg ICAgICAgICAgICByZXR1cm4gZG9udEV4aXRFYXJseTsKICAgICAgICAgfTsKIApAQCAtMTAwNyw3 ICs5OTYsNyBAQCB2b2lkIFByb3h5T2JqZWN0OjpwZXJmb3JtR2V0T3duUHJvcGVydHlOCiAgICAg Ym9vbCB0YXJnZXRJc0V4ZW5zaWJsZSA9IHRhcmdldC0+aXNFeHRlbnNpYmxlKGdsb2JhbE9iamVj dCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKIAotICAgIFByb3Bl cnR5TmFtZUFycmF5IHRhcmdldEtleXModm0sIHByb3BlcnR5TmFtZXMucHJvcGVydHlOYW1lTW9k ZSgpLCBwcm9wZXJ0eU5hbWVzLnByaXZhdGVTeW1ib2xNb2RlKCkpOworICAgIFByb3BlcnR5TmFt ZUFycmF5IHRhcmdldEtleXModm0sIFByb3BlcnR5TmFtZU1vZGU6OlN0cmluZ3NBbmRTeW1ib2xz LCBQcml2YXRlU3ltYm9sTW9kZTo6RXhjbHVkZSk7CiAgICAgdGFyZ2V0LT5tZXRob2RUYWJsZSh2 bSktPmdldE93blByb3BlcnR5TmFtZXModGFyZ2V0LCBnbG9iYWxPYmplY3QsIHRhcmdldEtleXMs IGVudW1lcmF0aW9uTW9kZSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgp KTsKICAgICBWZWN0b3I8VW5pcXVlZFN0cmluZ0ltcGwqPiB0YXJnZXRDb25maWd1cmFibGVLZXlz Owo=