121931 2013-09-25 16:38:38 -0700 Move KeyValuePairTraits inside HashMap 2013-09-25 17:52:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 933251 0 andersca 2013-09-25 16:38:38 -0700 Move KeyValuePairTraits inside HashMap 933253 1 212637 andersca 2013-09-25 16:40:29 -0700 Created attachment 212637 Patch 933254 2 commit-queue 2013-09-25 16:42:09 -0700 Attachment 212637 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/tools/ProfileTreeNode.h', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/HashMap.h']" exit_code: 1 Source/WTF/wtf/HashMap.h:310: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:318: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:325: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:344: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/HashMap.h:365: Missing spaces around >> [whitespace/operators] [3] Total errors found: 5 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 933283 3 212637 commit-queue 2013-09-25 17:52:29 -0700 Comment on attachment 212637 Patch Clearing flags on attachment: 212637 Committed r156438: <http://trac.webkit.org/changeset/156438> 933284 4 commit-queue 2013-09-25 17:52:31 -0700 All reviewed patches have been landed. Closing bug. 212637 2013-09-25 16:40:29 -0700 2013-09-25 17:52:29 -0700 Patch bug-121931-20130925164029.patch text/plain 8454 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2NDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm OTQyMDVmNjRiNTcxOGYyNmJjMjI3YzM2N2I3ODk0NGYxYjY2YTU5Li5jMDQ1NjFhYzcyOTY3NzM2 NGI1MzE1OWFhNGUyZTQ3M2FjZTkwOGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxMy0wOS0yNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIE1vdmUgS2V5VmFsdWVQYWlyVHJhaXRzIGluc2lkZSBIYXNoTWFwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE5MzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRvb2xzL1By b2ZpbGVUcmVlTm9kZS5oOgorCiAyMDEzLTA5LTI1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgdGhlIEluZGV4ZWREQiBidWlsZCBvbiBNYWMsIGJ1 dCBsZWF2ZSB0aGUgZmVhdHVyZSBub24tZnVuY3Rpb25hbApkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCAyYTdlZTIzOGJiNjZmMDU0 YzEzMWYyZWFhZTQwNTAwZWM2YmVkOTNjLi4yZjQ2MzEwZmI0MDg4NGQwYmRiZmIyZmQwNDQ0MWUw NDcxYjBjMzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V1RGL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEzLTA5LTI1ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBLZXlWYWx1ZVBhaXJUcmFp dHMgaW5zaWRlIEhhc2hNYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMTkzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFsc28gcmVuYW1lIHRoZSBWYWx1ZVR5cGUgdHlwZWRlZiB0byBLZXlWYWx1ZVBh aXJUeXBlIHNpbmNlIGl0J3MgYWx3YXlzIGEga2V5IHZhbHVlIHBhaXIuCisKKyAgICAgICAgKiB3 dGYvSGFzaE1hcC5oOgorICAgICAgICAoV1RGOjpIYXNoTWFwOjpLZXlWYWx1ZVBhaXJUcmFpdHM6 OmlzRW1wdHlWYWx1ZSk6CisgICAgICAgIChXVEY6Okhhc2hNYXA6OmZpbmQpOgorICAgICAgICAo V1RGOjpIYXNoTWFwOjpjb250YWlucyk6CisKKzIwMTMtMDktMjUgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBVbi1pbmRlbnQgSGFzaE1hcC5oLgogCiAg ICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvUHJvZmlsZVRyZWVOb2RlLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvdG9vbHMvUHJvZmlsZVRyZWVOb2RlLmgKaW5kZXggNGRhYTdkZjRjNmFkYWJmMTlk MDE0ZTUzZmMzNWEzNzhiNDRjYTlhOS4uODhkNTdmM2RkNGU3OTc2OWQxZDA2YzNhODU5MTAxYjU1 NWM2YTgzZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL1Byb2ZpbGVU cmVlTm9kZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9Qcm9maWxlVHJlZU5v ZGUuaApAQCAtMzAsNyArMzAsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogY2xhc3MgUHJvZmlsZVRy ZWVOb2RlIHsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBQcm9maWxlVHJlZU5vZGU+IE1h cDsKLSAgICB0eXBlZGVmIE1hcDo6VmFsdWVUeXBlIE1hcEVudHJ5OworICAgIHR5cGVkZWYgTWFw OjpLZXlWYWx1ZVBhaXJUeXBlIE1hcEVudHJ5OwogCiBwdWJsaWM6CiAgICAgUHJvZmlsZVRyZWVO b2RlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0hhc2hNYXAuaCBiL1NvdXJjZS9XVEYv d3RmL0hhc2hNYXAuaAppbmRleCAxOTAwNjM5ZDk1NzAzZTNlMmNmMDY2NTc3M2M4YzNjMTc5ZTZj ZTljLi5lZTI3ODA3YTQ2MGRkMmFkNTZjNGVjNGI5ZjQwOWEwZGRhNWJlYjQ2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9IYXNoTWFwLmgKKysrIGIvU291cmNlL1dURi93dGYvSGFzaE1hcC5o CkBAIC0yNSw0MCArMjUsNDUgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLXRlbXBsYXRlPHR5cGVu YW1lIEtleVRyYWl0cywgdHlwZW5hbWUgTWFwcGVkVHJhaXRzPiBzdHJ1Y3QgSGFzaE1hcFZhbHVl VHJhaXRzOwotCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgS2V5VmFsdWVQYWlyS2V5RXh0 cmFjdG9yIHsKICAgICBzdGF0aWMgY29uc3QgdHlwZW5hbWUgVDo6S2V5VHlwZSYgZXh0cmFjdChj b25zdCBUJiBwKSB7IHJldHVybiBwLmtleTsgfQogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgS2V5 QXJnLCB0eXBlbmFtZSBNYXBwZWRBcmcsIHR5cGVuYW1lIEhhc2hBcmcgPSB0eXBlbmFtZSBEZWZh dWx0SGFzaDxLZXlBcmc+OjpIYXNoLAotICAgIHR5cGVuYW1lIEtleVRyYWl0c0FyZyA9IEhhc2hU cmFpdHM8S2V5QXJnPiwgdHlwZW5hbWUgTWFwcGVkVHJhaXRzQXJnID0gSGFzaFRyYWl0czxNYXBw ZWRBcmc+ID4KKyAgICB0eXBlbmFtZSBLZXlUcmFpdHNBcmcgPSBIYXNoVHJhaXRzPEtleUFyZz4s IHR5cGVuYW1lIE1hcHBlZFRyYWl0c0FyZyA9IEhhc2hUcmFpdHM8TWFwcGVkQXJnPj4KIGNsYXNz IEhhc2hNYXAgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHJpdmF0ZToKICAgICB0 eXBlZGVmIEtleVRyYWl0c0FyZyBLZXlUcmFpdHM7CiAgICAgdHlwZWRlZiBNYXBwZWRUcmFpdHNB cmcgTWFwcGVkVHJhaXRzOwotICAgIHR5cGVkZWYgSGFzaE1hcFZhbHVlVHJhaXRzPEtleVRyYWl0 cywgTWFwcGVkVHJhaXRzPiBWYWx1ZVRyYWl0czsKKworICAgIHN0cnVjdCBLZXlWYWx1ZVBhaXJU cmFpdHMgOiBLZXlWYWx1ZVBhaXJIYXNoVHJhaXRzPEtleVRyYWl0cywgTWFwcGVkVHJhaXRzPiB7 CisgICAgICAgIHN0YXRpYyBjb25zdCBib29sIGhhc0lzRW1wdHlWYWx1ZUZ1bmN0aW9uID0gdHJ1 ZTsKKyAgICAgICAgc3RhdGljIGJvb2wgaXNFbXB0eVZhbHVlKGNvbnN0IHR5cGVuYW1lIEtleVZh bHVlUGFpckhhc2hUcmFpdHM8S2V5VHJhaXRzLCBNYXBwZWRUcmFpdHM+OjpUcmFpdFR5cGUmIHZh bHVlKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gaXNIYXNoVHJhaXRzRW1wdHlWYWx1 ZTxLZXlUcmFpdHM+KHZhbHVlLmtleSk7CisgICAgICAgIH0KKyAgICB9OwogCiBwdWJsaWM6CiAg ICAgdHlwZWRlZiB0eXBlbmFtZSBLZXlUcmFpdHM6OlRyYWl0VHlwZSBLZXlUeXBlOwogICAgIHR5 cGVkZWYgdHlwZW5hbWUgTWFwcGVkVHJhaXRzOjpUcmFpdFR5cGUgTWFwcGVkVHlwZTsKLSAgICB0 eXBlZGVmIHR5cGVuYW1lIFZhbHVlVHJhaXRzOjpUcmFpdFR5cGUgVmFsdWVUeXBlOworICAgIHR5 cGVkZWYgdHlwZW5hbWUgS2V5VmFsdWVQYWlyVHJhaXRzOjpUcmFpdFR5cGUgS2V5VmFsdWVQYWly VHlwZTsKIAogcHJpdmF0ZToKICAgICB0eXBlZGVmIHR5cGVuYW1lIE1hcHBlZFRyYWl0czo6UGVl a1R5cGUgTWFwcGVkUGVla1R5cGU7CiAKICAgICB0eXBlZGVmIEhhc2hBcmcgSGFzaEZ1bmN0aW9u czsKIAotICAgIHR5cGVkZWYgSGFzaFRhYmxlPEtleVR5cGUsIFZhbHVlVHlwZSwgS2V5VmFsdWVQ YWlyS2V5RXh0cmFjdG9yPFZhbHVlVHlwZT4sCi0gICAgICAgIEhhc2hGdW5jdGlvbnMsIFZhbHVl VHJhaXRzLCBLZXlUcmFpdHM+IEhhc2hUYWJsZVR5cGU7CisgICAgdHlwZWRlZiBIYXNoVGFibGU8 S2V5VHlwZSwgS2V5VmFsdWVQYWlyVHlwZSwgS2V5VmFsdWVQYWlyS2V5RXh0cmFjdG9yPEtleVZh bHVlUGFpclR5cGU+LAorICAgICAgICBIYXNoRnVuY3Rpb25zLCBLZXlWYWx1ZVBhaXJUcmFpdHMs IEtleVRyYWl0cz4gSGFzaFRhYmxlVHlwZTsKIAogICAgIGNsYXNzIEhhc2hNYXBLZXlzUHJveHk7 CiAgICAgY2xhc3MgSGFzaE1hcFZhbHVlc1Byb3h5OwogCiBwdWJsaWM6Ci0gICAgdHlwZWRlZiBI YXNoVGFibGVJdGVyYXRvckFkYXB0ZXI8SGFzaFRhYmxlVHlwZSwgVmFsdWVUeXBlPiBpdGVyYXRv cjsKLSAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3JBZGFwdGVyPEhhc2hUYWJsZVR5 cGUsIFZhbHVlVHlwZT4gY29uc3RfaXRlcmF0b3I7CisgICAgdHlwZWRlZiBIYXNoVGFibGVJdGVy YXRvckFkYXB0ZXI8SGFzaFRhYmxlVHlwZSwgS2V5VmFsdWVQYWlyVHlwZT4gaXRlcmF0b3I7Cisg ICAgdHlwZWRlZiBIYXNoVGFibGVDb25zdEl0ZXJhdG9yQWRhcHRlcjxIYXNoVGFibGVUeXBlLCBL ZXlWYWx1ZVBhaXJUeXBlPiBjb25zdF9pdGVyYXRvcjsKICAgICB0eXBlZGVmIHR5cGVuYW1lIEhh c2hUYWJsZVR5cGU6OkFkZFJlc3VsdCBBZGRSZXN1bHQ7CiAKIHB1YmxpYzoKQEAgLTIwOSwxNCAr MjE0LDYgQEAgY2xhc3MgSGFzaE1hcDxLZXlBcmcsIE1hcHBlZEFyZywgSGFzaEFyZywgS2V5VHJh aXRzQXJnLCBNYXBwZWRUcmFpdHNBcmc+OjpIYXNoTWEKICAgICAgICAgfkhhc2hNYXBWYWx1ZXNQ cm94eSgpIFdURl9ERUxFVEVEX0ZVTkNUSU9OOwogfTsKIAotdGVtcGxhdGU8dHlwZW5hbWUgS2V5 VHJhaXRzLCB0eXBlbmFtZSBNYXBwZWRUcmFpdHM+IHN0cnVjdCBIYXNoTWFwVmFsdWVUcmFpdHMg OiBLZXlWYWx1ZVBhaXJIYXNoVHJhaXRzPEtleVRyYWl0cywgTWFwcGVkVHJhaXRzPiB7Ci0gICAg c3RhdGljIGNvbnN0IGJvb2wgaGFzSXNFbXB0eVZhbHVlRnVuY3Rpb24gPSB0cnVlOwotICAgIHN0 YXRpYyBib29sIGlzRW1wdHlWYWx1ZShjb25zdCB0eXBlbmFtZSBLZXlWYWx1ZVBhaXJIYXNoVHJh aXRzPEtleVRyYWl0cywgTWFwcGVkVHJhaXRzPjo6VHJhaXRUeXBlJiB2YWx1ZSkKLSAgICB7Ci0g ICAgICAgIHJldHVybiBpc0hhc2hUcmFpdHNFbXB0eVZhbHVlPEtleVRyYWl0cz4odmFsdWUua2V5 KTsKLSAgICB9Ci19OwotCiB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZVRyYWl0cywgdHlwZW5hbWUg SGFzaEZ1bmN0aW9ucz4KIHN0cnVjdCBIYXNoTWFwVHJhbnNsYXRvciB7CiAgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVD4gc3RhdGljIHVuc2lnbmVkIGhhc2goY29uc3QgVCYga2V5KSB7IHJldHVybiBI YXNoRnVuY3Rpb25zOjpoYXNoKGtleSk7IH0KQEAgLTMxMCw3ICszMDcsNyBAQCB0ZW1wbGF0ZTx0 eXBlbmFtZSBIYXNoVHJhbnNsYXRvciwgdHlwZW5hbWUgVFlQRT4KIGlubGluZSB0eXBlbmFtZSBI YXNoTWFwPFQsIFUsIFYsIFcsIFg+OjppdGVyYXRvcgogSGFzaE1hcDxULCBVLCBWLCBXLCBYPjo6 ZmluZChjb25zdCBUWVBFJiB2YWx1ZSkKIHsKLSAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGZp bmQ8SGFzaE1hcFRyYW5zbGF0b3JBZGFwdGVyPFZhbHVlVHJhaXRzLCBIYXNoVHJhbnNsYXRvcj4g Pih2YWx1ZSk7CisgICAgcmV0dXJuIG1faW1wbC50ZW1wbGF0ZSBmaW5kPEhhc2hNYXBUcmFuc2xh dG9yQWRhcHRlcjxLZXlWYWx1ZVBhaXJUcmFpdHMsIEhhc2hUcmFuc2xhdG9yPj4odmFsdWUpOwog fQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVLCB0eXBlbmFtZSBWLCB0eXBlbmFt ZSBXLCB0eXBlbmFtZSBYPgpAQCAtMzE4LDE0ICszMTUsMTQgQEAgdGVtcGxhdGU8dHlwZW5hbWUg SGFzaFRyYW5zbGF0b3IsIHR5cGVuYW1lIFRZUEU+CiBpbmxpbmUgdHlwZW5hbWUgSGFzaE1hcDxU LCBVLCBWLCBXLCBYPjo6Y29uc3RfaXRlcmF0b3IgCiBIYXNoTWFwPFQsIFUsIFYsIFcsIFg+Ojpm aW5kKGNvbnN0IFRZUEUmIHZhbHVlKSBjb25zdAogewotICAgIHJldHVybiBtX2ltcGwudGVtcGxh dGUgZmluZDxIYXNoTWFwVHJhbnNsYXRvckFkYXB0ZXI8VmFsdWVUcmFpdHMsIEhhc2hUcmFuc2xh dG9yPiA+KHZhbHVlKTsKKyAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGZpbmQ8SGFzaE1hcFRy YW5zbGF0b3JBZGFwdGVyPEtleVZhbHVlUGFpclRyYWl0cywgSGFzaFRyYW5zbGF0b3I+Pih2YWx1 ZSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFUsIHR5cGVuYW1lIFYsIHR5 cGVuYW1lIFcsIHR5cGVuYW1lIFg+CiB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoVHJhbnNsYXRvciwg dHlwZW5hbWUgVFlQRT4KIGlubGluZSBib29sIEhhc2hNYXA8VCwgVSwgViwgVywgWD46OmNvbnRh aW5zKGNvbnN0IFRZUEUmIHZhbHVlKSBjb25zdAogewotICAgIHJldHVybiBtX2ltcGwudGVtcGxh dGUgY29udGFpbnM8SGFzaE1hcFRyYW5zbGF0b3JBZGFwdGVyPFZhbHVlVHJhaXRzLCBIYXNoVHJh bnNsYXRvcj4+KHZhbHVlKTsKKyAgICByZXR1cm4gbV9pbXBsLnRlbXBsYXRlIGNvbnRhaW5zPEhh c2hNYXBUcmFuc2xhdG9yQWRhcHRlcjxLZXlWYWx1ZVBhaXJUcmFpdHMsIEhhc2hUcmFuc2xhdG9y Pj4odmFsdWUpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXlBcmcsIHR5cGVuYW1lIE1hcHBl ZEFyZywgdHlwZW5hbWUgSGFzaEFyZywgdHlwZW5hbWUgS2V5VHJhaXRzQXJnLCB0eXBlbmFtZSBN YXBwZWRUcmFpdHNBcmc+CkBAIC0zNDQsNyArMzQxLDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5 QXJnLCB0eXBlbmFtZSBNYXBwZWRBcmcsIHR5cGVuYW1lIEhhc2hBcmcsIHR5cGVuYW1lIEtleVRy YWkKIHRlbXBsYXRlPHR5cGVuYW1lIEssIHR5cGVuYW1lIFY+CiBhdXRvIEhhc2hNYXA8S2V5QXJn LCBNYXBwZWRBcmcsIEhhc2hBcmcsIEtleVRyYWl0c0FyZywgTWFwcGVkVHJhaXRzQXJnPjo6aW5s aW5lQWRkKEsmJiBrZXksIFYmJiB2YWx1ZSkgLT4gQWRkUmVzdWx0CiB7Ci0gICAgcmV0dXJuIG1f aW1wbC50ZW1wbGF0ZSBhZGQ8SGFzaE1hcFRyYW5zbGF0b3I8VmFsdWVUcmFpdHMsIEhhc2hGdW5j dGlvbnM+PihzdGQ6OmZvcndhcmQ8Sz4oa2V5KSwgc3RkOjpmb3J3YXJkPFY+KHZhbHVlKSk7Cisg ICAgcmV0dXJuIG1faW1wbC50ZW1wbGF0ZSBhZGQ8SGFzaE1hcFRyYW5zbGF0b3I8S2V5VmFsdWVQ YWlyVHJhaXRzLCBIYXNoRnVuY3Rpb25zPj4oc3RkOjpmb3J3YXJkPEs+KGtleSksIHN0ZDo6Zm9y d2FyZDxWPih2YWx1ZSkpOwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXlBcmcsIHR5cGVuYW1l IE1hcHBlZEFyZywgdHlwZW5hbWUgSGFzaEFyZywgdHlwZW5hbWUgS2V5VHJhaXRzQXJnLCB0eXBl bmFtZSBNYXBwZWRUcmFpdHNBcmc+CkBAIC0zNjUsNyArMzYyLDcgQEAgdGVtcGxhdGU8dHlwZW5h bWUgS2V5QXJnLCB0eXBlbmFtZSBNYXBwZWRBcmcsIHR5cGVuYW1lIEhhc2hBcmcsIHR5cGVuYW1l IEtleVRyYWkKIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hUcmFuc2xhdG9yLCB0eXBlbmFtZSBLLCB0 eXBlbmFtZSBWPgogYXV0byBIYXNoTWFwPEtleUFyZywgTWFwcGVkQXJnLCBIYXNoQXJnLCBLZXlU cmFpdHNBcmcsIE1hcHBlZFRyYWl0c0FyZz46OmFkZChLJiYga2V5LCBWJiYgdmFsdWUpIC0+IEFk ZFJlc3VsdAogewotICAgIHJldHVybiBtX2ltcGwudGVtcGxhdGUgYWRkUGFzc2luZ0hhc2hDb2Rl PEhhc2hNYXBUcmFuc2xhdG9yQWRhcHRlcjxWYWx1ZVRyYWl0cywgSGFzaFRyYW5zbGF0b3I+Pihz dGQ6OmZvcndhcmQ8Sz4oa2V5KSwgc3RkOjpmb3J3YXJkPFY+KHZhbHVlKSk7CisgICAgcmV0dXJu IG1faW1wbC50ZW1wbGF0ZSBhZGRQYXNzaW5nSGFzaENvZGU8SGFzaE1hcFRyYW5zbGF0b3JBZGFw dGVyPEtleVZhbHVlUGFpclRyYWl0cywgSGFzaFRyYW5zbGF0b3I+PihzdGQ6OmZvcndhcmQ8Sz4o a2V5KSwgc3RkOjpmb3J3YXJkPFY+KHZhbHVlKSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEtl eUFyZywgdHlwZW5hbWUgTWFwcGVkQXJnLCB0eXBlbmFtZSBIYXNoQXJnLCB0eXBlbmFtZSBLZXlU cmFpdHNBcmcsIHR5cGVuYW1lIE1hcHBlZFRyYWl0c0FyZz4KQEAgLTM4NSw3ICszODIsNyBAQCBh dXRvIEhhc2hNYXA8S2V5QXJnLCBNYXBwZWRBcmcsIEhhc2hBcmcsIEtleVRyYWl0c0FyZywgTWFw cGVkVHJhaXRzQXJnPjo6YWRkKEtleQogdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVSwg dHlwZW5hbWUgViwgdHlwZW5hbWUgVywgdHlwZW5hbWUgTWFwcGVkVHJhaXRzPgogYXV0byBIYXNo TWFwPFQsIFUsIFYsIFcsIE1hcHBlZFRyYWl0cz46OmdldChjb25zdCBLZXlUeXBlJiBrZXkpIGNv bnN0IC0+IE1hcHBlZFBlZWtUeXBlCiB7Ci0gICAgVmFsdWVUeXBlKiBlbnRyeSA9IGNvbnN0X2Nh c3Q8SGFzaFRhYmxlVHlwZSY+KG1faW1wbCkubG9va3VwKGtleSk7CisgICAgS2V5VmFsdWVQYWly VHlwZSogZW50cnkgPSBjb25zdF9jYXN0PEhhc2hUYWJsZVR5cGUmPihtX2ltcGwpLmxvb2t1cChr ZXkpOwogICAgIGlmICghZW50cnkpCiAgICAgICAgIHJldHVybiBNYXBwZWRUcmFpdHM6OnBlZWso TWFwcGVkVHJhaXRzOjplbXB0eVZhbHVlKCkpOwogICAgIHJldHVybiBNYXBwZWRUcmFpdHM6OnBl ZWsoZW50cnktPnZhbHVlKTsK