227813 2021-07-08 14:08:46 -0700 [IndexedDB] KeyPath validity checks should happen on the cloned value, not the original one 2021-07-08 17:12:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen alecflett beidson darin ews-watchlist ggaren jsbell sam sihui_liu webkit-bug-importer oldest_to_newest 1775796 0 cdumez 2021-07-08 14:08:46 -0700 KeyPath validity checks should happen on the cloned value, not the original one: - https://www.w3.org/TR/IndexedDB/#add-or-put (Step 11.1) - https://www.w3.org/TR/IndexedDB/#dom-idbcursor-update (Step 9.1) This is causing the following WPT test to fail in WebKit: https://wpt.live/IndexedDB/clone-before-keypath-eval.html This test is passing in Chrome and Gecko. 1775799 1 433162 cdumez 2021-07-08 14:11:46 -0700 Created attachment 433162 Patch 1775860 2 433162 ggaren 2021-07-08 16:33:13 -0700 Comment on attachment 433162 Patch r=me 1775871 3 ews-feeder 2021-07-08 17:11:29 -0700 Committed r279767 (239537@main): <https://commits.webkit.org/239537@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433162. 1775872 4 webkit-bug-importer 2021-07-08 17:12:17 -0700 <rdar://problem/80350450> 433162 2021-07-08 14:11:46 -0700 2021-07-08 17:11:30 -0700 Patch bug-227813-20210708141145.patch text/plain 13674 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYxNGFlZjk1NWM1NzVk MjlkYzNjYWYyZThiNGM0NTU5MjA0NTcyOC4uYWI5Mjc5ZmMwZTI0ZjNlMWM5YWU3NzYyODRiOGE5 ZmVmMGI3YTc4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0luZGV4ZWREQl0gS2V5UGF0 aCB2YWxpZGl0eSBjaGVja3Mgc2hvdWxkIGhhcHBlbiBvbiB0aGUgY2xvbmVkIHZhbHVlLCBub3Qg dGhlIG9yaWdpbmFsIG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI3ODEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgS2V5UGF0aCB2YWxpZGl0eSBjaGVja3Mgc2hvdWxkIGhhcHBlbiBvbiB0aGUgY2xv bmVkIHZhbHVlLCBub3QgdGhlIG9yaWdpbmFsIG9uZToKKyAgICAgICAgLSBodHRwczovL3d3dy53 My5vcmcvVFIvSW5kZXhlZERCLyNhZGQtb3ItcHV0IChTdGVwIDExLjEpCisgICAgICAgIC0gaHR0 cHM6Ly93d3cudzMub3JnL1RSL0luZGV4ZWREQi8jZG9tLWlkYmN1cnNvci11cGRhdGUgKFN0ZXAg OS4xKQorCisgICAgICAgIFRoaXMgd2FzIGNhdXNpbmcgdGhlIGZvbGxvd2luZyBXUFQgdGVzdCB0 byBmYWlsIGluIFdlYktpdDoKKyAgICAgICAgaHR0cHM6Ly93cHQubGl2ZS9JbmRleGVkREIvY2xv bmUtYmVmb3JlLWtleXBhdGgtZXZhbC5odG1sCisKKyAgICAgICAgVGhpcyB0ZXN0IGlzIHBhc3Np bmcgaW4gQ2hyb21lIGFuZCBHZWNrby4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHJlYmFzZWxp bmVkIGV4aXN0aW5nIHRlc3QuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJz b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yOjp1cGRhdGUpOgorICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQk9iamVjdFN0b3JlOjpwdXRGb3JDdXJzb3JVcGRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 SURCT2JqZWN0U3RvcmU6OnB1dE9yQWRkKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9J REJPYmplY3RTdG9yZS5oOgorCiAyMDIxLTA3LTA4ICBZb3NoaWFraSBKaXRzdWthd2EgIDx5b3No aWFraS5qaXRzdWthd2FAc29ueS5jb20+CiAKICAgICAgICAgW09wZW5TU0xdIEltcGxlbWVudCBI S0RGIGFuZCBQQktERjIgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCQ3Vyc29yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkN1cnNvci5jcHAKaW5kZXggNThkMGNkZjY4N2NjMjMyMTJhMWM4OWU1ODhjOTQyMGJi MzVhN2U4ZS4uYWFhZGUzMDE2MTc5MmYwMGM0MmJlYTNlZGUwZWQzZGVhMjRlMmM3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwCkBAIC0zNiw2 ICszNiw3IEBACiAjaW5jbHVkZSAiSURCVHJhbnNhY3Rpb24uaCIKICNpbmNsdWRlICJMb2dnaW5n LmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgorI2luY2x1ZGUgIlNlcmlh bGl6ZWRTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0hlYXBJbmxpbmVz Lmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNDSlNWYWx1ZUlubGluZXMuaD4KICNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9TdHJvbmdJbmxpbmVzLmg+CkBAIC0xMTksMTcgKzEyMCwzMCBA QCBFeGNlcHRpb25PcjxSZWY8SURCUmVxdWVzdD4+IElEQkN1cnNvcjo6dXBkYXRlKEpTR2xvYmFs T2JqZWN0JiBzdGF0ZSwgSlNWYWx1ZSB2YQogICAgIGlmICghaXNLZXlDdXJzb3JXaXRoVmFsdWUo KSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVycm9yLCAiRmFpbGVk IHRvIGV4ZWN1dGUgJ3VwZGF0ZScgb24gJ0lEQkN1cnNvcic6IFRoZSBjdXJzb3IgaXMgYSBrZXkg Y3Vyc29yLiJfcyB9OwogCisgICAgVk0mIHZtID0gc3RhdGUudm0oKTsKKyAgICBhdXRvIHNjb3Bl ID0gREVDTEFSRV9DQVRDSF9TQ09QRSh2bSk7CisKKyAgICAvLyBUcmFuc2FjdGlvbiBzaG91bGQg YmUgaW5hY3RpdmUgZHVyaW5nIHN0cnVjdHVyZWQgY2xvbmUuCisgICAgUmVmIHRyYW5zYWN0aW9u ID0gZWZmZWN0aXZlT2JqZWN0U3RvcmUoKS50cmFuc2FjdGlvbigpOworICAgIHRyYW5zYWN0aW9u LT5kZWFjdGl2YXRlKCk7CisgICAgYXV0byBzZXJpYWxpemVkVmFsdWUgPSBTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmNyZWF0ZShzdGF0ZSwgdmFsdWUpOworICAgIHRyYW5zYWN0aW9uLT5hY3RpdmF0 ZSgpOworCisgICAgaWYgKFVOTElLRUxZKHNjb3BlLmV4Y2VwdGlvbigpKSkKKyAgICAgICAgcmV0 dXJuIEV4Y2VwdGlvbiB7IERhdGFDbG9uZUVycm9yLCAiRmFpbGVkIHRvIHN0b3JlIHJlY29yZCBp biBhbiBJREJPYmplY3RTdG9yZTogQW4gb2JqZWN0IGNvdWxkIG5vdCBiZSBjbG9uZWQuIl9zIH07 CisKICAgICBhdXRvJiBvYmplY3RTdG9yZSA9IGVmZmVjdGl2ZU9iamVjdFN0b3JlKCk7CiAgICAg YXV0byYgb3B0aW9uYWxLZXlQYXRoID0gb2JqZWN0U3RvcmUuaW5mbygpLmtleVBhdGgoKTsKICAg ICBjb25zdCBib29sIHVzZXNJbkxpbmVLZXlzID0gISFvcHRpb25hbEtleVBhdGg7CiAgICAgaWYg KHVzZXNJbkxpbmVLZXlzKSB7Ci0gICAgICAgIFJlZlB0cjxJREJLZXk+IGtleVBhdGhLZXkgPSBt YXliZUNyZWF0ZUlEQktleUZyb21TY3JpcHRWYWx1ZUFuZEtleVBhdGgoc3RhdGUsIHZhbHVlLCBv cHRpb25hbEtleVBhdGgudmFsdWUoKSk7CisgICAgICAgIGF1dG8gY2xvbmVkVmFsdWUgPSBzZXJp YWxpemVkVmFsdWUtPmRlc2VyaWFsaXplKHN0YXRlLCAmc3RhdGUsIFNlcmlhbGl6YXRpb25FcnJv ck1vZGU6Ok5vblRocm93aW5nKTsKKyAgICAgICAgUmVmUHRyPElEQktleT4ga2V5UGF0aEtleSA9 IG1heWJlQ3JlYXRlSURCS2V5RnJvbVNjcmlwdFZhbHVlQW5kS2V5UGF0aChzdGF0ZSwgY2xvbmVk VmFsdWUsIG9wdGlvbmFsS2V5UGF0aC52YWx1ZSgpKTsKICAgICAgICAgSURCS2V5RGF0YSBrZXlQ YXRoS2V5RGF0YShrZXlQYXRoS2V5LmdldCgpKTsKICAgICAgICAgaWYgKCFrZXlQYXRoS2V5IHx8 IGtleVBhdGhLZXlEYXRhICE9IG1fcHJpbWFyeUtleURhdGEpCiAgICAgICAgICAgICByZXR1cm4g RXhjZXB0aW9uIHsgRGF0YUVycm9yLCAiRmFpbGVkIHRvIGV4ZWN1dGUgJ3VwZGF0ZScgb24gJ0lE QkN1cnNvcic6IFRoZSBlZmZlY3RpdmUgb2JqZWN0IHN0b3JlIG9mIHRoaXMgY3Vyc29yIHVzZXMg aW4tbGluZSBrZXlzIGFuZCBldmFsdWF0aW5nIHRoZSBrZXkgcGF0aCBvZiB0aGUgdmFsdWUgcGFy YW1ldGVyIHJlc3VsdHMgaW4gYSBkaWZmZXJlbnQgdmFsdWUgdGhhbiB0aGUgY3Vyc29yJ3MgZWZm ZWN0aXZlIGtleS4iX3MgfTsKICAgICB9CiAKLSAgICBhdXRvIHB1dFJlc3VsdCA9IGVmZmVjdGl2 ZU9iamVjdFN0b3JlKCkucHV0Rm9yQ3Vyc29yVXBkYXRlKHN0YXRlLCB2YWx1ZSwgbV9wcmltYXJ5 S2V5LmNvcHlSZWYoKSk7CisgICAgYXV0byBwdXRSZXN1bHQgPSBlZmZlY3RpdmVPYmplY3RTdG9y ZSgpLnB1dEZvckN1cnNvclVwZGF0ZShzdGF0ZSwgdmFsdWUsIG1fcHJpbWFyeUtleS5jb3B5UmVm KCksIFdURk1vdmUoc2VyaWFsaXplZFZhbHVlKSk7CiAgICAgaWYgKHB1dFJlc3VsdC5oYXNFeGNl cHRpb24oKSkKICAgICAgICAgcmV0dXJuIHB1dFJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0 b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3Jl LmNwcAppbmRleCBjNDZmY2RhNmEwZjRiMzkwZmY1YmViZGVhZjMzYmEzMGZiMWExM2JhLi4xYTY1 YmRkODYyZWZlM2QwM2ViN2RkODc0MzczM2M5OGZmNTdhYWZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuY3BwCkBAIC0zMDksMTIg KzMwOSwxMiBAQCBFeGNlcHRpb25PcjxSZWY8SURCUmVxdWVzdD4+IElEQk9iamVjdFN0b3JlOjpw dXQoSlNHbG9iYWxPYmplY3QmIGV4ZWNTdGF0ZSwgSlNWYQogICAgIHJldHVybiBwdXRPckFkZChl eGVjU3RhdGUsIHZhbHVlLCBpZGJLZXksIEluZGV4ZWREQjo6T2JqZWN0U3RvcmVPdmVyd3JpdGVN b2RlOjpPdmVyd3JpdGUsIElubGluZUtleUNoZWNrOjpQZXJmb3JtKTsKIH0KIAotRXhjZXB0aW9u T3I8UmVmPElEQlJlcXVlc3Q+PiBJREJPYmplY3RTdG9yZTo6cHV0Rm9yQ3Vyc29yVXBkYXRlKEpT R2xvYmFsT2JqZWN0JiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSwgUmVmUHRyPElEQktleT4ga2V5KQor RXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+PiBJREJPYmplY3RTdG9yZTo6cHV0Rm9yQ3Vyc29y VXBkYXRlKEpTR2xvYmFsT2JqZWN0JiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSwgUmVmUHRyPElEQktl eT4mJiBrZXksIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+JiYgc2VyaWFsaXplZFZhbHVl KQogewotICAgIHJldHVybiBwdXRPckFkZChzdGF0ZSwgdmFsdWUsIFdURk1vdmUoa2V5KSwgSW5k ZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGU6Ok92ZXJ3cml0ZUZvckN1cnNvciwgSW5s aW5lS2V5Q2hlY2s6OkRvTm90UGVyZm9ybSk7CisgICAgcmV0dXJuIHB1dE9yQWRkKHN0YXRlLCB2 YWx1ZSwgV1RGTW92ZShrZXkpLCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZTo6 T3ZlcndyaXRlRm9yQ3Vyc29yLCBJbmxpbmVLZXlDaGVjazo6RG9Ob3RQZXJmb3JtLCBXVEZNb3Zl KHNlcmlhbGl6ZWRWYWx1ZSkpOwogfQogCi1FeGNlcHRpb25PcjxSZWY8SURCUmVxdWVzdD4+IElE Qk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0dsb2JhbE9iamVjdCYgc3RhdGUsIEpTVmFsdWUgdmFs dWUsIFJlZlB0cjxJREJLZXk+IGtleSwgSW5kZXhlZERCOjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1v ZGUgb3ZlcndyaXRlTW9kZSwgSW5saW5lS2V5Q2hlY2sgaW5saW5lS2V5Q2hlY2spCitFeGNlcHRp b25PcjxSZWY8SURCUmVxdWVzdD4+IElEQk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0dsb2JhbE9i amVjdCYgc3RhdGUsIEpTVmFsdWUgdmFsdWUsIFJlZlB0cjxJREJLZXk+IGtleSwgSW5kZXhlZERC OjpPYmplY3RTdG9yZU92ZXJ3cml0ZU1vZGUgb3ZlcndyaXRlTW9kZSwgSW5saW5lS2V5Q2hlY2sg aW5saW5lS2V5Q2hlY2ssIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+JiYgc2VyaWFsaXpl ZFZhbHVlKQogewogICAgIFZNJiB2bSA9IHN0YXRlLnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfQ0FUQ0hfU0NPUEUodm0pOwpAQCAtMzM1LDEwICszMzUsMTIgQEAgRXhjZXB0aW9uT3I8 UmVmPElEQlJlcXVlc3Q+PiBJREJPYmplY3RTdG9yZTo6cHV0T3JBZGQoSlNHbG9iYWxPYmplY3Qm IHN0YXRlLCBKU1YKICAgICBpZiAobV90cmFuc2FjdGlvbi5pc1JlYWRPbmx5KCkpCiAgICAgICAg IHJldHVybiBFeGNlcHRpb24geyBSZWFkb25seUVycm9yLCAiRmFpbGVkIHRvIHN0b3JlIHJlY29y ZCBpbiBhbiBJREJPYmplY3RTdG9yZTogVGhlIHRyYW5zYWN0aW9uIGlzIHJlYWQtb25seS4iX3Mg fTsKIAotICAgIC8vIFRyYW5zYWN0aW9uIHNob3VsZCBiZSBpbmFjdGl2ZSBkdXJpbmcgc3RydWN0 dXJlZCBjbG9uZS4KLSAgICBtX3RyYW5zYWN0aW9uLmRlYWN0aXZhdGUoKTsKLSAgICBhdXRvIHNl cmlhbGl6ZWRWYWx1ZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKHN0YXRlLCB2YWx1 ZSk7Ci0gICAgbV90cmFuc2FjdGlvbi5hY3RpdmF0ZSgpOworICAgIGlmICghc2VyaWFsaXplZFZh bHVlKSB7CisgICAgICAgIC8vIFRyYW5zYWN0aW9uIHNob3VsZCBiZSBpbmFjdGl2ZSBkdXJpbmcg c3RydWN0dXJlZCBjbG9uZS4KKyAgICAgICAgbV90cmFuc2FjdGlvbi5kZWFjdGl2YXRlKCk7Cisg ICAgICAgIHNlcmlhbGl6ZWRWYWx1ZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKHN0 YXRlLCB2YWx1ZSk7CisgICAgICAgIG1fdHJhbnNhY3Rpb24uYWN0aXZhdGUoKTsKKyAgICB9CiAK ICAgICBpZiAoVU5MSUtFTFkoc2NvcGUuZXhjZXB0aW9uKCkpKQogICAgICAgICByZXR1cm4gRXhj ZXB0aW9uIHsgRGF0YUNsb25lRXJyb3IsICJGYWlsZWQgdG8gc3RvcmUgcmVjb3JkIGluIGFuIElE Qk9iamVjdFN0b3JlOiBBbiBvYmplY3QgY291bGQgbm90IGJlIGNsb25lZC4iX3MgfTsKQEAgLTM2 MywxNCArMzY1LDE1IEBAIEV4Y2VwdGlvbk9yPFJlZjxJREJSZXF1ZXN0Pj4gSURCT2JqZWN0U3Rv cmU6OnB1dE9yQWRkKEpTR2xvYmFsT2JqZWN0JiBzdGF0ZSwgSlNWCiAgICAgICAgIGlmIChrZXkp CiAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgRGF0YUVycm9yLCAiRmFpbGVkIHRvIHN0 b3JlIHJlY29yZCBpbiBhbiBJREJPYmplY3RTdG9yZTogVGhlIG9iamVjdCBzdG9yZSB1c2VzIGlu LWxpbmUga2V5cyBhbmQgdGhlIGtleSBwYXJhbWV0ZXIgd2FzIHByb3ZpZGVkLiJfcyB9OwogCi0g ICAgICAgIFJlZlB0cjxJREJLZXk+IGtleVBhdGhLZXkgPSBtYXliZUNyZWF0ZUlEQktleUZyb21T Y3JpcHRWYWx1ZUFuZEtleVBhdGgoc3RhdGUsIHZhbHVlLCBtX2luZm8ua2V5UGF0aCgpLnZhbHVl KCkpOworICAgICAgICBhdXRvIGNsb25lZFZhbHVlID0gc2VyaWFsaXplZFZhbHVlLT5kZXNlcmlh bGl6ZShzdGF0ZSwgJnN0YXRlLCBTZXJpYWxpemF0aW9uRXJyb3JNb2RlOjpOb25UaHJvd2luZyk7 CisgICAgICAgIFJlZlB0cjxJREJLZXk+IGtleVBhdGhLZXkgPSBtYXliZUNyZWF0ZUlEQktleUZy b21TY3JpcHRWYWx1ZUFuZEtleVBhdGgoc3RhdGUsIGNsb25lZFZhbHVlLCBtX2luZm8ua2V5UGF0 aCgpLnZhbHVlKCkpOwogICAgICAgICBpZiAoa2V5UGF0aEtleSAmJiAha2V5UGF0aEtleS0+aXNW YWxpZCgpKQogICAgICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IERhdGFFcnJvciwgIkZhaWxl ZCB0byBzdG9yZSByZWNvcmQgaW4gYW4gSURCT2JqZWN0U3RvcmU6IEV2YWx1YXRpbmcgdGhlIG9i amVjdCBzdG9yZSdzIGtleSBwYXRoIHlpZWxkZWQgYSB2YWx1ZSB0aGF0IGlzIG5vdCBhIHZhbGlk IGtleS4iX3MgfTsKIAogICAgICAgICBpZiAoIWtleVBhdGhLZXkpIHsKICAgICAgICAgICAgIGlm ICghdXNlc0tleUdlbmVyYXRvcikKICAgICAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg RGF0YUVycm9yLCAiRmFpbGVkIHRvIHN0b3JlIHJlY29yZCBpbiBhbiBJREJPYmplY3RTdG9yZTog RXZhbHVhdGluZyB0aGUgb2JqZWN0IHN0b3JlJ3Mga2V5IHBhdGggZGlkIG5vdCB5aWVsZCBhIHZh bHVlLiJfcyB9OwotICAgICAgICAgICAgaWYgKCFjYW5JbmplY3RJREJLZXlJbnRvU2NyaXB0VmFs dWUoc3RhdGUsIHZhbHVlLCBtX2luZm8ua2V5UGF0aCgpLnZhbHVlKCkpKQorICAgICAgICAgICAg aWYgKCFjYW5JbmplY3RJREJLZXlJbnRvU2NyaXB0VmFsdWUoc3RhdGUsIGNsb25lZFZhbHVlLCBt X2luZm8ua2V5UGF0aCgpLnZhbHVlKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBFeGNlcHRp b24geyBEYXRhRXJyb3IgfTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaAppbmRleCA0MzdiMDQ1ZDUwZTcwOGJiMzI5 MzYyOTM3NTg0YTdiYjUyYWE1Y2YzLi41MWQwMzdmNmMxMWYzMGI1NzZjYTRiZTQwNjY4NGI5MGE2 NTk4OGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJP YmplY3RTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9i amVjdFN0b3JlLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgY2xhc3MgSURCS2V5OwogY2xhc3MgSURCS2V5 UmFuZ2U7CiBjbGFzcyBJREJSZXF1ZXN0OwogY2xhc3MgSURCVHJhbnNhY3Rpb247CitjbGFzcyBT ZXJpYWxpemVkU2NyaXB0VmFsdWU7CiAKIHN0cnVjdCBJREJLZXlSYW5nZURhdGE7CiAKQEAgLTk2 LDcgKzk3LDcgQEAgcHVibGljOgogICAgIEV4Y2VwdGlvbk9yPFJlZjxJREJSZXF1ZXN0Pj4gZ2V0 QWxsS2V5cyhKU0M6OkpTR2xvYmFsT2JqZWN0JiwgUmVmUHRyPElEQktleVJhbmdlPiYmLCBzdGQ6 Om9wdGlvbmFsPHVpbnQzMl90PiBjb3VudCk7CiAgICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVl c3Q+PiBnZXRBbGxLZXlzKEpTQzo6SlNHbG9iYWxPYmplY3QmLCBKU0M6OkpTVmFsdWUga2V5LCBz dGQ6Om9wdGlvbmFsPHVpbnQzMl90PiBjb3VudCk7CiAKLSAgICBFeGNlcHRpb25PcjxSZWY8SURC UmVxdWVzdD4+IHB1dEZvckN1cnNvclVwZGF0ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSlNDOjpK U1ZhbHVlLCBSZWZQdHI8SURCS2V5Pik7CisgICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+ PiBwdXRGb3JDdXJzb3JVcGRhdGUoSlNDOjpKU0dsb2JhbE9iamVjdCYsIEpTQzo6SlNWYWx1ZSwg UmVmUHRyPElEQktleT4mJiwgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4mJik7CiAKICAg ICB2b2lkIG1hcmtBc0RlbGV0ZWQoKTsKICAgICBib29sIGlzRGVsZXRlZCgpIGNvbnN0IHsgcmV0 dXJuIG1fZGVsZXRlZDsgfQpAQCAtMTEzLDcgKzExNCw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToK ICAgICBlbnVtIGNsYXNzIElubGluZUtleUNoZWNrIHsgUGVyZm9ybSwgRG9Ob3RQZXJmb3JtIH07 Ci0gICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+PiBwdXRPckFkZChKU0M6OkpTR2xvYmFs T2JqZWN0JiwgSlNDOjpKU1ZhbHVlLCBSZWZQdHI8SURCS2V5PiwgSW5kZXhlZERCOjpPYmplY3RT dG9yZU92ZXJ3cml0ZU1vZGUsIElubGluZUtleUNoZWNrKTsKKyAgICBFeGNlcHRpb25PcjxSZWY8 SURCUmVxdWVzdD4+IHB1dE9yQWRkKEpTQzo6SlNHbG9iYWxPYmplY3QmLCBKU0M6OkpTVmFsdWUs IFJlZlB0cjxJREJLZXk+LCBJbmRleGVkREI6Ok9iamVjdFN0b3JlT3ZlcndyaXRlTW9kZSwgSW5s aW5lS2V5Q2hlY2ssIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+JiYgPSBudWxscHRyKTsK ICAgICBFeGNlcHRpb25PcjxSZWY8SURCUmVxdWVzdD4+IGRvQ291bnQoSlNDOjpKU0dsb2JhbE9i amVjdCYsIGNvbnN0IElEQktleVJhbmdlRGF0YSYpOwogICAgIEV4Y2VwdGlvbk9yPFJlZjxJREJS ZXF1ZXN0Pj4gZG9EZWxldGUoSlNDOjpKU0dsb2JhbE9iamVjdCYsIFdURjo6RnVuY3Rpb248RXhj ZXB0aW9uT3I8UmVmUHRyPElEQktleVJhbmdlPj4oKT4gJiYpOwogICAgIEV4Y2VwdGlvbk9yPFJl ZjxJREJSZXF1ZXN0Pj4gZG9PcGVuQ3Vyc29yKEpTQzo6SlNHbG9iYWxPYmplY3QmLCBJREJDdXJz b3JEaXJlY3Rpb24sIFdURjo6RnVuY3Rpb248RXhjZXB0aW9uT3I8UmVmUHRyPElEQktleVJhbmdl Pj4oKT4mJik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNjcyZjQxNGU2OTgyNTBkODc5ZGYzMjJmNTBhNmI4Y2JjNzIzNThi Ni4uYjA1YWY5ZWJjZWIzNjg2NzNkYTlmMTA1ZWQ3ZmUwOTA4YmQ2ODlhZSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA3LTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisK KyAgICAgICAgW0luZGV4ZWREQl0gS2V5UGF0aCB2YWxpZGl0eSBjaGVja3Mgc2hvdWxkIGhhcHBl biBvbiB0aGUgY2xvbmVkIHZhbHVlLCBub3QgdGhlIG9yaWdpbmFsIG9uZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3ODEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHRlc3QgYXMgaXQgc2hv dWxkIG5vIGxvbmdlciBiZSBmbGFreS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisK IDIwMjEtMDctMDggIFlvc2hpYWtpIEppdHN1a2F3YSAgPHlvc2hpYWtpLmppdHN1a2F3YUBzb255 LmNvbT4KIAogICAgICAgICBbT3BlblNTTF0gSW1wbGVtZW50IEhLREYgYW5kIFBCS0RGMiBzdXBw b3J0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBiZTQ4M2NhOGJhNWI4ZjUzYmJl OGE3MGI5YjNmOTY4ZjA1NGViMTFjLi5iMzIyNWRkYmNmNjRmYTkyMDgwNDY5ZjIzYmU4ZGJjZWJj YTE1MmNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAyMS0wNy0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFtJ bmRleGVkREJdIEtleVBhdGggdmFsaWRpdHkgY2hlY2tzIHNob3VsZCBoYXBwZW4gb24gdGhlIGNs b25lZCB2YWx1ZSwgbm90IHRoZSBvcmlnaW5hbCBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzgxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlYmFzZWxpbmUgV1BUIHRlc3QgdGhhdCBpcyBub3cg cGFzc2luZy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9JbmRleGVkREIvY2xvbmUt YmVmb3JlLWtleXBhdGgtZXZhbC1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDctMDggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgdW51 c2VkIFVSTCB0ZXN0IGV4cGVjdGF0aW9uIGZpbGVzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGMz NjJiNTNiMzBjZmEwMjFkMjgyZGFhZTEzYWYwZjQzNTdmNTFlYS4uMjYxNDljNWU4YzQwMTc2YmEy MzA4M2YyMTgxNTJmZDM1YmYwMjUzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNDI4LDcgKzE0 MjgsNiBAQCB3ZWJraXQub3JnL2IvMTkxNTA4IGZhc3QvY3NzLWdyaWQtbGF5b3V0L2NyYXNoLWxh cmdlLXBvc2l0aW9ucy5odG1sIFsgU2tpcCBdCiAjIEZsYWt5IHRlc3RzIGF0IGltcG9ydCB0aW1l CiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9jc3Mtc2Nv cGluZy1zaGFkb3ctaG9zdC1uYW1lc3BhY2UuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9JbmRleGVkREIvYWJvcnQtaW4taW5pdGlhbC11 cGdyYWRlbmVlZGVkLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9JbmRleGVkREIvY2xvbmUtYmVmb3JlLWtleXBhdGgtZXZhbC5odG1sIFsgUGFz cyBGYWlsdXJlIF0KIAogIyBUaG9zZSBXUFQgdGVzdHMgYXJlIGZsYWt5IHdoZW4gZmFpbGluZy4K IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZG9jdW1lbnQt bWV0YWRhdGEvdGhlLW1ldGEtZWxlbWVudC9wcmFnbWEtZGlyZWN0aXZlcy9hdHRyLW1ldGEtaHR0 cC1lcXVpdi1yZWZyZXNoL2FsbG93LXNjcmlwdHMtZmxhZy1jaGFuZ2luZy0xLmh0bWwgWyBQYXNz IEZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9JbmRleGVkREIvY2xvbmUtYmVmb3JlLWtleXBhdGgtZXZhbC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL0luZGV4ZWRE Qi9jbG9uZS1iZWZvcmUta2V5cGF0aC1ldmFsLWV4cGVjdGVkLnR4dAppbmRleCBkMWYzOGVmMDVi MmFiODkyZDY0MTRkZGNlMThkZmU2MWRiYWZiYmM5Li4xZTc5Y2RkOTA1MGFmZTIwNWIzNGFiZmI3 YmQ3NjM1MWU2ZDRiYTgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL0luZGV4ZWREQi9jbG9uZS1iZWZvcmUta2V5cGF0aC1ldmFsLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L0luZGV4ZWREQi9jbG9uZS1iZWZvcmUta2V5cGF0aC1ldmFsLWV4cGVjdGVkLnR4dApAQCAtMSw3 ICsxLDcgQEAKIAotRkFJTCBLZXkgZ2VuZXJhdG9yIGFuZCBrZXkgcGF0aCB2YWxpZGl0eSBjaGVj ayBvcGVyYXRlcyBvbiBhIGNsb25lIGFzc2VydF9lcXVhbHM6IHB1dCgpIG9wZXJhdGlvbiBzaG91 bGQgYWNjZXNzIHByaW1hcnkga2V5IHByb3BlcnR5IG9uY2UgZXhwZWN0ZWQgMSBidXQgZ290IDIK LUZBSUwgRmFpbGluZyBrZXkgcGF0aCB2YWxpZGl0eSBjaGVjayBvcGVyYXRlcyBvbiBhIGNsb25l IGFzc2VydF9lcXVhbHM6IHB1dCgpIG9wZXJhdGlvbiBzaG91bGQgYWNjZXNzIHByaW1hcnkga2V5 IHByb3BlcnR5IG9uY2UgZXhwZWN0ZWQgMSBidXQgZ290IDIKK1BBU1MgS2V5IGdlbmVyYXRvciBh bmQga2V5IHBhdGggdmFsaWRpdHkgY2hlY2sgb3BlcmF0ZXMgb24gYSBjbG9uZQorUEFTUyBGYWls aW5nIGtleSBwYXRoIHZhbGlkaXR5IGNoZWNrIG9wZXJhdGVzIG9uIGEgY2xvbmUKIFBBU1MgSW5k ZXgga2V5IHBhdGggZXZhbHVhdGlvbnMgb3BlcmF0ZSBvbiBhIGNsb25lCi1GQUlMIFN0b3JlIGFu ZCBpbmRleCBrZXkgcGF0aCBldmFsdWF0aW9ucyBvcGVyYXRlIG9uIHRoZSBzYW1lIGNsb25lIGFz c2VydF9lcXVhbHM6IHB1dCgpIHNob3VsZCBhY2Nlc3MgcHJpbWFyeSBrZXkgcHJvcGVydHkgb25j ZSBleHBlY3RlZCAxIGJ1dCBnb3QgMgotRkFJTCBDdXJzb3IgdXBkYXRlIGNoZWNrcyBhbmQga2V5 cGF0aCBldmFsdWF0aW9ucyBvcGVyYXRlIG9uIGEgY2xvbmUgRmFpbGVkIHRvIGV4ZWN1dGUgJ3Vw ZGF0ZScgb24gJ0lEQkN1cnNvcic6IFRoZSBlZmZlY3RpdmUgb2JqZWN0IHN0b3JlIG9mIHRoaXMg Y3Vyc29yIHVzZXMgaW4tbGluZSBrZXlzIGFuZCBldmFsdWF0aW5nIHRoZSBrZXkgcGF0aCBvZiB0 aGUgdmFsdWUgcGFyYW1ldGVyIHJlc3VsdHMgaW4gYSBkaWZmZXJlbnQgdmFsdWUgdGhhbiB0aGUg Y3Vyc29yJ3MgZWZmZWN0aXZlIGtleS4KK1BBU1MgU3RvcmUgYW5kIGluZGV4IGtleSBwYXRoIGV2 YWx1YXRpb25zIG9wZXJhdGUgb24gdGhlIHNhbWUgY2xvbmUKK1BBU1MgQ3Vyc29yIHVwZGF0ZSBj aGVja3MgYW5kIGtleXBhdGggZXZhbHVhdGlvbnMgb3BlcmF0ZSBvbiBhIGNsb25lCiAK