127863 2014-01-29 15:48:33 -0800 IDB: Fully implement IDBKeyData encoding/decoding 2014-01-29 15:57:57 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 973497 0 beidson 2014-01-29 15:48:33 -0800 IDB: Fully implement IDBKeyData encoding/decoding 973498 1 222602 beidson 2014-01-29 15:52:50 -0800 Created attachment 222602 Patch v1 973499 2 commit-queue 2014-01-29 15:53:55 -0800 Attachment 222602 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBKeyData.cpp:170: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebCore/Modules/indexeddb/IDBKeyData.cpp:197: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 973502 3 beidson 2014-01-29 15:57:57 -0800 http://trac.webkit.org/changeset/163045 222602 2014-01-29 15:52:50 -0800 2014-01-29 15:54:19 -0800 Patch v1 patch text/plain 10189 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyYmJmZWU3Li5jNTk1YTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTQtMDEtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIElEQjogRnVsbHkgaW1wbGVtZW50IElEQktleURhdGEgZW5jb2RpbmcvZGVjb2RpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzg2MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v S2V5ZWRDb2RpbmcuaDoKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5RGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdl YkNvcmU6OklEQktleURhdGE6OmRlY29kZSk6CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoK KworMjAxNC0wMS0yOSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAg ICAgSURCOiBPcGVuaW5nIGFuIGV4aXN0aW5nIGRhdGFiYXNlIGlzIGJyb2tlbgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3ODUxCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleURhdGEuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5RGF0YS5jcHAKaW5kZXggNDZjYTNm Yy4uZWU3ZjVlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCS2V5RGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC S2V5RGF0YS5jcHAKQEAgLTE0MSw5ICsxNDEsNyBAQCB2b2lkIElEQktleURhdGE6OmVuY29kZShL ZXllZEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIElE QktleTo6QXJyYXlUeXBlOgogICAgICAgICBlbmNvZGVyLmVuY29kZU9iamVjdHMoImFycmF5Iiwg YXJyYXlWYWx1ZS5iZWdpbigpLCBhcnJheVZhbHVlLmVuZCgpLCBbXShLZXllZEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IElEQktleURhdGEmIGtleSkgewotICAgICAgICAgICAgZW5jb2Rlci5lbmNv ZGVPYmplY3QoImlkYktleURhdGEiLCBrZXksIFtdKEtleWVkRW5jb2RlciYgZW5jb2RlciwgY29u c3QgSURCS2V5RGF0YSYga2V5KSB7Ci0gICAgICAgICAgICAgICAga2V5LmVuY29kZShlbmNvZGVy KTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAga2V5LmVuY29kZShlbmNvZGVyKTsKICAg ICAgICAgfSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIElEQktleTo6U3RyaW5nVHlwZToK QEAgLTE2MSwxMCArMTU5LDQ1IEBAIHZvaWQgSURCS2V5RGF0YTo6ZW5jb2RlKEtleWVkRW5jb2Rl ciYgZW5jb2RlcikgY29uc3QKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotYm9vbCBJ REJLZXlEYXRhOjpkZWNvZGUoS2V5ZWREZWNvZGVyJiwgSURCS2V5RGF0YSYpCitib29sIElEQktl eURhdGE6OmRlY29kZShLZXllZERlY29kZXImIGRlY29kZXIsIElEQktleURhdGEmIHJlc3VsdCkK IHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50IHdoZW4gSURCIEdldCBzdXBwb3J0IGlzIGltcGxl bWVudGVkICg8cmRhcjovL3Byb2JsZW0vMTU3Nzk2NDQ+KQotICAgIHJldHVybiBmYWxzZTsKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlQm9vbCgibnVsbCIsIHJlc3VsdC5pc051bGwpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocmVzdWx0LmlzTnVsbCkKKyAgICAgICAgcmV0dXJu IHRydWU7CisKKyAgICBhdXRvIGVudW1GdW5jdGlvbiA9IFtdKGludDY0X3QgdmFsdWUpIHsKKyAg ICAgICAgcmV0dXJuIHZhbHVlID09IElEQktleTo6SW52YWxpZFR5cGUKKyAgICAgICAgICAgIHx8 IHZhbHVlID09IElEQktleTo6QXJyYXlUeXBlCisgICAgICAgICAgICB8fCB2YWx1ZSA9PSBJREJL ZXk6OlN0cmluZ1R5cGUKKyAgICAgICAgICAgIHx8IHZhbHVlID09IElEQktleTo6RGF0ZVR5cGUK KyAgICAgICAgICAgIHx8IHZhbHVlID09IElEQktleTo6TnVtYmVyVHlwZQorICAgICAgICAgICAg fHwgdmFsdWUgPT0gSURCS2V5OjpNaW5UeXBlOworICAgIH07CisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZVZlcmlmaWVkRW51bSgidHlwZSIsIHJlc3VsdC50eXBlLCBlbnVtRnVuY3Rpb24pKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocmVzdWx0LnR5cGUgPT0gSURCS2V5OjpJbnZh bGlkVHlwZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBpZiAocmVzdWx0LnR5cGUgPT0g SURCS2V5OjpNaW5UeXBlKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBpZiAocmVzdWx0LnR5cGUgPT0gSURCS2V5OjpT dHJpbmdUeXBlKQorICAgICAgICByZXR1cm4gZGVjb2Rlci5kZWNvZGVTdHJpbmcoInN0cmluZyIs IHJlc3VsdC5zdHJpbmdWYWx1ZSk7CisKKyAgICBpZiAocmVzdWx0LnR5cGUgPT0gSURCS2V5OjpO dW1iZXJUeXBlIHx8IHJlc3VsdC50eXBlID09IElEQktleTo6RGF0ZVR5cGUpCisgICAgICAgIHJl dHVybiBkZWNvZGVyLmRlY29kZURvdWJsZSgibnVtYmVyIiwgcmVzdWx0Lm51bWJlclZhbHVlKTsK KworICAgIEFTU0VSVChyZXN1bHQudHlwZSA9PSBJREJLZXk6OkFycmF5VHlwZSk7CisKKyAgICBh dXRvIGFycmF5RnVuY3Rpb24gPSBbXShLZXllZERlY29kZXImIGRlY29kZXIsIElEQktleURhdGEm IHJlc3VsdCkgeworICAgICAgICByZXR1cm4gZGVjb2RlKGRlY29kZXIsIHJlc3VsdCk7CisgICAg fTsKKyAgICByZXR1cm4gZGVjb2Rlci5kZWNvZGVPYmplY3RzKCJhcnJheSIsIHJlc3VsdC5hcnJh eVZhbHVlLCBhcnJheUZ1bmN0aW9uKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCAy NDYwNDYxLi40Y2M0MzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMzA4MSw2ICszMDgxLDcg QEAgX19aTks3V2ViQ29yZTEwSURCS2V5UGF0aDZlbmNvZGVFUk5TXzEyS2V5ZWRFbmNvZGVyRQog X19aTks3V2ViQ29yZTExSURCS2V5UmFuZ2U5aXNPbmx5S2V5RXYKIF9fWk5LN1dlYkNvcmUxNUlE QktleVJhbmdlRGF0YTIybWF5YmVDcmVhdGVJREJLZXlSYW5nZUV2CiBfX1pOSzdXZWJDb3JlNklE QktleTdpc1ZhbGlkRXYKK19fWk43V2ViQ29yZTEwSURCS2V5RGF0YTZkZWNvZGVFUk5TXzEyS2V5 ZWREZWNvZGVyRVJTMF8KIF9fWk43V2ViQ29yZTEwSURCS2V5RGF0YUMxRVBLTlNfNklEQktleUUK IF9fWk43V2ViQ29yZTEwSURCS2V5UGF0aEMxRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3Jl MTBJREJLZXlQYXRoQzFFUktOM1dURjZWZWN0b3JJTlMxXzZTdHJpbmdFTG0wRU5TMV8xNUNyYXNo T25PdmVyZmxvd0VFRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5ZWRD b2RpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWVkQ29kaW5nLmgKaW5kZXggNDdl MmI3Mi4uMDBlN2ZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5ZWRD b2RpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LZXllZENvZGluZy5oCkBAIC0z OSw2ICszOSw4IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5LZXllZERlY29kZXIoKSB7IH0K IAogcHVibGljOgorICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVCb29sKGNvbnN0IFN0cmluZyYga2V5 LCBib29sJikgPSAwOworICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVEb3VibGUoY29uc3QgU3RyaW5n JiBrZXksIGRvdWJsZSYpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZGVjb2RlSW50NjQoY29uc3Qg U3RyaW5nJiBrZXksIGludDY0X3QmKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGRlY29kZVVJbnQz Mihjb25zdCBTdHJpbmcmIGtleSwgdWludDMyX3QmKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGRl Y29kZVN0cmluZyhjb25zdCBTdHJpbmcmIGtleSwgU3RyaW5nJikgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDQ2ZDg0ZjIuLmQ2ZGE1MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAxNC0wMS0y OSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgSURCOiBGdWxs eSBpbXBsZW1lbnQgSURCS2V5RGF0YSBlbmNvZGluZy9kZWNvZGluZworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3ODYzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFuZGxlIGludmFsaWQgYnVmZmVycywg YW5kIHBhc3MgSURCS2V5RGF0YSBkZWNvZGluZyBhbG9uZzoKKyAgICAgICAgKiBEYXRhYmFzZVBy b2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uY3BwOgorICAgICAgICAoV2ViS2l0Ojpk ZXNlcmlhbGl6ZUlEQktleVBhdGgpOgorICAgICAgICAoV2ViS2l0OjpzZXJpYWxpemVJREJLZXlE YXRhKToKKyAgICAgICAgKFdlYktpdDo6ZGVzZXJpYWxpemVJREJLZXlEYXRhKToKKyAgICAgICAg KiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uaDoKKworICAgICAg ICBJbXBsZW1lbnQgZGVjb2RlQm9vbCBhbmQgZGVjb2RlRG91YmxlOgorICAgICAgICAqIFNoYXJl ZC9jZi9LZXllZERlY29kZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpLZXllZERlY29kZXI6OmRl Y29kZUJvb2wpOgorICAgICAgICAoV2ViS2l0OjpLZXllZERlY29kZXI6OmRlY29kZURvdWJsZSk6 CisgICAgICAgICogU2hhcmVkL2NmL0tleWVkRGVjb2Rlci5oOgorCisyMDE0LTAxLTI5ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBJREI6IE9wZW5pbmcgYW4g ZXhpc3RpbmcgZGF0YWJhc2UgaXMgYnJva2VuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc4NTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv RGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvSURCU2VyaWFsaXphdGlvbi5jcHAKaW5k ZXggZGNmODVmZi4uN2Q3MzBiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQ cm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL0lEQlNlcmlhbGl6YXRpb24uY3BwCkBAIC00Niwx NyArNDYsMjkgQEAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2VyaWFsaXplSURCS2V5UGF0aChjb25z dCBJREJLZXlQYXRoJiBrZXlQYXRoKQogCiBib29sIGRlc2VyaWFsaXplSURCS2V5UGF0aChjb25z dCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSwgSURCS2V5UGF0aCYgcmVzdWx0KQogeworICAg IGlmICghZGF0YSB8fCAhc2l6ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgS2V5ZWRE ZWNvZGVyIGRlY29kZXIoZGF0YSwgc2l6ZSk7CiAgICAgcmV0dXJuIElEQktleVBhdGg6OmRlY29k ZShkZWNvZGVyLCByZXN1bHQpOwogfQogCi1SZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiBz ZXJpYWxpemVJREJLZXlEYXRhKGNvbnN0IElEQktleURhdGEmIGtleSkKK1JlZlB0cjxTaGFyZWRC dWZmZXI+IHNlcmlhbGl6ZUlEQktleURhdGEoY29uc3QgSURCS2V5RGF0YSYga2V5KQogewogICAg IEtleWVkRW5jb2RlciBlbmNvZGVyOwogICAgIGtleS5lbmNvZGUoZW5jb2Rlcik7CiAgICAgcmV0 dXJuIGVuY29kZXIuZmluaXNoRW5jb2RpbmcoKTsKIH0KIAorYm9vbCBkZXNlcmlhbGl6ZUlEQktl eURhdGEoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUsIElEQktleURhdGEmIHJlc3Vs dCkKK3sKKyAgICBpZiAoIWRhdGEgfHwgIXNpemUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIEtleWVkRGVjb2RlciBkZWNvZGVyKGRhdGEsIHNpemUpOworICAgIHJldHVybiBJREJLZXlE YXRhOjpkZWNvZGUoZGVjb2RlciwgcmVzdWx0KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CiAKICNlbmRpZiAvLyBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvSURCU2VyaWFsaXphdGlvbi5oIGIv U291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9u LmgKaW5kZXggY2IxYzQ2YS4uOTZkYzhlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0 YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmgKKysrIGIvU291cmNlL1dl YktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9JREJTZXJpYWxpemF0aW9uLmgKQEAgLTQz LDcgKzQzLDcgQEAgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gc2VyaWFsaXplSURCS2V5 UGF0aChjb25zdCBXZWJDb3JlOjpJREJLZXlQYXRoJik7CiBib29sIGRlc2VyaWFsaXplSURCS2V5 UGF0aChjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBXZWJDb3JlOjpJ REJLZXlQYXRoJik7CiAKIFJlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+IHNlcmlhbGl6ZUlE QktleURhdGEoY29uc3QgV2ViQ29yZTo6SURCS2V5RGF0YSYpOwotYm9vbCBkZXNlcmlhbGl6ZUlE QktleShjb25zdCB1aW50OF90KiBidWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBXZWJDb3JlOjpJ REJLZXlEYXRhJik7Citib29sIGRlc2VyaWFsaXplSURCS2V5RGF0YShjb25zdCB1aW50OF90KiBi dWZmZXIsIHNpemVfdCBidWZmZXJTaXplLCBXZWJDb3JlOjpJREJLZXlEYXRhJik7CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvY2Yv S2V5ZWREZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9jZi9LZXllZERlY29kZXIu Y3BwCmluZGV4IDBlYjFlZjIuLjVhODNmZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9jZi9LZXllZERlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9jZi9L ZXllZERlY29kZXIuY3BwCkBAIC01MCw2ICs1MCwzMSBAQCBLZXllZERlY29kZXI6On5LZXllZERl Y29kZXIoKQogICAgIEFTU0VSVChtX2FycmF5SW5kZXhTdGFjay5pc0VtcHR5KCkpOwogfQogCiti b29sIEtleWVkRGVjb2Rlcjo6ZGVjb2RlQm9vbChjb25zdCBTdHJpbmcmIGtleSwgYm9vbCYgcmVz dWx0KQoreworICAgIGlmICghbV9kaWN0aW9uYXJ5U3RhY2subGFzdCgpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICBDRkJvb2xlYW5SZWYgYm9vbGVhbiA9IHN0YXRpY19jYXN0PENGQm9v bGVhblJlZj4oQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUobV9kaWN0aW9uYXJ5U3RhY2subGFzdCgpLCBr ZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSkpOworICAgIGlmICghYm9vbGVhbiB8fCBDRkdldFR5 cGVJRChib29sZWFuKSAhPSBDRkJvb2xlYW5HZXRUeXBlSUQoKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworCisgICAgcmVzdWx0ID0gQ0ZCb29sZWFuR2V0VmFsdWUoYm9vbGVhbik7CisgICAgcmV0 dXJuIHRydWU7Cit9CisKK2Jvb2wgS2V5ZWREZWNvZGVyOjpkZWNvZGVEb3VibGUoY29uc3QgU3Ry aW5nJiBrZXksIGRvdWJsZSYgcmVzdWx0KQoreworICAgIGlmICghbV9kaWN0aW9uYXJ5U3RhY2su bGFzdCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBDRk51bWJlclJlZiBudW1iZXIg PSBzdGF0aWNfY2FzdDxDRk51bWJlclJlZj4oQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUobV9kaWN0aW9u YXJ5U3RhY2subGFzdCgpLCBrZXkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSkpOworICAgIGlmICgh bnVtYmVyIHx8IENGR2V0VHlwZUlEKG51bWJlcikgIT0gQ0ZOdW1iZXJHZXRUeXBlSUQoKSB8fCAo Q0ZOdW1iZXJHZXRUeXBlKG51bWJlcikgIT0ga0NGTnVtYmVyRG91YmxlVHlwZSAmJiBDRk51bWJl ckdldFR5cGUobnVtYmVyKSAhPSBrQ0ZOdW1iZXJGbG9hdDY0VHlwZSkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIHJldHVybiBDRk51bWJlckdldFZhbHVlKG51bWJlciwga0NGTnVtYmVy RG91YmxlVHlwZSwgJnJlc3VsdCk7Cit9CisKIGJvb2wgS2V5ZWREZWNvZGVyOjpkZWNvZGVJbnQ2 NChjb25zdCBTdHJpbmcmIGtleSwgaW50NjRfdCYgcmVzdWx0KQogewogICAgIGlmICghbV9kaWN0 aW9uYXJ5U3RhY2subGFzdCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2Nm L0tleWVkRGVjb2Rlci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2NmL0tleWVkRGVjb2Rlci5o CmluZGV4IGQ1ZjJmMzEuLjM1MWU4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9jZi9LZXllZERlY29kZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvY2YvS2V5ZWRE ZWNvZGVyLmgKQEAgLTM1LDIwICszNSwyMiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIEtl eWVkRGVjb2RlciBmaW5hbCA6IHB1YmxpYyBXZWJDb3JlOjpLZXllZERlY29kZXIgewogcHVibGlj OgogICAgIEtleWVkRGVjb2Rlcihjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3QpOwotICAgIHZp cnR1YWwgfktleWVkRGVjb2RlcigpOworICAgIHZpcnR1YWwgfktleWVkRGVjb2RlcigpIG92ZXJy aWRlOwogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVJbnQ2NChjb25zdCBTdHJp bmcmIGtleSwgaW50NjRfdCYpOwotICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVVSW50MzIoY29uc3Qg U3RyaW5nJiBrZXksIHVpbnQzMl90Jik7Ci0gICAgdmlydHVhbCBib29sIGRlY29kZVN0cmluZyhj b25zdCBTdHJpbmcmIGtleSwgU3RyaW5nJik7CisgICAgdmlydHVhbCBib29sIGRlY29kZUJvb2wo Y29uc3QgU3RyaW5nJiBrZXksIGJvb2wmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgZGVj b2RlRG91YmxlKGNvbnN0IFN0cmluZyYga2V5LCBkb3VibGUmKSBvdmVycmlkZTsKKyAgICB2aXJ0 dWFsIGJvb2wgZGVjb2RlSW50NjQoY29uc3QgU3RyaW5nJiBrZXksIGludDY0X3QmKSBvdmVycmlk ZTsKKyAgICB2aXJ0dWFsIGJvb2wgZGVjb2RlVUludDMyKGNvbnN0IFN0cmluZyYga2V5LCB1aW50 MzJfdCYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBkZWNvZGVTdHJpbmcoY29uc3QgU3Ry aW5nJiBrZXksIFN0cmluZyYpIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBib29sIGJlZ2luT2Jq ZWN0KGNvbnN0IFN0cmluZyYga2V5KTsKLSAgICB2aXJ0dWFsIHZvaWQgZW5kT2JqZWN0KCk7Cisg ICAgdmlydHVhbCBib29sIGJlZ2luT2JqZWN0KGNvbnN0IFN0cmluZyYga2V5KSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgZW5kT2JqZWN0KCkgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0dWFsIGJv b2wgYmVnaW5BcnJheShjb25zdCBTdHJpbmcmIGtleSk7Ci0gICAgdmlydHVhbCBib29sIGJlZ2lu QXJyYXlFbGVtZW50KCk7Ci0gICAgdmlydHVhbCB2b2lkIGVuZEFycmF5RWxlbWVudCgpOwotICAg IHZpcnR1YWwgdm9pZCBlbmRBcnJheSgpOworICAgIHZpcnR1YWwgYm9vbCBiZWdpbkFycmF5KGNv bnN0IFN0cmluZyYga2V5KSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgYmVnaW5BcnJheUVs ZW1lbnQoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZW5kQXJyYXlFbGVtZW50KCkgb3Zl cnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGVuZEFycmF5KCkgb3ZlcnJpZGU7CiAKICAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBtX3Jvb3REaWN0aW9uYXJ5OwogCg==