130431 2014-03-18 15:38:42 -0700 Begin cleaning up KeyedDecoder and KeyedEncoder 2014-03-18 15:56:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca alecflett commit-queue jsbell oldest_to_newest 991921 0 andersca 2014-03-18 15:38:42 -0700 Begin cleaning up KeyedDecoder and KeyedEncoder 991923 1 227122 andersca 2014-03-18 15:44:19 -0700 Created attachment 227122 Patch 991930 2 andersca 2014-03-18 15:56:51 -0700 Committed r165853: <http://trac.webkit.org/changeset/165853> 227122 2014-03-18 15:44:19 -0700 2014-03-18 15:52:12 -0700 Patch bug-130431-20140318154357.patch text/plain 13006 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1ODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNkOGU5YTM1ODY0ZWM5 ZWVkNDYyOTY1YmJiODQ5ZjJmMDVmNjIyZC4uNzQxZTY4YTExZTZjMjlkNmIwMDJhNjMzZTBmNDUx ZDgwYWUxMjUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQmVnaW4gY2xlYW5p bmcgdXAgS2V5ZWREZWNvZGVyIGFuZCBLZXllZEVuY29kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDQzMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBLZXllZERlY29kZXI6OmRlY29kZVZl cmlmaWVkRW51bSB0byBkZWNvZGVFbnVtIHRvIG1hdGNoIHRoZSBlbmNvZGUgZnVuY3Rpb24sCisg ICAgICAgIGFuZCBzb3J0IHRoZSBkZWNvZGUgZnVuY3Rpb25zIHRvIGJlIGluIHRoZSBzYW1lIGxv Z2ljYWwgb3JkZXIgYXMgdGhlIGVuY29kZSBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBNb2R1bGVz L2luZGV4ZWRkYi9JREJLZXlEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQktleURhdGE6 OmRlY29kZSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJREJLZXlQYXRoOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3Jt L0tleWVkQ29kaW5nLmg6CisgICAgICAgIChXZWJDb3JlOjpLZXllZERlY29kZXI6OmRlY29kZUVu dW0pOgorCiAyMDE0LTAzLTE4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OIChyMTYyMzM0KTogUmVuZGVyVGFibGVDb2w6OnN0eWxlRGlkQ2hh bmdlIHVzZXMgb3V0LW9mLWRhdGUgdGFibGUgaW5mb3JtYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAxM2Jk Zjg4MDQwNWFmOGEzMDA0OWMwOTc2MzgwNGE2YWI5NTZkYmQzLi5iOTM1ODQwOWUzOGRkMmU0ZjFj NmQ1ZjU5Yzk2M2ZlNGU1MmRiMTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTAgQEAKIDIwMTQt MDMtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBC ZWdpbiBjbGVhbmluZyB1cCBLZXllZERlY29kZXIgYW5kIEtleWVkRW5jb2RlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNDMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvY2YvS2V5ZWRE ZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6S2V5ZWREZWNvZGVyOjpLZXllZERlY29kZXIp OgorICAgICAgICBJZiB3ZSBjYW4ndCBwYXJzZSB0aGUgcHJvcGVydHkgbGlzdCBkYXRhLCBqdXN0 IGFkZCBhbiBlbXB0eSBkaWN0aW9uYXJ5IHRvIHRoZSBzdGFjay4KKworICAgICAgICAoV2ViS2l0 OjpLZXllZERlY29kZXI6OmRlY29kZUJvb2wpOgorICAgICAgICBSZW1vdmUgdW5uZWVkZWQgbV9k aWN0aW9uYXJ5U3RhY2subGFzdCgpIG51bGwgY2hlY2suIG1fZGljdGlvbmFyeVN0YWNrIHdvdWxk IGVpdGhlciBiZSBlbXB0eQorICAgICAgICBvciBhdCBsZWFzdCBoYXZlIGEgcm9vdCBlbGVtZW50 OyBpdCB3b3VsZCBuZXZlciBoYXZlIGEgbnVsbCBlbGVtZW50LgorICAgICAgICAKKyAgICAgICAg KFdlYktpdDo6S2V5ZWREZWNvZGVyOjpkZWNvZGVEb3VibGUpOgorICAgICAgICBSZW1vdmUgdGhl IHNhbWUgY2hlY2sgYXMgYWJvdmUgYW5kIHJlbW92ZSB0aGUgQ0ZOdW1iZXJHZXRUeXBlIGNoZWNr cyBzaW5jZSBDRk51bWJlckdldFZhbHVlIHdpbGwKKyAgICAgICAgZG8gdGhlIHR5cGUgY29udmVy c2lvbiBmb3IgdXMgYW5kIHJldHVybiBmYWxzZSBpZiBpdCdzIGxvc3N5LgorCisgICAgICAgIChX ZWJLaXQ6OktleWVkRGVjb2Rlcjo6ZGVjb2RlSW50NjQpOgorICAgICAgICBSZW1vdmUgdGhlIG1f ZGljdGlvbmFyeVN0YWNrLmxhc3QoKSBjaGVjay4KKworICAgICAgICAoV2ViS2l0OjpLZXllZERl Y29kZXI6OmRlY29kZVVJbnQzMik6CisgICAgICAgIERpdHRvLgorCisgICAgICAgIChXZWJLaXQ6 OktleWVkRGVjb2Rlcjo6ZGVjb2RlU3RyaW5nKToKKyAgICAgICAgRGl0dG8uCisKKyAgICAgICAg KFdlYktpdDo6S2V5ZWREZWNvZGVyOjpiZWdpbk9iamVjdCk6CisgICAgICAgIERpdHRvLgorCisg ICAgICAgIChXZWJLaXQ6OktleWVkRGVjb2Rlcjo6YmVnaW5BcnJheSk6CisgICAgICAgIERpdHRv LgorCisgICAgICAgIChXZWJLaXQ6OktleWVkRGVjb2Rlcjo6YmVnaW5BcnJheUVsZW1lbnQpOgor ICAgICAgICBEaXR0by4KKworICAgICAgICAqIFNoYXJlZC9jZi9LZXllZERlY29kZXIuaDoKKyAg ICAgICAgU29ydCBmdW5jdGlvbnMgdG8gYmUgaW4gdGhlIHNhbWUgbG9naWNhbCBvcmRlciBhcyB0 aGUgYmFzZSBjbGFzcy4KKworICAgICAgICAqIFNoYXJlZC9jZi9LZXllZEVuY29kZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpLZXllZEVuY29kZXI6OmZpbmlzaEVuY29kaW5nKToKKyAgICAgICAg RG9uJ3QgY2hlY2sgZm9yIGEgbm9uLW51bGwgQ0ZFcnJvclJlZiBoZXJlICh3aGljaCB3ZSBpbmNp ZGVudGFsbHkgbmV2ZXIgcmVsZWFzZWQgb24gZXJyb3IpLiBJbnN0ZWFkLAorICAgICAgICBqdXN0 IG51bGwgY2hlY2sgdGhlIHJldHVybmVkIENGRGF0YVJlZiBvYmplY3QuCisKKzIwMTQtMDMtMTgg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSRUdSRVNT SU9OOiBWaXNpdGVkIGxpbmsgY29sb3Jpbmcgc2VlbXMgdG8gYmUgY29tcGxldGVseSBicm9rZW4g aW4gdGlwIG9mIHRyZWUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMDQxOQogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYzMzc4NTA+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlEYXRhLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwCmluZGV4IDdmMzFj NDczOWQ4NmFmYzNjOGJkNjAyYTU3YmY1OTE1Y2VkYzI1NWUuLmJiYTQ0ZGIwNGJmNzcwODY5MjU1 NjdiOGJkM2YzNDU4ZmY0YWE5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQktleURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQktleURhdGEuY3BwCkBAIC0xNzcsNyArMTc3LDcgQEAgYm9vbCBJREJLZXlEYXRh OjpkZWNvZGUoS2V5ZWREZWNvZGVyJiBkZWNvZGVyLCBJREJLZXlEYXRhJiByZXN1bHQpCiAgICAg ICAgICAgICB8fCB2YWx1ZSA9PSBJREJLZXk6Ok51bWJlclR5cGUKICAgICAgICAgICAgIHx8IHZh bHVlID09IElEQktleTo6TWluVHlwZTsKICAgICB9OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVW ZXJpZmllZEVudW0oInR5cGUiLCByZXN1bHQudHlwZSwgZW51bUZ1bmN0aW9uKSkKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlRW51bSgidHlwZSIsIHJlc3VsdC50eXBlLCBlbnVtRnVuY3Rpb24pKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAocmVzdWx0LnR5cGUgPT0gSURCS2V5OjpJ bnZhbGlkVHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQktleVBhdGguY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5 UGF0aC5jcHAKaW5kZXggZDkzYzBhZjEwZjEwOGQzZTVlNjEzMjVmNmM4MjhjMDAzMTgwZjFjYy4u NjU1M2JiNDZkZGEzNTE1MTAyNjhkMmI3Y2ZiMDM4MTc2MmQxNTliOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHAKQEAgLTI4Niw3ICsyODYs NyBAQCBib29sIElEQktleVBhdGg6OmRlY29kZShLZXllZERlY29kZXImIGRlY29kZXIsIElEQktl eVBhdGgmIHJlc3VsdCkKICAgICAgICAgcmV0dXJuIHZhbHVlID09IE51bGxUeXBlIHx8IHZhbHVl ID09IFN0cmluZ1R5cGUgfHwgdmFsdWUgPT0gQXJyYXlUeXBlOwogICAgIH07CiAKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlVmVyaWZpZWRFbnVtKCJ0eXBlIiwgcmVzdWx0Lm1fdHlwZSwgZW51bUZ1 bmN0aW9uKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bSgidHlwZSIsIHJlc3VsdC5tX3R5 cGUsIGVudW1GdW5jdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChyZXN1 bHQubV90eXBlID09IE51bGxUeXBlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vS2V5ZWRDb2RpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWVkQ29kaW5nLmgK aW5kZXggZDQyMTc5Zjc1NDc2OWZiZjg5ZDg4NTQ4YTRiZWE4YjUzNWZjMmQ5ZS4uMTUxYmZkOTg4 ZDExM2ZkMTkyNGIyMDkxM2JjZjc2ZGNiY2EzOGIzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vS2V5ZWRDb2RpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9L ZXllZENvZGluZy5oCkBAIC00MCwxMyArNDAsMTMgQEAgcHJvdGVjdGVkOgogCiBwdWJsaWM6CiAg ICAgdmlydHVhbCBib29sIGRlY29kZUJvb2woY29uc3QgU3RyaW5nJiBrZXksIGJvb2wmKSA9IDA7 Ci0gICAgdmlydHVhbCBib29sIGRlY29kZURvdWJsZShjb25zdCBTdHJpbmcmIGtleSwgZG91Ymxl JikgPSAwOwotICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVJbnQ2NChjb25zdCBTdHJpbmcmIGtleSwg aW50NjRfdCYpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVjb2RlVUludDMyKGNvbnN0IFN0cmlu ZyYga2V5LCB1aW50MzJfdCYpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgZGVjb2RlSW50NjQoY29u c3QgU3RyaW5nJiBrZXksIGludDY0X3QmKSA9IDA7CisgICAgdmlydHVhbCBib29sIGRlY29kZURv dWJsZShjb25zdCBTdHJpbmcmIGtleSwgZG91YmxlJikgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBk ZWNvZGVTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyYpID0gMDsKIAogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEY+Ci0gICAgYm9vbCBkZWNvZGVWZXJpZmllZEVudW0o Y29uc3QgU3RyaW5nJiBrZXksIFQmIHZhbHVlLCBGJiYgZnVuY3Rpb24pCisgICAgYm9vbCBkZWNv ZGVFbnVtKGNvbnN0IFN0cmluZyYga2V5LCBUJiB2YWx1ZSwgRiYmIGlzVmFsaWRFbnVtRnVuY3Rp b24pCiAgICAgewogICAgICAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNfZW51bTxUPjo6dmFsdWUs ICJUIG11c3QgYmUgYW4gZW51bSB0eXBlIik7CiAKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgog ICAgICAgICBpZiAoIWRlY29kZUludDY0KGtleSwgaW50VmFsdWUpKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgICAgIGlmICghZnVuY3Rpb24oaW50VmFsdWUpKQorICAgICAgICBp ZiAoIWlzVmFsaWRFbnVtRnVuY3Rpb24oaW50VmFsdWUpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgICAgIHZhbHVlID0gc3RhdGljX2Nhc3Q8VD4oaW50VmFsdWUpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRGVjb2Rlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWREZWNvZGVyLmNwcAppbmRleCA1YTgzZmUxNmJkNTA1OGY0 N2RiNjFjY2M0MGJiYzQ4NjE1OGUzMjc4Li43MTFkZTkzZGU4NTJhN2VhZDgxNGZiMmZjN2M1OWJj NzgwYTk3OGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWREZWNv ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWREZWNvZGVyLmNwcApA QCAtMzIsMTQgKzMyLDE0IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBLZXllZERlY29kZXI6Oktl eWVkRGVjb2Rlcihjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSkKIHsKLSAgICBhdXRv IGNmRGF0YSA9IGFkb3B0Q0YoQ0ZEYXRhQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGRhdGEs IHNpemUpKTsKLSAgICBtX3Jvb3REaWN0aW9uYXJ5ID0gYWRvcHRDRihzdGF0aWNfY2FzdDxDRkRp Y3Rpb25hcnlSZWY+KENGUHJvcGVydHlMaXN0Q3JlYXRlV2l0aERhdGEoa0NGQWxsb2NhdG9yRGVm YXVsdCwgY2ZEYXRhLmdldCgpLCBrQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUsIDAsIDApKSk7Ci0K LSAgICBpZiAobV9yb290RGljdGlvbmFyeSAmJiBDRkdldFR5cGVJRChtX3Jvb3REaWN0aW9uYXJ5 LmdldCgpKSAhPSBDRkRpY3Rpb25hcnlHZXRUeXBlSUQoKSkKLSAgICAgICAgbV9yb290RGljdGlv bmFyeSA9IG51bGxwdHI7Ci0KLSAgICBpZiAobV9yb290RGljdGlvbmFyeSkKLSAgICAgICAgbV9k aWN0aW9uYXJ5U3RhY2suYXBwZW5kKG1fcm9vdERpY3Rpb25hcnkuZ2V0KCkpOworICAgIGF1dG8g Y2ZEYXRhID0gYWRvcHRDRihDRkRhdGFDcmVhdGVXaXRoQnl0ZXNOb0NvcHkoa0NGQWxsb2NhdG9y RGVmYXVsdCwgZGF0YSwgc2l6ZSwga0NGQWxsb2NhdG9yTnVsbCkpOworICAgIGF1dG8gcm9vdERp Y3Rpb25hcnkgPSBhZG9wdENGKENGUHJvcGVydHlMaXN0Q3JlYXRlV2l0aERhdGEoa0NGQWxsb2Nh dG9yRGVmYXVsdCwgY2ZEYXRhLmdldCgpLCBrQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUsIG51bGxw dHIsIG51bGxwdHIpKTsKKworICAgIGlmIChyb290RGljdGlvbmFyeSAmJiBDRkdldFR5cGVJRChy b290RGljdGlvbmFyeS5nZXQoKSkgPT0gQ0ZEaWN0aW9uYXJ5R2V0VHlwZUlEKCkpCisgICAgICAg IG1fcm9vdERpY3Rpb25hcnkgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4o cm9vdERpY3Rpb25hcnkubGVha1JlZigpKSk7CisgICAgZWxzZQorICAgICAgICBtX3Jvb3REaWN0 aW9uYXJ5ID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwg bnVsbHB0ciwgbnVsbHB0ciwgMCwgJmtDRlR5cGVEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NG VHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcykpOworICAgIG1fZGljdGlvbmFyeVN0YWNrLmFw cGVuZChtX3Jvb3REaWN0aW9uYXJ5LmdldCgpKTsKIH0KIAogS2V5ZWREZWNvZGVyOjp+S2V5ZWRE ZWNvZGVyKCkKQEAgLTUyLDkgKzUyLDYgQEAgS2V5ZWREZWNvZGVyOjp+S2V5ZWREZWNvZGVyKCkK IAogYm9vbCBLZXllZERlY29kZXI6OmRlY29kZUJvb2woY29uc3QgU3RyaW5nJiBrZXksIGJvb2wm IHJlc3VsdCkKIHsKLSAgICBpZiAoIW1fZGljdGlvbmFyeVN0YWNrLmxhc3QoKSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotCiAgICAgQ0ZCb29sZWFuUmVmIGJvb2xlYW4gPSBzdGF0aWNfY2FzdDxD RkJvb2xlYW5SZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKG1fZGljdGlvbmFyeVN0YWNrLmxhc3Qo KSwga2V5LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpKTsKICAgICBpZiAoIWJvb2xlYW4gfHwgQ0ZH ZXRUeXBlSUQoYm9vbGVhbikgIT0gQ0ZCb29sZWFuR2V0VHlwZUlEKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKQEAgLTYzLDQ3ICs2MCwzNSBAQCBib29sIEtleWVkRGVjb2Rlcjo6ZGVjb2RlQm9v bChjb25zdCBTdHJpbmcmIGtleSwgYm9vbCYgcmVzdWx0KQogICAgIHJldHVybiB0cnVlOwogfQog Ci1ib29sIEtleWVkRGVjb2Rlcjo6ZGVjb2RlRG91YmxlKGNvbnN0IFN0cmluZyYga2V5LCBkb3Vi bGUmIHJlc3VsdCkKK2Jvb2wgS2V5ZWREZWNvZGVyOjpkZWNvZGVVSW50MzIoY29uc3QgU3RyaW5n JiBrZXksIHVpbnQzMl90JiByZXN1bHQpCiB7Ci0gICAgaWYgKCFtX2RpY3Rpb25hcnlTdGFjay5s YXN0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIENGTnVtYmVyUmVmIG51bWJlciA9 IHN0YXRpY19jYXN0PENGTnVtYmVyUmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZShtX2RpY3Rpb25h cnlTdGFjay5sYXN0KCksIGtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpKSk7Ci0gICAgaWYgKCFu dW1iZXIgfHwgQ0ZHZXRUeXBlSUQobnVtYmVyKSAhPSBDRk51bWJlckdldFR5cGVJRCgpIHx8IChD Rk51bWJlckdldFR5cGUobnVtYmVyKSAhPSBrQ0ZOdW1iZXJEb3VibGVUeXBlICYmIENGTnVtYmVy R2V0VHlwZShudW1iZXIpICE9IGtDRk51bWJlckZsb2F0NjRUeXBlKSkKKyAgICBpZiAoIW51bWJl ciB8fCBDRkdldFR5cGVJRChudW1iZXIpICE9IENGTnVtYmVyR2V0VHlwZUlEKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBDRk51bWJlckdldFZhbHVlKG51bWJlciwga0NG TnVtYmVyRG91YmxlVHlwZSwgJnJlc3VsdCk7CisgICAgcmV0dXJuIENGTnVtYmVyR2V0VmFsdWUo bnVtYmVyLCBrQ0ZOdW1iZXJTSW50MzJUeXBlLCAmcmVzdWx0KTsKIH0KIAogYm9vbCBLZXllZERl Y29kZXI6OmRlY29kZUludDY0KGNvbnN0IFN0cmluZyYga2V5LCBpbnQ2NF90JiByZXN1bHQpCiB7 Ci0gICAgaWYgKCFtX2RpY3Rpb25hcnlTdGFjay5sYXN0KCkpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQogICAgIENGTnVtYmVyUmVmIG51bWJlciA9IHN0YXRpY19jYXN0PENGTnVtYmVyUmVmPihD RkRpY3Rpb25hcnlHZXRWYWx1ZShtX2RpY3Rpb25hcnlTdGFjay5sYXN0KCksIGtleS5jcmVhdGVD RlN0cmluZygpLmdldCgpKSk7Ci0gICAgaWYgKCFudW1iZXIgfHwgQ0ZHZXRUeXBlSUQobnVtYmVy KSAhPSBDRk51bWJlckdldFR5cGVJRCgpIHx8IENGTnVtYmVyR2V0VHlwZShudW1iZXIpICE9IGtD Rk51bWJlclNJbnQ2NFR5cGUpCisgICAgaWYgKCFudW1iZXIgfHwgQ0ZHZXRUeXBlSUQobnVtYmVy KSAhPSBDRk51bWJlckdldFR5cGVJRCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBy ZXR1cm4gQ0ZOdW1iZXJHZXRWYWx1ZShudW1iZXIsIGtDRk51bWJlclNJbnQ2NFR5cGUsICZyZXN1 bHQpOwogfQogCi1ib29sIEtleWVkRGVjb2Rlcjo6ZGVjb2RlVUludDMyKGNvbnN0IFN0cmluZyYg a2V5LCB1aW50MzJfdCYgcmVzdWx0KQorYm9vbCBLZXllZERlY29kZXI6OmRlY29kZURvdWJsZShj b25zdCBTdHJpbmcmIGtleSwgZG91YmxlJiByZXN1bHQpCiB7Ci0gICAgaWYgKCFtX2RpY3Rpb25h cnlTdGFjay5sYXN0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIENGTnVtYmVyUmVm IG51bWJlciA9IHN0YXRpY19jYXN0PENGTnVtYmVyUmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZSht X2RpY3Rpb25hcnlTdGFjay5sYXN0KCksIGtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpKSk7Ci0g ICAgaWYgKCFudW1iZXIgfHwgQ0ZHZXRUeXBlSUQobnVtYmVyKSAhPSBDRk51bWJlckdldFR5cGVJ RCgpIHx8IENGTnVtYmVyR2V0VHlwZShudW1iZXIpICE9IGtDRk51bWJlclNJbnQzMlR5cGUpCisg ICAgaWYgKCFudW1iZXIgfHwgQ0ZHZXRUeXBlSUQobnVtYmVyKSAhPSBDRk51bWJlckdldFR5cGVJ RCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gQ0ZOdW1iZXJHZXRWYWx1 ZShudW1iZXIsIGtDRk51bWJlclNJbnQzMlR5cGUsICZyZXN1bHQpOworICAgIHJldHVybiBDRk51 bWJlckdldFZhbHVlKG51bWJlciwga0NGTnVtYmVyRG91YmxlVHlwZSwgJnJlc3VsdCk7CiB9CiAK IGJvb2wgS2V5ZWREZWNvZGVyOjpkZWNvZGVTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXksIFN0cmlu ZyYgcmVzdWx0KQogewotICAgIGlmICghbV9kaWN0aW9uYXJ5U3RhY2subGFzdCgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0KICAgICBDRlN0cmluZ1JlZiBzdHJpbmcgPSBzdGF0aWNfY2FzdDxD RlN0cmluZ1JlZj4oQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUobV9kaWN0aW9uYXJ5U3RhY2subGFzdCgp LCBrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSkpOwogICAgIGlmICghc3RyaW5nIHx8IENGR2V0 VHlwZUlEKHN0cmluZykgIT0gQ0ZTdHJpbmdHZXRUeXBlSUQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtMTE0LDkgKzk5LDYgQEAgYm9vbCBLZXllZERlY29kZXI6OmRlY29kZVN0cmluZyhj b25zdCBTdHJpbmcmIGtleSwgU3RyaW5nJiByZXN1bHQpCiAKIGJvb2wgS2V5ZWREZWNvZGVyOjpi ZWdpbk9iamVjdChjb25zdCBTdHJpbmcmIGtleSkKIHsKLSAgICBpZiAoIW1fZGljdGlvbmFyeVN0 YWNrLmxhc3QoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgQ0ZEaWN0aW9uYXJ5UmVm IGRpY3Rpb25hcnkgPSBzdGF0aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KENGRGljdGlvbmFyeUdl dFZhbHVlKG1fZGljdGlvbmFyeVN0YWNrLmxhc3QoKSwga2V5LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0 KCkpKTsKICAgICBpZiAoIWRpY3Rpb25hcnkgfHwgQ0ZHZXRUeXBlSUQoZGljdGlvbmFyeSkgIT0g Q0ZEaWN0aW9uYXJ5R2V0VHlwZUlEKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTEzMiw5 ICsxMTQsNiBAQCB2b2lkIEtleWVkRGVjb2Rlcjo6ZW5kT2JqZWN0KCkKIAogYm9vbCBLZXllZERl Y29kZXI6OmJlZ2luQXJyYXkoY29uc3QgU3RyaW5nJiBrZXkpCiB7Ci0gICAgaWYgKCFtX2RpY3Rp b25hcnlTdGFjay5sYXN0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIENGQXJyYXlS ZWYgYXJyYXkgPSBzdGF0aWNfY2FzdDxDRkFycmF5UmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZSht X2RpY3Rpb25hcnlTdGFjay5sYXN0KCksIGtleS5jcmVhdGVDRlN0cmluZygpLmdldCgpKSk7CiAg ICAgaWYgKCFhcnJheSB8fCBDRkdldFR5cGVJRChhcnJheSkgIT0gQ0ZBcnJheUdldFR5cGVJRCgp KQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xNTIsOCArMTMxLDYgQEAgYm9vbCBLZXllZERl Y29kZXI6OmJlZ2luQXJyYXkoY29uc3QgU3RyaW5nJiBrZXkpCiAKIGJvb2wgS2V5ZWREZWNvZGVy OjpiZWdpbkFycmF5RWxlbWVudCgpCiB7Ci0gICAgQVNTRVJUKG1fZGljdGlvbmFyeVN0YWNrLmxh c3QoKSk7Ci0KICAgICBpZiAobV9hcnJheUluZGV4U3RhY2subGFzdCgpID49IENGQXJyYXlHZXRD b3VudChtX2FycmF5U3RhY2subGFzdCgpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWREZWNvZGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWREZWNvZGVyLmgKaW5kZXggMzUxZThlNDg3YjZiNmIzNGYw NWRhODg0ODZjYjI0NTMzMGY2MDlkMi4uMDk5ZGI2N2E5MzFiNGI2MzkyZGZiZTc2NTQ0YjRiY2U1 NWI2Yzc3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRGVjb2Rl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9jZi9LZXllZERlY29kZXIuaApAQCAtMzks OSArMzksOSBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGRlY29kZUJv b2woY29uc3QgU3RyaW5nJiBrZXksIGJvb2wmKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGJvb2wg ZGVjb2RlRG91YmxlKGNvbnN0IFN0cmluZyYga2V5LCBkb3VibGUmKSBvdmVycmlkZTsKLSAgICB2 aXJ0dWFsIGJvb2wgZGVjb2RlSW50NjQoY29uc3QgU3RyaW5nJiBrZXksIGludDY0X3QmKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgZGVjb2RlVUludDMyKGNvbnN0IFN0cmluZyYga2V5LCB1 aW50MzJfdCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVJbnQ2NChjb25zdCBT dHJpbmcmIGtleSwgaW50NjRfdCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVE b3VibGUoY29uc3QgU3RyaW5nJiBrZXksIGRvdWJsZSYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg Ym9vbCBkZWNvZGVTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyYpIG92ZXJyaWRlOwog CiAgICAgdmlydHVhbCBib29sIGJlZ2luT2JqZWN0KGNvbnN0IFN0cmluZyYga2V5KSBvdmVycmlk ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9jZi9LZXllZEVuY29kZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRW5jb2Rlci5jcHAKaW5kZXggYWZiYjJm ZjM5MmU2YzU4ZjQ4Mjk3ZGEwMDM1YTdhNmY0MzQyNTlhYi4uNjNmNzJhNTk0ZWFlMWZmZTQ0YTI3 MTYxMWVlM2MwNjQ2ODc3OTYzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2Nm L0tleWVkRW5jb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRW5j b2Rlci5jcHAKQEAgLTEzOSw5ICsxMzksOCBAQCB2b2lkIEtleWVkRW5jb2Rlcjo6ZW5kQXJyYXko KQogCiBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gS2V5ZWRFbmNvZGVyOjpmaW5pc2hFbmNvZGlu ZygpCiB7Ci0gICAgQ0ZFcnJvclJlZiBlcnJvciA9IG51bGxwdHI7Ci0gICAgUmV0YWluUHRyPENG RGF0YVJlZj4gZGF0YSA9IGFkb3B0Q0YoQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVEYXRhKGtDRkFsbG9j YXRvckRlZmF1bHQsIG1fcm9vdERpY3Rpb25hcnkuZ2V0KCksIGtDRlByb3BlcnR5TGlzdEJpbmFy eUZvcm1hdF92MV8wLCAwLCAmZXJyb3IpKTsKLSAgICBpZiAoZXJyb3IpCisgICAgUmV0YWluUHRy PENGRGF0YVJlZj4gZGF0YSA9IGFkb3B0Q0YoQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVEYXRhKGtDRkFs bG9jYXRvckRlZmF1bHQsIG1fcm9vdERpY3Rpb25hcnkuZ2V0KCksIGtDRlByb3BlcnR5TGlzdEJp bmFyeUZvcm1hdF92MV8wLCAwLCBudWxscHRyKSk7CisgICAgaWYgKCFkYXRhKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAogICAgIHJldHVybiBTaGFyZWRCdWZmZXI6OndyYXBDRkRhdGEoZGF0 YS5nZXQoKSk7Cg==