124089 2013-11-08 17:06:12 -0800 Implement more KeyedEncoder functionality 2013-11-08 17:14:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca alecflett bdakin commit-queue jsbell oldest_to_newest 948943 0 andersca 2013-11-08 17:06:12 -0800 Implement more KeyedEncoder functionality 948944 1 216465 andersca 2013-11-08 17:07:14 -0800 Created attachment 216465 Patch 948948 2 andersca 2013-11-08 17:14:26 -0800 Committed r158980: <http://trac.webkit.org/changeset/158980> 216465 2013-11-08 17:07:14 -0800 2013-11-08 17:11:05 -0800 Patch bug-124089-20131108170714.patch text/plain 7247 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE4ODhmNGEwMTFiYWNk MmE4MzY1MTM0ZGU2MzVmYzBlNTBmOTY2Yy4uMmU3YmZkYTY5NDE3MDJlZGNlZGRiOGQxYTgwYmJl ZDg1ZGE3MDVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEzLTExLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IG1v cmUgS2V5ZWRFbmNvZGVyIGZ1bmN0aW9uYWxpdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDA4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVl Lmg6CisgICAgICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRUcmVlTm9kZSk6CisgICAgICAgICogcGxh dGZvcm0vS2V5ZWRDb2RpbmcuaDoKKyAgICAgICAgKFdlYkNvcmU6OktleWVkRW5jb2Rlcjo6ZW5j b2RlQ29uZGl0aW9uYWxPYmplY3QpOgorCisyMDEzLTExLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgS2V5ZWRFbmNvZGVyIHNob3VsZCBiZSBhYmxl IHRvIGVuY29kZXIgb2JqZWN0cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI0MDg1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0YWMxOTg2ZmU1ZDc0ODc2YjYwZGI5 NjdhY2YzYmU2ODJhYjc3Y2NkLi4xOTAzOGE0N2VmNzdmMWE5MzE1MjBlZGFhY2UzYTJhOGFjMWRm Y2ZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTMtMTEtMDggIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBJbXBsZW1lbnQgbW9yZSBLZXll ZEVuY29kZXIgZnVuY3Rpb25hbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI0MDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTaGFyZWQvY2YvS2V5ZWRFbmNvZGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6S2V5ZWRFbmNvZGVyOjplbmNvZGVCeXRlcyk6CisgICAgICAgIChXZWJLaXQ6OktleWVk RW5jb2Rlcjo6ZW5jb2RlSW50MzIpOgorICAgICAgICAoV2ViS2l0OjpLZXllZEVuY29kZXI6OmVu Y29kZUZsb2F0KToKKyAgICAgICAgKiBTaGFyZWQvY2YvS2V5ZWRFbmNvZGVyLmg6CisKKzIwMTMt MTEtMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBL ZXllZEVuY29kZXIgc2hvdWxkIGJlIGFibGUgdG8gZW5jb2RlciBvYmplY3RzCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQwODUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAppbmRleCA4 YWJjN2ZjMzZjYzI5MTgyZDdhZTEyNmE2OTBmMmE2NWEyYjQ0NWVhLi42OWQyNWY2N2ZmNjdlOTVl MjRkZmVmYzBkM2VlZDY5YjNjNTI1MGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaApAQCAtOTUsNyArOTUsNyBAQCBwdWJsaWM6 CiAgICAgU2NyaXB0VmFsdWUgZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoSlNDOjpFeGVjU3RhdGUq KTsKICNlbmRpZgogCi0gICAgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBkYXRhKCkgeyByZXR1cm4g bV9kYXRhOyB9CisgICAgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBkYXRhKCkgY29uc3QgeyByZXR1 cm4gbV9kYXRhOyB9CiAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzKCkgY29uc3Qg eyByZXR1cm4gbV9ibG9iVVJMczsgfQogCiAjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0UpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCmluZGV4IDRiNmEzNDcwY2M4MzYyZTNk NTFmMmRhNjMzNWI3NTcxNmU1YTM3M2YuLjZjN2FjZDU1MDhiODZkMWJjNGFmOTc0NjQzZTU5NGYw MjJiNDU3NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCkBAIC03Mzks NiArNzM5LDI1IEBAIHZvaWQgSGlzdG9yeUl0ZW06OmVuY29kZUJhY2tGb3J3YXJkVHJlZU5vZGUo S2V5ZWRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQu CiAKKyAgICBlbmNvZGVyLmVuY29kZVN0cmluZygiZm9ybUNvbnRlbnRUeXBlIiwgbV9mb3JtQ29u dGVudFR5cGUpOworCisgICAgZW5jb2Rlci5lbmNvZGVDb25kaXRpb25hbE9iamVjdCgiZm9ybURh dGEiLCBtX2Zvcm1EYXRhLmdldCgpLCBbXShLZXllZEVuY29kZXImLCBjb25zdCBGb3JtRGF0YSYp IHsKKyAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAgICB9KTsKKworICAgIGVuY29kZXIu ZW5jb2RlU3RyaW5nKCJyZWZlcnJlciIsIG1fcmVmZXJyZXIpOworCisgICAgZW5jb2Rlci5lbmNv ZGVPYmplY3QoInNjcm9sbFBvaW50IiwgbV9zY3JvbGxQb2ludCwgW10oS2V5ZWRFbmNvZGVyJiBl bmNvZGVyLCBjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9pbnQpIHsKKyAgICAgICAgZW5jb2Rlci5l bmNvZGVJbnQzMigieCIsIHNjcm9sbFBvaW50LngoKSk7CisgICAgICAgIGVuY29kZXIuZW5jb2Rl SW50MzIoInkiLCBzY3JvbGxQb2ludC55KCkpOworICAgIH0pOworCisgICAgZW5jb2Rlci5lbmNv ZGVGbG9hdCgicGFnZVNjYWxlRmFjdG9yIiwgbV9wYWdlU2NhbGVGYWN0b3IpOworCisgICAgZW5j b2Rlci5lbmNvZGVDb25kaXRpb25hbE9iamVjdCgic3RhdGVPYmplY3QiLCBtX3N0YXRlT2JqZWN0 LmdldCgpLCBbXShLZXllZEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZSYgc3RhdGVPYmplY3QpIHsKKyAgICAgICAgZW5jb2Rlci5lbmNvZGVCeXRlcygiZGF0YSIs IHN0YXRlT2JqZWN0LmRhdGEoKS5kYXRhKCksIHN0YXRlT2JqZWN0LmRhdGEoKS5zaXplKCkpOwor ICAgIH0pOworCiAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoInRhcmdldCIsIG1fdGFyZ2V0KTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5ZWRDb2RpbmcuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWVkQ29kaW5nLmgKaW5kZXggYTJmMzg2NzQwOWY5 NzVlZjY4NjM3OTc5MTEzMTA5ZDhlYzQ1NDZmZS4uNDllZjNmMDg5N2YxY2UwN2UzZDIwYjQ4YzNm NTg4OGJmZTg5ZmI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5ZWRD b2RpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXllZENvZGluZy5oCkBAIC0z NSw4ICszNSwxMCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+S2V5ZWRFbmNvZGVyKCkgeyB9 CiAKIHB1YmxpYzoKKyAgICB2aXJ0dWFsIHZvaWQgZW5jb2RlQnl0ZXMoY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZW5jb2Rl VUludDMyKGNvbnN0IFN0cmluZyYga2V5LCB1aW50MzJfdCkgPSAwOwotCisgICAgdmlydHVhbCB2 b2lkIGVuY29kZUludDMyKGNvbnN0IFN0cmluZyYga2V5LCBpbnQzMl90KSA9IDA7CisgICAgdmly dHVhbCB2b2lkIGVuY29kZUZsb2F0KGNvbnN0IFN0cmluZyYga2V5LCBmbG9hdCkgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBlbmNvZGVTdHJpbmcoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmlu ZyYpID0gMDsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEY+CkBAIC00Nyw2 ICs0OSwxNSBAQCBwdWJsaWM6CiAgICAgICAgIHRoaXMtPmVuZE9iamVjdCgpOwogICAgIH0KIAor ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEY+CisgICAgdm9pZCBlbmNvZGVDb25k aXRpb25hbE9iamVjdChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgVCogb2JqZWN0LCBGJiYgZnVu Y3Rpb24pCisgICAgeworICAgICAgICBpZiAoIW9iamVjdCkKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBlbmNvZGVPYmplY3Qoa2V5LCAqb2JqZWN0LCBzdGQ6OmZvcndhcmQ8Rj4oZnVu Y3Rpb24pKTsKKyAgICB9CisKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGJlZ2luT2JqZWN0 KGNvbnN0IFN0cmluZyYga2V5KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGVuZE9iamVjdCgpID0g MDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9jZi9LZXllZEVuY29kZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRW5jb2Rlci5jcHAKaW5kZXggNDM4ZmYw ZmEwZDUxMGVlNzU5ZDcwNWFlNTVjNzhjYWQwODM5MTEwOS4uOGZkYzEzZjFjZTUxOTFiOTdlMmQ1 NmVlNjMxOTcyNjBjZTRlNjVkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2Nm L0tleWVkRW5jb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRW5j b2Rlci5jcHAKQEAgLTQ4LDEyICs0OCwzMCBAQCBLZXllZEVuY29kZXI6On5LZXllZEVuY29kZXIo KQogICAgIEFTU0VSVChtX2RpY3Rpb25hcnlTdGFjay5sYXN0KCkgPT0gbV9yb290RGljdGlvbmFy eSk7CiB9CiAKK3ZvaWQgS2V5ZWRFbmNvZGVyOjplbmNvZGVCeXRlcyhjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgdWludDhfdCogYnl0ZXMsIHNpemVfdCBzaXplKQoreworICAgIFJldGFpblB0cjxD RkRhdGFSZWY+IGRhdGEgPSBhZG9wdENGKENGRGF0YUNyZWF0ZVdpdGhCeXRlc05vQ29weShrQ0ZB bGxvY2F0b3JEZWZhdWx0LCBieXRlcywgc2l6ZSwga0NGQWxsb2NhdG9yTnVsbCkpOworICAgIENG RGljdGlvbmFyeVNldFZhbHVlKG1fZGljdGlvbmFyeVN0YWNrLmxhc3QoKSwga2V5LmNyZWF0ZUNG U3RyaW5nKCkuZ2V0KCksIGRhdGEuZ2V0KCkpOworfQorCiB2b2lkIEtleWVkRW5jb2Rlcjo6ZW5j b2RlVUludDMyKGNvbnN0IFN0cmluZyYga2V5LCB1aW50MzJfdCB2YWx1ZSkKIHsKICAgICBSZXRh aW5QdHI8Q0ZOdW1iZXJSZWY+IG51bWJlciA9IGFkb3B0Q0YoQ0ZOdW1iZXJDcmVhdGUoa0NGQWxs b2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyU0ludDMyVHlwZSwgJnZhbHVlKSk7CiAgICAgQ0ZEaWN0 aW9uYXJ5U2V0VmFsdWUobV9kaWN0aW9uYXJ5U3RhY2subGFzdCgpLCBrZXkuY3JlYXRlQ0ZTdHJp bmcoKS5nZXQoKSwgbnVtYmVyLmdldCgpKTsKIH0KIAordm9pZCBLZXllZEVuY29kZXI6OmVuY29k ZUludDMyKGNvbnN0IFN0cmluZyYga2V5LCBpbnQzMl90IHZhbHVlKQoreworICAgIFJldGFpblB0 cjxDRk51bWJlclJlZj4gbnVtYmVyID0gYWRvcHRDRihDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCBrQ0ZOdW1iZXJTSW50MzJUeXBlLCAmdmFsdWUpKTsKKyAgICBDRkRpY3Rpb25h cnlTZXRWYWx1ZShtX2RpY3Rpb25hcnlTdGFjay5sYXN0KCksIGtleS5jcmVhdGVDRlN0cmluZygp LmdldCgpLCBudW1iZXIuZ2V0KCkpOworfQorCit2b2lkIEtleWVkRW5jb2Rlcjo6ZW5jb2RlRmxv YXQoY29uc3QgU3RyaW5nJiBrZXksIGZsb2F0IHZhbHVlKQoreworICAgIFJldGFpblB0cjxDRk51 bWJlclJlZj4gbnVtYmVyID0gYWRvcHRDRihDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZh dWx0LCBrQ0ZOdW1iZXJGbG9hdFR5cGUsICZ2YWx1ZSkpOworICAgIENGRGljdGlvbmFyeVNldFZh bHVlKG1fZGljdGlvbmFyeVN0YWNrLmxhc3QoKSwga2V5LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCks IG51bWJlci5nZXQoKSk7Cit9CisKIHZvaWQgS2V5ZWRFbmNvZGVyOjplbmNvZGVTdHJpbmcoY29u c3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7CiAgICAgQ0ZEaWN0aW9uYXJ5 U2V0VmFsdWUobV9kaWN0aW9uYXJ5U3RhY2subGFzdCgpLCBrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5n ZXQoKSwgdmFsdWUuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWRFbmNvZGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Y2YvS2V5ZWRFbmNvZGVyLmgKaW5kZXggZDM5OWRhMjY2ZGI5ZWYyZDE1Y2I2YzRmZjhjYjEwYzk1 NzU1NjU5OS4uOTFjOWIzNWE0YTc4OGJjNWIwYmMwNDhhM2ZmNGFjYTEyZDM5ODJkMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRW5jb2Rlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9jZi9LZXllZEVuY29kZXIuaApAQCAtMzgsNyArMzgsMTEgQEAgcHVi bGljOgogICAgIH5LZXllZEVuY29kZXIoKTsKIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIHZvaWQg ZW5jb2RlQnl0ZXMoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QpIE9W RVJSSURFOworCiAgICAgdmlydHVhbCB2b2lkIGVuY29kZVVJbnQzMihjb25zdCBTdHJpbmcmIGtl eSwgdWludDMyX3QpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBlbmNvZGVJbnQzMihjb25z dCBTdHJpbmcmIGtleSwgaW50MzJfdCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGVuY29k ZUZsb2F0KGNvbnN0IFN0cmluZyYga2V5LCBmbG9hdCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIGVuY29kZVN0cmluZyhjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJikgT1ZFUlJJ REU7CiAKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5PYmplY3QoY29uc3QgU3RyaW5nJiBrZXkpIE9W RVJSSURFOwo=