133661 2014-06-09 15:38:34 -0700 Global HashTables contain references to atomic StringImpls 2014-06-10 11:33:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 133687 1 mhahnenberg mhahnenberg ap commit-queue dbates ggaren oldest_to_newest 1014254 0 mhahnenberg 2014-06-09 15:38:34 -0700 This was a long-standing bug revealed by bug 133558. The issue is that the global static HashTables cache their set of keys as StringImpls that are associated with a particular VM. This is obviously incompatible with using multiple VMs on multiple threads (e.g. when using workers). The fix is to change the "keys" field of the static HashTables to be char** instead of StringImpl**. 1014265 1 232743 mhahnenberg 2014-06-09 16:03:26 -0700 Created attachment 232743 Patch 1014266 2 232743 ggaren 2014-06-09 16:07:53 -0700 Comment on attachment 232743 Patch r=me 1014310 3 232760 rniwa 2014-06-09 19:00:26 -0700 Created attachment 232760 Patch for landing 1014324 4 232760 commit-queue 2014-06-09 20:02:17 -0700 Comment on attachment 232760 Patch for landing Clearing flags on attachment: 232760 Committed r169740: <http://trac.webkit.org/changeset/169740> 1014325 5 commit-queue 2014-06-09 20:02:19 -0700 All reviewed patches have been landed. Closing bug. 1014416 6 ap 2014-06-10 09:52:57 -0700 > This is obviously incompatible with using multiple VMs on multiple threads (e.g. when using workers) Wasn't this the case that "NoStaticTables" attribute handled? And if so, do we still need it after this patch, or can we remove it from everywhere? 1014421 7 dbates 2014-06-10 10:07:34 -0700 <rdar://problem/17249454> 1014456 8 ap 2014-06-10 11:33:38 -0700 Mark filed bug 133687 to look into whether we still need NoStaticTables. 232743 2014-06-09 16:03:26 -0700 2014-06-09 19:00:23 -0700 Patch bug-133661-20140609160301.patch text/plain 4202 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5NzI2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTA2LTA5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgR2xvYmFsIEhhc2hUYWJsZXMgY29udGFpbiByZWZlcmVuY2VzIHRvIGF0b21pYyBT dHJpbmdJbXBscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMzNjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyB3YXMgYSBsb25nLXN0YW5kaW5nIGJ1ZyByZXZlYWxlZCBieSBidWcgMTMzNTU4LiBU aGUgaXNzdWUgaXMgdGhhdCB0aGUgZ2xvYmFsIHN0YXRpYyBIYXNoVGFibGVzIAorICAgICAgICBj YWNoZSB0aGVpciBzZXQgb2Yga2V5cyBhcyBTdHJpbmdJbXBscyB0aGF0IGFyZSBhc3NvY2lhdGVk IHdpdGggYSBwYXJ0aWN1bGFyIFZNLiAgVGhpcyBpcyBvYnZpb3VzbHkgCisgICAgICAgIGluY29t cGF0aWJsZSB3aXRoIHVzaW5nIG11bHRpcGxlIFZNcyBvbiBtdWx0aXBsZSB0aHJlYWRzIChlLmcu IHdoZW4gdXNpbmcgd29ya2VycykuIFRoZSBmaXggaXMgdG8gCisgICAgICAgIGNoYW5nZSB0aGUg ImtleXMiIGZpZWxkIG9mIHRoZSBzdGF0aWMgSGFzaFRhYmxlcyB0byBiZSBjaGFyKiogaW5zdGVh ZCBvZiBTdHJpbmdJbXBsKiouCisKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAg ICAgICAgKEpTQzo6Z2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKiBydW50aW1lL0xv b2t1cC5jcHA6CisgICAgICAgIChKU0M6Okhhc2hUYWJsZTo6Y3JlYXRlVGFibGUpOgorICAgICAg ICAoSlNDOjpIYXNoVGFibGU6OmRlbGV0ZVRhYmxlKToKKyAgICAgICAgKiBydW50aW1lL0xvb2t1 cC5oOgorICAgICAgICAoSlNDOjpIYXNoVGFibGU6OkNvbnN0SXRlcmF0b3I6OmtleSk6CisgICAg ICAgIChKU0M6Okhhc2hUYWJsZTo6ZW50cnkpOgorCiAyMDE0LTA2LTA5ICBNYXJrIEhhaG5lbmJl cmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4IGFmdGVyIHIx Njk3MDMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJ KHJldmlzaW9uIDE2OTcyMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsNyBAQCBzdGF0aWMgaW5saW5lIHZv aWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzCiAKICAgICAgICAgZm9yIChhdXRvIGl0ZXIgPSB0YWJs ZS0+YmVnaW4odm0pOyBpdGVyICE9IHRhYmxlLT5lbmQodm0pOyArK2l0ZXIpIHsKICAgICAgICAg ICAgIGlmICgoIShpdGVyLT5hdHRyaWJ1dGVzKCkgJiBEb250RW51bSkgfHwgKG1vZGUgPT0gSW5j bHVkZURvbnRFbnVtUHJvcGVydGllcykpICYmICEoKGl0ZXItPmF0dHJpYnV0ZXMoKSAmIEJ1aWx0 aW5PckZ1bmN0aW9uKSAmJiBkaWRSZWlmeSkpCi0gICAgICAgICAgICAgICAgcHJvcGVydHlOYW1l cy5hZGQoaXRlci5rZXkoKSk7CisgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lcy5hZGQoSWRl bnRpZmllcigmdm0sIGl0ZXIua2V5KCkpKTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNwcAkocmV2aXNpb24gMTY5NzIzKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjYsMTQgKzI2LDE0IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi12b2lkIEhhc2hUYWJs ZTo6Y3JlYXRlVGFibGUoVk0mIHZtKSBjb25zdAordm9pZCBIYXNoVGFibGU6OmNyZWF0ZVRhYmxl KFZNJikgY29uc3QKIHsKICAgICBBU1NFUlQoIWtleXMpOwotICAgIGtleXMgPSBzdGF0aWNfY2Fz dDxTdHJpbmdJbXBsKio+KGZhc3RNYWxsb2Moc2l6ZW9mKFN0cmluZ0ltcGwqKSAqIG51bWJlck9m VmFsdWVzKSk7CisgICAga2V5cyA9IHN0YXRpY19jYXN0PGNvbnN0IGNoYXIqKj4oZmFzdE1hbGxv YyhzaXplb2YoY2hhciopICogbnVtYmVyT2ZWYWx1ZXMpKTsKIAogICAgIGZvciAoaW50IGkgPSAw OyBpIDwgbnVtYmVyT2ZWYWx1ZXM7ICsraSkgewogICAgICAgICBpZiAodmFsdWVzW2ldLm1fa2V5 KQotICAgICAgICAgICAga2V5c1tpXSA9ICZJZGVudGlmaWVyOjphZGQoJnZtLCB2YWx1ZXNbaV0u bV9rZXkpLmxlYWtSZWYoKTsKKyAgICAgICAgICAgIGtleXNbaV0gPSB2YWx1ZXNbaV0ubV9rZXk7 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGtleXNbaV0gPSAwOwogICAgIH0KQEAgLTQyLDEw ICs0Miw2IEBAIHZvaWQgSGFzaFRhYmxlOjpjcmVhdGVUYWJsZShWTSYgdm0pIGNvbnMKIHZvaWQg SGFzaFRhYmxlOjpkZWxldGVUYWJsZSgpIGNvbnN0CiB7CiAgICAgaWYgKGtleXMpIHsKLSAgICAg ICAgZm9yIChpbnQgaSA9IDA7IGkgIT0gbnVtYmVyT2ZWYWx1ZXM7ICsraSkgewotICAgICAgICAg ICAgaWYgKGtleXNbaV0pCi0gICAgICAgICAgICAgICAga2V5c1tpXS0+ZGVyZWYoKTsKLSAgICAg ICAgfQogICAgICAgICBmYXN0RnJlZShrZXlzKTsKICAgICAgICAga2V5cyA9IG51bGxwdHI7CiAg ICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgJKHJldmlzaW9u IDE2OTcyMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03Nyw3ICs3Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBib29s IGhhc1NldHRlck9yUmVhZG9ubHlQcm9wZXJ0aWVzOwogCiAgICAgICAgIGNvbnN0IEhhc2hUYWJs ZVZhbHVlKiB2YWx1ZXM7IC8vIEZpeGVkIHZhbHVlcyBnZW5lcmF0ZWQgYnkgc2NyaXB0LgotICAg ICAgICBtdXRhYmxlIFN0cmluZ0ltcGwqKiBrZXlzOyAvLyBUYWJsZSBhbGxvY2F0ZWQgYXQgcnVu dGltZS4KKyAgICAgICAgbXV0YWJsZSBjb25zdCBjaGFyKioga2V5czsgLy8gVGFibGUgYWxsb2Nh dGVkIGF0IHJ1bnRpbWUuCiAgICAgICAgIGNvbnN0IENvbXBhY3RIYXNoSW5kZXgqIGluZGV4Owog CiAgICAgICAgIEFMV0FZU19JTkxJTkUgSGFzaFRhYmxlIGNvcHkoKSBjb25zdApAQCAtMTI4LDcg KzEyOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIHJldHVybiAmbV90YWJs ZS0+dmFsdWVzW21fcG9zaXRpb25dOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBTdHJp bmdJbXBsKiBrZXkoKQorICAgICAgICAgICAgY29uc3QgY2hhcioga2V5KCkKICAgICAgICAgICAg IHsKICAgICAgICAgICAgICAgICByZXR1cm4gbV90YWJsZS0+a2V5c1ttX3Bvc2l0aW9uXTsKICAg ICAgICAgICAgIH0KQEAgLTE5MSw3ICsxOTEsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAg ICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAg ICAgICAgICBpZiAoa2V5c1t2YWx1ZUluZGV4XSA9PSBpbXBsKQorICAgICAgICAgICAgICAgIGlm ICghc3RyY21wKGtleXNbdmFsdWVJbmRleF0sIGltcGwtPnV0ZjgoKS5kYXRhKCkpKQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gJnZhbHVlc1t2YWx1ZUluZGV4XTsKIAogICAgICAgICAgICAg ICAgIGluZGV4RW50cnkgPSBpbmRleFtpbmRleEVudHJ5XS5uZXh0Owo= 232760 2014-06-09 19:00:26 -0700 2014-06-09 20:02:16 -0700 Patch for landing bug-133661-20140609185954.patch text/plain 4190 rniwa SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY5NzM3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTA2LTA5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgR2xvYmFsIEhhc2hUYWJsZXMgY29udGFpbiByZWZlcmVuY2VzIHRvIGF0b21pYyBT dHJpbmdJbXBscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMzNjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAg ICAgVGhpcyB3YXMgYSBsb25nLXN0YW5kaW5nIGJ1ZyByZXZlYWxlZCBieSBidWcgMTMzNTU4LiBU aGUgaXNzdWUgaXMgdGhhdCB0aGUgZ2xvYmFsIHN0YXRpYyBIYXNoVGFibGVzIAorICAgICAgICBj YWNoZSB0aGVpciBzZXQgb2Yga2V5cyBhcyBTdHJpbmdJbXBscyB0aGF0IGFyZSBhc3NvY2lhdGVk IHdpdGggYSBwYXJ0aWN1bGFyIFZNLiAgVGhpcyBpcyBvYnZpb3VzbHkgCisgICAgICAgIGluY29t cGF0aWJsZSB3aXRoIHVzaW5nIG11bHRpcGxlIFZNcyBvbiBtdWx0aXBsZSB0aHJlYWRzIChlLmcu IHdoZW4gdXNpbmcgd29ya2VycykuIFRoZSBmaXggaXMgdG8gCisgICAgICAgIGNoYW5nZSB0aGUg ImtleXMiIGZpZWxkIG9mIHRoZSBzdGF0aWMgSGFzaFRhYmxlcyB0byBiZSBjaGFyKiogaW5zdGVh ZCBvZiBTdHJpbmdJbXBsKiouCisKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAg ICAgICAgKEpTQzo6Z2V0Q2xhc3NQcm9wZXJ0eU5hbWVzKToKKyAgICAgICAgKiBydW50aW1lL0xv b2t1cC5jcHA6CisgICAgICAgIChKU0M6Okhhc2hUYWJsZTo6Y3JlYXRlVGFibGUpOgorICAgICAg ICAoSlNDOjpIYXNoVGFibGU6OmRlbGV0ZVRhYmxlKToKKyAgICAgICAgKiBydW50aW1lL0xvb2t1 cC5oOgorICAgICAgICAoSlNDOjpIYXNoVGFibGU6OkNvbnN0SXRlcmF0b3I6OmtleSk6CisgICAg ICAgIChKU0M6Okhhc2hUYWJsZTo6ZW50cnkpOgorCiAyMDE0LTA2LTA5ICBNYXJrIEhhaG5lbmJl cmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4IGFmdGVyIHIx Njk3MDMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJ KHJldmlzaW9uIDE2OTczNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsNyBAQCBzdGF0aWMgaW5saW5lIHZv aWQgZ2V0Q2xhc3NQcm9wZXJ0eU5hbWVzCiAKICAgICAgICAgZm9yIChhdXRvIGl0ZXIgPSB0YWJs ZS0+YmVnaW4odm0pOyBpdGVyICE9IHRhYmxlLT5lbmQodm0pOyArK2l0ZXIpIHsKICAgICAgICAg ICAgIGlmICgoIShpdGVyLT5hdHRyaWJ1dGVzKCkgJiBEb250RW51bSkgfHwgKG1vZGUgPT0gSW5j bHVkZURvbnRFbnVtUHJvcGVydGllcykpICYmICEoKGl0ZXItPmF0dHJpYnV0ZXMoKSAmIEJ1aWx0 aW5PckZ1bmN0aW9uKSAmJiBkaWRSZWlmeSkpCi0gICAgICAgICAgICAgICAgcHJvcGVydHlOYW1l cy5hZGQoaXRlci5rZXkoKSk7CisgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lcy5hZGQoSWRl bnRpZmllcigmdm0sIGl0ZXIua2V5KCkpKTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNwcAkocmV2aXNpb24gMTY5NzM3KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjYsMTQgKzI2LDE0IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi12b2lkIEhhc2hUYWJs ZTo6Y3JlYXRlVGFibGUoVk0mIHZtKSBjb25zdAordm9pZCBIYXNoVGFibGU6OmNyZWF0ZVRhYmxl KFZNJikgY29uc3QKIHsKICAgICBBU1NFUlQoIWtleXMpOwotICAgIGtleXMgPSBzdGF0aWNfY2Fz dDxTdHJpbmdJbXBsKio+KGZhc3RNYWxsb2Moc2l6ZW9mKFN0cmluZ0ltcGwqKSAqIG51bWJlck9m VmFsdWVzKSk7CisgICAga2V5cyA9IHN0YXRpY19jYXN0PGNvbnN0IGNoYXIqKj4oZmFzdE1hbGxv YyhzaXplb2YoY2hhciopICogbnVtYmVyT2ZWYWx1ZXMpKTsKIAogICAgIGZvciAoaW50IGkgPSAw OyBpIDwgbnVtYmVyT2ZWYWx1ZXM7ICsraSkgewogICAgICAgICBpZiAodmFsdWVzW2ldLm1fa2V5 KQotICAgICAgICAgICAga2V5c1tpXSA9ICZJZGVudGlmaWVyOjphZGQoJnZtLCB2YWx1ZXNbaV0u bV9rZXkpLmxlYWtSZWYoKTsKKyAgICAgICAgICAgIGtleXNbaV0gPSB2YWx1ZXNbaV0ubV9rZXk7 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGtleXNbaV0gPSAwOwogICAgIH0KQEAgLTQyLDEw ICs0Miw2IEBAIHZvaWQgSGFzaFRhYmxlOjpjcmVhdGVUYWJsZShWTSYgdm0pIGNvbnMKIHZvaWQg SGFzaFRhYmxlOjpkZWxldGVUYWJsZSgpIGNvbnN0CiB7CiAgICAgaWYgKGtleXMpIHsKLSAgICAg ICAgZm9yIChpbnQgaSA9IDA7IGkgIT0gbnVtYmVyT2ZWYWx1ZXM7ICsraSkgewotICAgICAgICAg ICAgaWYgKGtleXNbaV0pCi0gICAgICAgICAgICAgICAga2V5c1tpXS0+ZGVyZWYoKTsKLSAgICAg ICAgfQogICAgICAgICBmYXN0RnJlZShrZXlzKTsKICAgICAgICAga2V5cyA9IG51bGxwdHI7CiAg ICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgJKHJldmlzaW9u IDE2OTczNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03Nyw3ICs3Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBib29s IGhhc1NldHRlck9yUmVhZG9ubHlQcm9wZXJ0aWVzOwogCiAgICAgICAgIGNvbnN0IEhhc2hUYWJs ZVZhbHVlKiB2YWx1ZXM7IC8vIEZpeGVkIHZhbHVlcyBnZW5lcmF0ZWQgYnkgc2NyaXB0LgotICAg ICAgICBtdXRhYmxlIFN0cmluZ0ltcGwqKiBrZXlzOyAvLyBUYWJsZSBhbGxvY2F0ZWQgYXQgcnVu dGltZS4KKyAgICAgICAgbXV0YWJsZSBjb25zdCBjaGFyKioga2V5czsgLy8gVGFibGUgYWxsb2Nh dGVkIGF0IHJ1bnRpbWUuCiAgICAgICAgIGNvbnN0IENvbXBhY3RIYXNoSW5kZXgqIGluZGV4Owog CiAgICAgICAgIEFMV0FZU19JTkxJTkUgSGFzaFRhYmxlIGNvcHkoKSBjb25zdApAQCAtMTI4LDcg KzEyOCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIHJldHVybiAmbV90YWJs ZS0+dmFsdWVzW21fcG9zaXRpb25dOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBTdHJp bmdJbXBsKiBrZXkoKQorICAgICAgICAgICAgY29uc3QgY2hhcioga2V5KCkKICAgICAgICAgICAg IHsKICAgICAgICAgICAgICAgICByZXR1cm4gbV90YWJsZS0+a2V5c1ttX3Bvc2l0aW9uXTsKICAg ICAgICAgICAgIH0KQEAgLTE5MSw3ICsxOTEsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAg ICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAg ICAgICAgICBpZiAoa2V5c1t2YWx1ZUluZGV4XSA9PSBpbXBsKQorICAgICAgICAgICAgICAgIGlm IChXVEY6OmVxdWFsKGltcGwsIGtleXNbdmFsdWVJbmRleF0pKQogICAgICAgICAgICAgICAgICAg ICByZXR1cm4gJnZhbHVlc1t2YWx1ZUluZGV4XTsKIAogICAgICAgICAgICAgICAgIGluZGV4RW50 cnkgPSBpbmRleFtpbmRleEVudHJ5XS5uZXh0Owo=