87879 2012-05-30 11:18:06 -0700 IndexedDB: Remove old get/getKey implementations 2012-05-30 17:47:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alecflett alecflett ojan webkit.review.bot oldest_to_newest 637454 0 alecflett 2012-05-30 11:18:06 -0700 IndexedDB: Remove old get/getKey implementations 637456 1 144876 alecflett 2012-05-30 11:19:37 -0700 Created attachment 144876 Patch 637459 2 alecflett 2012-05-30 11:20:41 -0700 ojan@ - r? cq? Incredibly simple. 637493 3 144876 ojan 2012-05-30 11:42:11 -0700 Comment on attachment 144876 Patch rs=me 637868 4 144876 webkit.review.bot 2012-05-30 17:47:09 -0700 Comment on attachment 144876 Patch Clearing flags on attachment: 144876 Committed r119006: <http://trac.webkit.org/changeset/119006> 637869 5 webkit.review.bot 2012-05-30 17:47:13 -0700 All reviewed patches have been landed. Closing bug. 144876 2012-05-30 11:19:37 -0700 2012-05-30 17:47:09 -0700 Patch bug-87879-20120530111936.patch text/plain 15055 alecflett U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmFkOTc1MDEyYmU5ODhh OWVjYjk4ZWM1MGYxNmU5ZTNjNzliN2IyYy4uN2JlMGQyYTBmMDJjOTkwZTY1NjM2NWYxOTMwYmI2 NWQyMDRjOTM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTMwICBBbGVj IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IFJl bW92ZSBvbGQgZ2V0L2dldEtleSBpbXBsZW1lbnRhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZhbCBvZiBkZWFkIGNvZGUsIHdhcyBzY2Fm Zm9sZGluZyBmb3IgYSBjb21wbGljYXRlZAorICAgICAgICBDaHJvbWl1bSBsYW5kaW5nLgorCisg ICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCSW5kZXhCYWNrZW5kSW1wbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJREJJbmRleEJhY2tlbmRJbXBsOjpnZXRJbnRlcm5hbCk6CisgICAgICAg IChXZWJDb3JlOjpJREJJbmRleEJhY2tlbmRJbXBsOjpnZXRLZXlJbnRlcm5hbCk6CisgICAgICAg IChXZWJDb3JlOjpJREJJbmRleEJhY2tlbmRJbXBsOjpnZXQpOgorICAgICAgICAoV2ViQ29yZTo6 SURCSW5kZXhCYWNrZW5kSW1wbDo6Z2V0S2V5KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRk Yi9JREJJbmRleEJhY2tlbmRJbXBsLmg6CisgICAgICAgIChJREJJbmRleEJhY2tlbmRJbXBsKToK KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmdldCk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpnZXRJbnRlcm5hbCk6 CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5o OgorICAgICAgICAoSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbCk6CisKIDIwMTItMDUtMjkgIFZp Y3RvciBDYXJidW5lICA8dmljdG9yQHJvc2VkdS5vcmc+CiAKICAgICAgICAgRGlzcGxheSBjdWVz IGluIHRoZSBjb250cm9scyBhcmVhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJJbmRleEJhY2tlbmRJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkluZGV4QmFja2VuZEltcGwuY3BwCmluZGV4IDBlMGU1MmY0MjQ3NDhi NjU5ZDUyNTUzY2YzZTQyZGYxMjE4NzRkNjQuLjllZmU1NDgyOWFmMDcwNTQyMGI4MzA2M2YwZTcz MzYyM2EyZmYzNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQkluZGV4QmFja2VuZEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkluZGV4QmFja2VuZEltcGwuY3BwCkBAIC0xNDUsMjAgKzE0NSw5IEBAIHZvaWQg SURCSW5kZXhCYWNrZW5kSW1wbDo6Y291bnQoUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gcmFuZ2Us IFBhc3NSZWZQdHI8SURCQ2FsCiAgICAgICAgIGVjID0gSURCRGF0YWJhc2VFeGNlcHRpb246OlRS QU5TQUNUSU9OX0lOQUNUSVZFX0VSUjsKIH0KIAotdm9pZCBJREJJbmRleEJhY2tlbmRJbXBsOjpn ZXRJbnRlcm5hbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxJREJJbmRleEJh Y2tlbmRJbXBsPiBpbmRleCwgUGFzc1JlZlB0cjxJREJLZXk+IGtleSwgUGFzc1JlZlB0cjxJREJD YWxsYmFja3M+IGNhbGxiYWNrcykKK3ZvaWQgSURCSW5kZXhCYWNrZW5kSW1wbDo6Z2V0SW50ZXJu YWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1w bD4gaW5kZXgsIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJhbmdlLCBQYXNzUmVmUHRyPElE QkNhbGxiYWNrcz4gY2FsbGJhY2tzKQogewogICAgIElEQl9UUkFDRSgiSURCSW5kZXhCYWNrZW5k SW1wbDo6Z2V0SW50ZXJuYWwiKTsKLSAgICBTdHJpbmcgdmFsdWUgPSBpbmRleC0+YmFja2luZ1N0 b3JlKCktPmdldE9iamVjdFZpYUluZGV4KGluZGV4LT5kYXRhYmFzZUlkKCksIGluZGV4LT5tX29i amVjdFN0b3JlQmFja2VuZC0+aWQoKSwgaW5kZXgtPmlkKCksICprZXkpOwotICAgIGlmICh2YWx1 ZS5pc051bGwoKSkgewotICAgICAgICBjYWxsYmFja3MtPm9uU3VjY2VzcyhTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OnVuZGVmaW5lZFZhbHVlKCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAg IGNhbGxiYWNrcy0+b25TdWNjZXNzKFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlRnJvbVdp cmUodmFsdWUpKTsKLX0KLQotdm9pZCBJREJJbmRleEJhY2tlbmRJbXBsOjpnZXRCeVJhbmdlSW50 ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCSW5kZXhCYWNrZW5k SW1wbD4gaW5kZXgsIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJhbmdlLCBQYXNzUmVmUHRy PElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzKQotewotICAgIElEQl9UUkFDRSgiSURCSW5kZXhCYWNr ZW5kSW1wbDo6Z2V0QnlSYW5nZUludGVybmFsIik7CiAKICAgICBSZWZQdHI8SURCQmFja2luZ1N0 b3JlOjpDdXJzb3I+IGJhY2tpbmdTdG9yZUN1cnNvciA9CiAgICAgICAgICAgICBpbmRleC0+YmFj a2luZ1N0b3JlKCktPm9wZW5JbmRleEN1cnNvcihpbmRleC0+ZGF0YWJhc2VJZCgpLCBpbmRleC0+ bV9vYmplY3RTdG9yZUJhY2tlbmQtPmlkKCksIGluZGV4LT5pZCgpLCBrZXlSYW5nZS5nZXQoKSwg SURCQ3Vyc29yOjpORVhUKTsKQEAgLTE3OCwyMCArMTY3LDkgQEAgdm9pZCBJREJJbmRleEJhY2tl bmRJbXBsOjpnZXRCeVJhbmdlSW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NS ZWZQdHIKICAgICBiYWNraW5nU3RvcmVDdXJzb3ItPmNsb3NlKCk7CiB9CiAKLXZvaWQgSURCSW5k ZXhCYWNrZW5kSW1wbDo6Z2V0S2V5SW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBh c3NSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1wbD4gaW5kZXgsIFBhc3NSZWZQdHI8SURCS2V5PiBr ZXksIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MpCi17Ci0gICAgSURCX1RSQUNF KCJJREJJbmRleEJhY2tlbmRJbXBsOjpnZXRLZXlJbnRlcm5hbCIpOwotICAgIFJlZlB0cjxJREJL ZXk+IGtleVJlc3VsdCA9IGluZGV4LT5iYWNraW5nU3RvcmUoKS0+Z2V0UHJpbWFyeUtleVZpYUlu ZGV4KGluZGV4LT5kYXRhYmFzZUlkKCksIGluZGV4LT5tX29iamVjdFN0b3JlQmFja2VuZC0+aWQo KSwgaW5kZXgtPmlkKCksICprZXkpOwotICAgIGlmICgha2V5UmVzdWx0KSB7Ci0gICAgICAgIGNh bGxiYWNrcy0+b25TdWNjZXNzKHN0YXRpY19jYXN0PElEQktleSo+KDApKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLSAgICBjYWxsYmFja3MtPm9uU3VjY2VzcyhrZXlSZXN1bHQuZ2V0KCkpOwot fQotCi12b2lkIElEQkluZGV4QmFja2VuZEltcGw6OmdldEtleUJ5UmFuZ2VJbnRlcm5hbChTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRyPElEQkluZGV4QmFja2VuZElt cGw+IGluZGV4LCBQYXNzUmVmUHRyPElEQktleVJhbmdlPiBrZXlSYW5nZSwgUGFzc1JlZlB0cjxJ REJDYWxsYmFja3M+IGNhbGxiYWNrcykKK3ZvaWQgSURCSW5kZXhCYWNrZW5kSW1wbDo6Z2V0S2V5 SW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgUGFzc1JlZlB0cjxJREJJ bmRleEJhY2tlbmRJbXBsPiBpbmRleCwgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4ga2V5UmFuZ2Us IFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MpCiB7Ci0gICAgSURCX1RSQUNFKCJJ REJJbmRleEJhY2tlbmRJbXBsOjpnZXRCeVJhbmdlSW50ZXJuYWwiKTsKKyAgICBJREJfVFJBQ0Uo IklEQkluZGV4QmFja2VuZEltcGw6OmdldEludGVybmFsIik7CiAKICAgICBSZWZQdHI8SURCQmFj a2luZ1N0b3JlOjpDdXJzb3I+IGJhY2tpbmdTdG9yZUN1cnNvciA9CiAgICAgICAgICAgICBpbmRl eC0+YmFja2luZ1N0b3JlKCktPm9wZW5JbmRleEtleUN1cnNvcihpbmRleC0+ZGF0YWJhc2VJZCgp LCBpbmRleC0+bV9vYmplY3RTdG9yZUJhY2tlbmQtPmlkKCksIGluZGV4LT5pZCgpLCBrZXlSYW5n ZS5nZXQoKSwgSURCQ3Vyc29yOjpORVhUKTsKQEAgLTIxOCwxNyArMTk2LDcgQEAgdm9pZCBJREJJ bmRleEJhY2tlbmRJbXBsOjpnZXQoUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4gcHJwS2V5UmFuZ2Us IFBhc3NSZWZQdHI8SUQKICAgICBSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1wbD4gaW5kZXggPSB0 aGlzOwogICAgIFJlZlB0cjxJREJLZXlSYW5nZT4ga2V5UmFuZ2UgPSBwcnBLZXlSYW5nZTsKICAg ICBSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MgPSBwcnBDYWxsYmFja3M7Ci0gICAgaWYg KCF0cmFuc2FjdGlvbi0+c2NoZWR1bGVUYXNrKGNyZWF0ZUNhbGxiYWNrVGFzaygmZ2V0QnlSYW5n ZUludGVybmFsLCBpbmRleCwga2V5UmFuZ2UsIGNhbGxiYWNrcykpKQotICAgICAgICBlYyA9IElE QkRhdGFiYXNlRXhjZXB0aW9uOjpUUkFOU0FDVElPTl9JTkFDVElWRV9FUlI7Ci19Ci0KLXZvaWQg SURCSW5kZXhCYWNrZW5kSW1wbDo6Z2V0KFBhc3NSZWZQdHI8SURCS2V5PiBwcnBLZXksIFBhc3NS ZWZQdHI8SURCQ2FsbGJhY2tzPiBwcnBDYWxsYmFja3MsIElEQlRyYW5zYWN0aW9uQmFja2VuZElu dGVyZmFjZSogdHJhbnNhY3Rpb24sIEV4Y2VwdGlvbkNvZGUmIGVjKQotewotICAgIElEQl9UUkFD RSgiSURCSW5kZXhCYWNrZW5kSW1wbDo6Z2V0Iik7Ci0gICAgUmVmUHRyPElEQkluZGV4QmFja2Vu ZEltcGw+IGluZGV4ID0gdGhpczsKLSAgICBSZWZQdHI8SURCS2V5PiBrZXkgPSBwcnBLZXk7Ci0g ICAgUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzID0gcHJwQ2FsbGJhY2tzOwotICAgIGlm ICghdHJhbnNhY3Rpb24tPnNjaGVkdWxlVGFzayhjcmVhdGVDYWxsYmFja1Rhc2soJmdldEludGVy bmFsLCBpbmRleCwga2V5LCBjYWxsYmFja3MpKSkKKyAgICBpZiAoIXRyYW5zYWN0aW9uLT5zY2hl ZHVsZVRhc2soY3JlYXRlQ2FsbGJhY2tUYXNrKCZnZXRJbnRlcm5hbCwgaW5kZXgsIGtleVJhbmdl LCBjYWxsYmFja3MpKSkKICAgICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VFJBTlNB Q1RJT05fSU5BQ1RJVkVfRVJSOwogfQogCkBAIC0yMzgsMTcgKzIwNiw3IEBAIHZvaWQgSURCSW5k ZXhCYWNrZW5kSW1wbDo6Z2V0S2V5KFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IHBycEtleVJhbmdl LCBQYXNzUmVmUHRyCiAgICAgUmVmUHRyPElEQkluZGV4QmFja2VuZEltcGw+IGluZGV4ID0gdGhp czsKICAgICBSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJhbmdlID0gcHJwS2V5UmFuZ2U7CiAgICAg UmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJhY2tzID0gcHJwQ2FsbGJhY2tzOwotICAgIGlmICgh dHJhbnNhY3Rpb24tPnNjaGVkdWxlVGFzayhjcmVhdGVDYWxsYmFja1Rhc2soJmdldEtleUJ5UmFu Z2VJbnRlcm5hbCwgaW5kZXgsIGtleVJhbmdlLCBjYWxsYmFja3MpKSkKLSAgICAgICAgZWMgPSBJ REJEYXRhYmFzZUV4Y2VwdGlvbjo6VFJBTlNBQ1RJT05fSU5BQ1RJVkVfRVJSOwotfQotCi12b2lk IElEQkluZGV4QmFja2VuZEltcGw6OmdldEtleShQYXNzUmVmUHRyPElEQktleT4gcHJwS2V5LCBQ YXNzUmVmUHRyPElEQkNhbGxiYWNrcz4gcHJwQ2FsbGJhY2tzLCBJREJUcmFuc2FjdGlvbkJhY2tl bmRJbnRlcmZhY2UqIHRyYW5zYWN0aW9uLCBFeGNlcHRpb25Db2RlJiBlYykKLXsKLSAgICBJREJf VFJBQ0UoIklEQkluZGV4QmFja2VuZEltcGw6OmdldEtleSIpOwotICAgIFJlZlB0cjxJREJJbmRl eEJhY2tlbmRJbXBsPiBpbmRleCA9IHRoaXM7Ci0gICAgUmVmUHRyPElEQktleT4ga2V5ID0gcHJw S2V5OwotICAgIFJlZlB0cjxJREJDYWxsYmFja3M+IGNhbGxiYWNrcyA9IHBycENhbGxiYWNrczsK LSAgICBpZiAoIXRyYW5zYWN0aW9uLT5zY2hlZHVsZVRhc2soY3JlYXRlQ2FsbGJhY2tUYXNrKCZn ZXRLZXlJbnRlcm5hbCwgaW5kZXgsIGtleSwgY2FsbGJhY2tzKSkpCisgICAgaWYgKCF0cmFuc2Fj dGlvbi0+c2NoZWR1bGVUYXNrKGNyZWF0ZUNhbGxiYWNrVGFzaygmZ2V0S2V5SW50ZXJuYWwsIGlu ZGV4LCBrZXlSYW5nZSwgY2FsbGJhY2tzKSkpCiAgICAgICAgIGVjID0gSURCRGF0YWJhc2VFeGNl cHRpb246OlRSQU5TQUNUSU9OX0lOQUNUSVZFX0VSUjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCSW5kZXhCYWNrZW5kSW1wbC5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCSW5kZXhCYWNrZW5kSW1wbC5oCmluZGV4IGM3 YmNlMGU0YWM3YzljMzAyNDA0N2JiOTVkOWQ0YTY3ODZhNmE2ODkuLjIwZjM1YzRmM2ZhMzlhZDA0 YzE1MmI0NzRhYzhkMTcwM2EwNDVjZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkluZGV4QmFja2VuZEltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9JREJJbmRleEJhY2tlbmRJbXBsLmgKQEAgLTcxLDkgKzcxLDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjb3VudChQYXNzUmVmUHRyPElEQktleVJhbmdlPiwg UGFzc1JlZlB0cjxJREJDYWxsYmFja3M+LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2Uq LCBFeGNlcHRpb25Db2RlJik7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5LZXlDdXJzb3IoUGFzc1Jl ZlB0cjxJREJLZXlSYW5nZT4sIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwgUGFzc1JlZlB0cjxJ REJDYWxsYmFja3M+LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqLCBFeGNlcHRpb25D b2RlJik7CiAgICAgdmlydHVhbCB2b2lkIGdldChQYXNzUmVmUHRyPElEQktleVJhbmdlPiwgUGFz c1JlZlB0cjxJREJDYWxsYmFja3M+LCBJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2UqLCBF eGNlcHRpb25Db2RlJik7Ci0gICAgdmlydHVhbCB2b2lkIGdldChQYXNzUmVmUHRyPElEQktleT4s IFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNl KiwgRXhjZXB0aW9uQ29kZSYpOwogICAgIHZpcnR1YWwgdm9pZCBnZXRLZXkoUGFzc1JlZlB0cjxJ REJLZXlSYW5nZT4sIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25CYWNr ZW5kSW50ZXJmYWNlKiwgRXhjZXB0aW9uQ29kZSYpOwotICAgIHZpcnR1YWwgdm9pZCBnZXRLZXko UGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0 aW9uQmFja2VuZEludGVyZmFjZSosIEV4Y2VwdGlvbkNvZGUmKTsKIAogcHJpdmF0ZToKICAgICBJ REJJbmRleEJhY2tlbmRJbXBsKElEQkJhY2tpbmdTdG9yZSosIGludDY0X3QgZGF0YWJhc2VJZCwg SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbCosIGludDY0X3QgaWQsIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgSURCS2V5UGF0aCYsIGJvb2wgdW5pcXVlLCBib29sIG11bHRpRW50cnkpOwpAQCAt ODEsMTAgKzc5LDggQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyB2b2lkIG9wZW5DdXJzb3JJbnRl cm5hbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxJREJJbmRleEJhY2tlbmRJ bXBsPiwgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4sIHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwg SURCQ3Vyc29yQmFja2VuZEludGVyZmFjZTo6Q3Vyc29yVHlwZSwgUGFzc1JlZlB0cjxJREJDYWxs YmFja3M+LCBQYXNzUmVmUHRyPElEQlRyYW5zYWN0aW9uQmFja2VuZEludGVyZmFjZT4pOwogICAg IHN0YXRpYyB2b2lkIGNvdW50SW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NS ZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1wbD4sIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+LCBQYXNz UmVmUHRyPElEQkNhbGxiYWNrcz4sIFBhc3NSZWZQdHI8SURCVHJhbnNhY3Rpb25CYWNrZW5kSW50 ZXJmYWNlPik7Ci0gICAgc3RhdGljIHZvaWQgZ2V0SW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIFBhc3NSZWZQdHI8SURCSW5kZXhCYWNrZW5kSW1wbD4sIFBhc3NSZWZQdHI8SURCS2V5 PiwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+KTsKLSAgICBzdGF0aWMgdm9pZCBnZXRCeVJhbmdl SW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCSW5kZXhCYWNr ZW5kSW1wbD4sIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNr cz4pOwotICAgIHN0YXRpYyB2b2lkIGdldEtleUludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqLCBQYXNzUmVmUHRyPElEQkluZGV4QmFja2VuZEltcGw+LCBQYXNzUmVmUHRyPElEQktleT4s IFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPik7Ci0gICAgc3RhdGljIHZvaWQgZ2V0S2V5QnlSYW5n ZUludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPElEQkluZGV4QmFj a2VuZEltcGw+LCBQYXNzUmVmUHRyPElEQktleVJhbmdlPiwgUGFzc1JlZlB0cjxJREJDYWxsYmFj a3M+KTsKKyAgICBzdGF0aWMgdm9pZCBnZXRJbnRlcm5hbChTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgUGFzc1JlZlB0cjxJREJJbmRleEJhY2tlbmRJbXBsPiwgUGFzc1JlZlB0cjxJREJLZXlSYW5n ZT4sIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPik7CisgICAgc3RhdGljIHZvaWQgZ2V0S2V5SW50 ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCSW5kZXhCYWNrZW5k SW1wbD4sIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4p OwogCiAgICAgUGFzc1JlZlB0cjxJREJCYWNraW5nU3RvcmU+IGJhY2tpbmdTdG9yZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmFja2luZ1N0b3JlOyB9CiAgICAgaW50NjRfdCBkYXRhYmFzZUlkKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhYmFzZUlkOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuY3BwCmlu ZGV4IGViNDIzOTUzNzY0OTEyMGMwNDU4NDFlODVhOTllY2Q3NWMxN2JiOWMuLmI1NWQxZTEyNjFm YmM0NDgzNmVjMzZhYmQxYmMyNTBiM2Y1YWYxMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwu Y3BwCkBAIC04MywzMSArODMsMTkgQEAgUGFzc1JlZlB0cjxET01TdHJpbmdMaXN0PiBJREJPYmpl Y3RTdG9yZUJhY2tlbmRJbXBsOjppbmRleE5hbWVzKCkgY29uc3QKICAgICByZXR1cm4gaW5kZXhO YW1lcy5yZWxlYXNlKCk7CiB9CiAKLS8vIEZJWE1FOiBUaGlzIGNhbiBiZSByZW1vdmVkIG9uY2Ug YWxsIHBvcnRzIGhhdmUgYmVlbiB1cGRhdGVkIHRvIGNhbGwKLS8vIHRoZSBJREJLZXlSYW5nZSB2 ZXJzaW9uLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQyODUKLXZv aWQgSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6Z2V0KFBhc3NSZWZQdHI8SURCS2V5PiBwcnBL ZXksIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBwcnBDYWxsYmFja3MsIElEQlRyYW5zYWN0aW9u QmFja2VuZEludGVyZmFjZSogdHJhbnNhY3Rpb24sIEV4Y2VwdGlvbkNvZGUmIGVjKQotewotICAg IElEQl9UUkFDRSgiSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6Z2V0Iik7Ci0gICAgUmVmUHRy PElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw+IG9iamVjdFN0b3JlID0gdGhpczsKLSAgICBSZWZQ dHI8SURCS2V5PiBrZXkgPSBwcnBLZXk7Ci0gICAgUmVmUHRyPElEQkNhbGxiYWNrcz4gY2FsbGJh Y2tzID0gcHJwQ2FsbGJhY2tzOwotICAgIGlmICghdHJhbnNhY3Rpb24tPnNjaGVkdWxlVGFzayhj cmVhdGVDYWxsYmFja1Rhc2soJklEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmdldEludGVybmFs LCBvYmplY3RTdG9yZSwga2V5LCBjYWxsYmFja3MpKSkKLSAgICAgICAgZWMgPSBJREJEYXRhYmFz ZUV4Y2VwdGlvbjo6VFJBTlNBQ1RJT05fSU5BQ1RJVkVfRVJSOwotfQotCiB2b2lkIElEQk9iamVj dFN0b3JlQmFja2VuZEltcGw6OmdldChQYXNzUmVmUHRyPElEQktleVJhbmdlPiBwcnBLZXlSYW5n ZSwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+IHBycENhbGxiYWNrcywgSURCVHJhbnNhY3Rpb25C YWNrZW5kSW50ZXJmYWNlKiB0cmFuc2FjdGlvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAg SURCX1RSQUNFKCJJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpnZXQiKTsKICAgICBSZWZQdHI8 SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbD4gb2JqZWN0U3RvcmUgPSB0aGlzOwogICAgIFJlZlB0 cjxJREJLZXlSYW5nZT4ga2V5UmFuZ2UgPSBwcnBLZXlSYW5nZTsKICAgICBSZWZQdHI8SURCQ2Fs bGJhY2tzPiBjYWxsYmFja3MgPSBwcnBDYWxsYmFja3M7Ci0gICAgaWYgKCF0cmFuc2FjdGlvbi0+ c2NoZWR1bGVUYXNrKGNyZWF0ZUNhbGxiYWNrVGFzaygmSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1w bDo6Z2V0QnlSYW5nZUludGVybmFsLCBvYmplY3RTdG9yZSwga2V5UmFuZ2UsIGNhbGxiYWNrcykp KQorICAgIGlmICghdHJhbnNhY3Rpb24tPnNjaGVkdWxlVGFzayhjcmVhdGVDYWxsYmFja1Rhc2so JklEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmdldEludGVybmFsLCBvYmplY3RTdG9yZSwga2V5 UmFuZ2UsIGNhbGxiYWNrcykpKQogICAgICAgICBlYyA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpU UkFOU0FDVElPTl9JTkFDVElWRV9FUlI7CiB9CiAKLXZvaWQgSURCT2JqZWN0U3RvcmVCYWNrZW5k SW1wbDo6Z2V0QnlSYW5nZUludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVm UHRyPElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw+IG9iamVjdFN0b3JlLCBQYXNzUmVmUHRyPElE QktleVJhbmdlPiBrZXlSYW5nZSwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+IGNhbGxiYWNrcykK K3ZvaWQgSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6Z2V0SW50ZXJuYWwoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbD4gb2JqZWN0 U3RvcmUsIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+IGtleVJhbmdlLCBQYXNzUmVmUHRyPElEQkNh bGxiYWNrcz4gY2FsbGJhY2tzKQogewotICAgIElEQl9UUkFDRSgiSURCT2JqZWN0U3RvcmVCYWNr ZW5kSW1wbDo6Z2V0QnlSYW5nZUludGVybmFsIik7CisgICAgSURCX1RSQUNFKCJJREJPYmplY3RT dG9yZUJhY2tlbmRJbXBsOjpnZXRJbnRlcm5hbCIpOwogICAgIFJlZlB0cjxJREJCYWNraW5nU3Rv cmU6OkN1cnNvcj4gYmFja2luZ1N0b3JlQ3Vyc29yID0gb2JqZWN0U3RvcmUtPmJhY2tpbmdTdG9y ZSgpLT5vcGVuT2JqZWN0U3RvcmVDdXJzb3Iob2JqZWN0U3RvcmUtPmRhdGFiYXNlSWQoKSwgb2Jq ZWN0U3RvcmUtPmlkKCksIGtleVJhbmdlLmdldCgpLCBJREJDdXJzb3I6Ok5FWFQpOwogICAgIGlm ICghYmFja2luZ1N0b3JlQ3Vyc29yKSB7CiAgICAgICAgIGNhbGxiYWNrcy0+b25TdWNjZXNzKFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZTo6dW5kZWZpbmVkVmFsdWUoKSk7CkBAIC0xMjUsMTggKzExMyw2 IEBAIHZvaWQgSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6Z2V0QnlSYW5nZUludGVybmFsKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzCiAgICAgYmFja2luZ1N0b3JlQ3Vyc29yLT5jbG9z ZSgpOwogfQogCi12b2lkIElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OmdldEludGVybmFsKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPElEQk9iamVjdFN0b3JlQmFja2VuZElt cGw+IG9iamVjdFN0b3JlLCBQYXNzUmVmUHRyPElEQktleT4ga2V5LCBQYXNzUmVmUHRyPElEQkNh bGxiYWNrcz4gY2FsbGJhY2tzKQotewotICAgIElEQl9UUkFDRSgiSURCT2JqZWN0U3RvcmVCYWNr ZW5kSW1wbDo6Z2V0SW50ZXJuYWwiKTsKLSAgICBTdHJpbmcgd2lyZURhdGEgPSBvYmplY3RTdG9y ZS0+YmFja2luZ1N0b3JlKCktPmdldE9iamVjdFN0b3JlUmVjb3JkKG9iamVjdFN0b3JlLT5kYXRh YmFzZUlkKCksIG9iamVjdFN0b3JlLT5pZCgpLCAqa2V5KTsKLSAgICBpZiAod2lyZURhdGEuaXNO dWxsKCkpIHsKLSAgICAgICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3MoU2VyaWFsaXplZFNjcmlwdFZh bHVlOjp1bmRlZmluZWRWYWx1ZSgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGNh bGxiYWNrcy0+b25TdWNjZXNzKFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlRnJvbVdpcmUo d2lyZURhdGEpKTsKLX0KLQogc3RhdGljIFBhc3NSZWZQdHI8SURCS2V5PiBmZXRjaEtleUZyb21L ZXlQYXRoKFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogdmFsdWUsIGNvbnN0IElEQktleVBhdGgmIGtl eVBhdGgpCiB7CiAgICAgSURCX1RSQUNFKCJJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpmZXRj aEtleUZyb21LZXlQYXRoIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmgKaW5kZXggMDZlY2FjODE2 ODFiNDkzNDdiZGJjMTk0Y2MxMjk1Nzg0M2VkZTQ5My4uYTVkZTdlNWQyZDYyM2RkZTBmMDBmY2Zk NGU5YTZlYjNmMDg4YzYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuaApAQCAtNjcsNyArNjcs NiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGF1dG9JbmNyZW1lbnQoKSBjb25zdCB7IHJl dHVybiBtX2F1dG9JbmNyZW1lbnQ7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBnZXQoUGFzc1JlZlB0 cjxJREJLZXlSYW5nZT4sIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25C YWNrZW5kSW50ZXJmYWNlKiwgRXhjZXB0aW9uQ29kZSYpOwotICAgIHZpcnR1YWwgdm9pZCBnZXQo UGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0 aW9uQmFja2VuZEludGVyZmFjZSosIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQg cHV0KFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiwgUGFzc1JlZlB0cjxJREJLZXk+ LCBQdXRNb2RlLCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRyYW5zYWN0aW9uQmFja2Vu ZEludGVyZmFjZSosIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlRnVu Y3Rpb24oUGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIElEQlRy YW5zYWN0aW9uQmFja2VuZEludGVyZmFjZSosIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFs IHZvaWQgZGVsZXRlRnVuY3Rpb24oUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4sIFBhc3NSZWZQdHI8 SURCQ2FsbGJhY2tzPiwgSURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlKiwgRXhjZXB0aW9u Q29kZSYpOwpAQCAtOTAsOCArODksNyBAQCBwcml2YXRlOgogICAgIFBhc3NSZWZQdHI8SURCS2V5 PiBnZW5BdXRvSW5jcmVtZW50S2V5KCk7CiAgICAgdm9pZCByZXNldEF1dG9JbmNyZW1lbnRLZXlD YWNoZSgpIHsgbV9hdXRvSW5jcmVtZW50TnVtYmVyID0gLTE7IH0KIAotICAgIHN0YXRpYyB2b2lk IGdldEludGVybmFsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPElEQk9iamVj dFN0b3JlQmFja2VuZEltcGw+LCBQYXNzUmVmUHRyPElEQktleT4sIFBhc3NSZWZQdHI8SURCQ2Fs bGJhY2tzPik7Ci0gICAgc3RhdGljIHZvaWQgZ2V0QnlSYW5nZUludGVybmFsKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw+LCBQYXNz UmVmUHRyPElEQktleVJhbmdlPiwgUGFzc1JlZlB0cjxJREJDYWxsYmFja3M+KTsKKyAgICBzdGF0 aWMgdm9pZCBnZXRJbnRlcm5hbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxJ REJPYmplY3RTdG9yZUJhY2tlbmRJbXBsPiwgUGFzc1JlZlB0cjxJREJLZXlSYW5nZT4sIFBhc3NS ZWZQdHI8SURCQ2FsbGJhY2tzPik7CiAgICAgc3RhdGljIHZvaWQgcHV0SW50ZXJuYWwoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbD4s IFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiwgUGFzc1JlZlB0cjxJREJLZXk+LCBQ dXRNb2RlLCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4sIFBhc3NSZWZQdHI8SURCVHJhbnNhY3Rp b25CYWNrZW5kSW50ZXJmYWNlPik7CiAgICAgc3RhdGljIHZvaWQgZGVsZXRlSW50ZXJuYWwoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1w bD4sIFBhc3NSZWZQdHI8SURCS2V5UmFuZ2U+LCBQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4pOwog ICAgIHN0YXRpYyB2b2lkIGNsZWFySW50ZXJuYWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBh c3NSZWZQdHI8SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbD4sIFBhc3NSZWZQdHI8SURCQ2FsbGJh Y2tzPik7Cg==