163935 2016-10-24 22:48:08 -0700 IDBObjectStore.createIndex() should take a union in parameter 2016-10-25 12:20:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore P2 Normal --- 163909 1 cdumez cdumez alecflett beidson commit-queue darin esprehn+autocc jsbell kondapallykalyan sam oldest_to_newest 1244113 0 cdumez 2016-10-24 22:48:08 -0700 IDBObjectStore.createIndex() should take a union in parameter: - https://www.w3.org/TR/IndexedDB/#idl-def-IDBObjectStore 1244114 1 292722 cdumez 2016-10-24 22:49:33 -0700 Created attachment 292722 WIP patch 1244115 2 commit-queue 2016-10-24 22:51:30 -0700 Attachment 292722 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBObjectStore.h:33: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1244245 3 292767 cdumez 2016-10-25 09:57:39 -0700 Created attachment 292767 Patch 1244295 4 292767 darin 2016-10-25 11:07:06 -0700 Comment on attachment 292767 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=292767&action=review > Source/WebCore/Modules/indexeddb/IDBKeyPath.h:37 > +bool isIDBKeyPathValid(const IDBKeyPathVariant&); OK, maybe we won’t be getting rid of this header. 1244341 5 292767 commit-queue 2016-10-25 12:20:27 -0700 Comment on attachment 292767 Patch Clearing flags on attachment: 292767 Committed r207832: <http://trac.webkit.org/changeset/207832> 1244342 6 commit-queue 2016-10-25 12:20:33 -0700 All reviewed patches have been landed. Closing bug. 292722 2016-10-24 22:49:33 -0700 2016-10-25 09:57:36 -0700 WIP patch 163935_createIndex_union_wip.patch text/plain 9778 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlLmNwcApp bmRleCA5ZTBkMjg4Li44MGJjZTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCRGF0YWJhc2UuY3BwCkBAIC0xNDYsMTUgKzE0NiwxNSBAQCBFeGNlcHRpb25P cjxSZWY8SURCT2JqZWN0U3RvcmU+PiBJREJEYXRhYmFzZTo6Y3JlYXRlT2JqZWN0U3RvcmUoY29u c3QgU3RyaW5nJiBuYQogICAgIGlmIChtX2luZm8uaGFzT2JqZWN0U3RvcmUobmFtZSkpCiAgICAg ICAgIHJldHVybiBFeGNlcHRpb24geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6Q29uc3RyYWludEVy cm9yLCBBU0NJSUxpdGVyYWwoIkZhaWxlZCB0byBleGVjdXRlICdjcmVhdGVPYmplY3RTdG9yZScg b24gJ0lEQkRhdGFiYXNlJzogQW4gb2JqZWN0IHN0b3JlIHdpdGggdGhlIHNwZWNpZmllZCBuYW1l IGFscmVhZHkgZXhpc3RzLiIpIH07CiAKLSAgICBJREJLZXlQYXRoIGtleVBhdGgoV1RGTW92ZShw YXJhbWV0ZXJzLmtleVBhdGgpKTsKLSAgICBpZiAoIWtleVBhdGguaXNOdWxsKCkgJiYgIWtleVBh dGguaXNWYWxpZCgpKQorICAgIGF1dG8mIGtleVBhdGggPSBwYXJhbWV0ZXJzLmtleVBhdGg7Cisg ICAgaWYgKGtleVBhdGggJiYgIWlzSURCS2V5UGF0aFZhbGlkKGtleVBhdGgudmFsdWUoKSkpCiAg ICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6U3ludGF4RXJy b3IsIEFTQ0lJTGl0ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NyZWF0ZU9iamVjdFN0b3JlJyBv biAnSURCRGF0YWJhc2UnOiBUaGUga2V5UGF0aCBvcHRpb24gaXMgbm90IGEgdmFsaWQga2V5IHBh dGguIikgfTsKIAotICAgIGlmIChwYXJhbWV0ZXJzLmF1dG9JbmNyZW1lbnQgJiYgKChrZXlQYXRo LnR5cGUoKSA9PSBJREJLZXlQYXRoOjpUeXBlOjpTdHJpbmcgJiYga2V5UGF0aC5zdHJpbmcoKS5p c0VtcHR5KCkpIHx8IGtleVBhdGgudHlwZSgpID09IElEQktleVBhdGg6OlR5cGU6OkFycmF5KSkK KyAgICBpZiAoa2V5UGF0aCAmJiBwYXJhbWV0ZXJzLmF1dG9JbmNyZW1lbnQgJiYgKChXVEY6Omhv bGRzX2FsdGVybmF0aXZlPFN0cmluZz4oa2V5UGF0aC52YWx1ZSgpKSAmJiBXVEY6OmdldDxTdHJp bmc+KGtleVBhdGgudmFsdWUoKSkuaXNFbXB0eSgpKSB8fCBXVEY6OmhvbGRzX2FsdGVybmF0aXZl PFZlY3RvcjxTdHJpbmc+PihrZXlQYXRoLnZhbHVlKCkpKSkKICAgICAgICAgcmV0dXJuIEV4Y2Vw dGlvbiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpJbnZhbGlkQWNjZXNzRXJyb3IsIEFTQ0lJTGl0 ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NyZWF0ZU9iamVjdFN0b3JlJyBvbiAnSURCRGF0YWJh c2UnOiBUaGUgYXV0b0luY3JlbWVudCBvcHRpb24gd2FzIHNldCBidXQgdGhlIGtleVBhdGggb3B0 aW9uIHdhcyBlbXB0eSBvciBhbiBhcnJheS4iKSB9OwogCiAgICAgLy8gSW5zdGFsbCB0aGUgbmV3 IE9iamVjdFN0b3JlIGludG8gdGhlIGNvbm5lY3Rpb24ncyBtZXRhZGF0YS4KLSAgICBhdXRvIGlu Zm8gPSBtX2luZm8uY3JlYXRlTmV3T2JqZWN0U3RvcmUobmFtZSwga2V5UGF0aCwgcGFyYW1ldGVy cy5hdXRvSW5jcmVtZW50KTsKKyAgICBhdXRvIGluZm8gPSBtX2luZm8uY3JlYXRlTmV3T2JqZWN0 U3RvcmUobmFtZSwga2V5UGF0aCA/IElEQktleVBhdGgoV1RGTW92ZShrZXlQYXRoLnZhbHVlKCkp KSA6IElEQktleVBhdGgoKSwgcGFyYW1ldGVycy5hdXRvSW5jcmVtZW50KTsKIAogICAgIC8vIENy ZWF0ZSB0aGUgYWN0dWFsIElEQk9iamVjdFN0b3JlIGZyb20gdGhlIHRyYW5zYWN0aW9uLCB3aGlj aCBhbHNvIHNjaGVkdWxlcyB0aGUgb3BlcmF0aW9uIHNlcnZlciBzaWRlLgogICAgIHJldHVybiBt X3ZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbi0+Y3JlYXRlT2JqZWN0U3RvcmUoaW5mbyk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlQYXRoLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVBhdGguY3BwCmluZGV4IDky NmY4OWQuLjRjOTNkMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQktleVBhdGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQktleVBhdGguY3BwCkBAIC0yMDgsMzggKzIwOCwzMSBAQCBJREJLZXlQYXRoOjpJREJLZXlQ YXRoKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBhcnJheSkKICNlbmRpZgogfQogCi1JREJLZXlQYXRo OjpJREJLZXlQYXRoKE9wdGlvbmFsPElEQktleVBhdGhWYXJpYW50PiYmIHZhcmlhbnQpCitJREJL ZXlQYXRoOjpJREJLZXlQYXRoKElEQktleVBhdGhWYXJpYW50JiYgdmFyaWFudCkKIHsKLSAgICBp ZiAoIXZhcmlhbnQpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChXVEY6OmhvbGRzX2FsdGVy bmF0aXZlPFN0cmluZz4oKnZhcmlhbnQpKSB7CisgICAgaWYgKFdURjo6aG9sZHNfYWx0ZXJuYXRp dmU8U3RyaW5nPih2YXJpYW50KSkgewogICAgICAgICBtX3R5cGUgPSBUeXBlOjpTdHJpbmc7Ci0g ICAgICAgIG1fc3RyaW5nID0gV1RGTW92ZShXVEY6OmdldDxTdHJpbmc+KCp2YXJpYW50KSk7Cisg ICAgICAgIG1fc3RyaW5nID0gV1RGTW92ZShXVEY6OmdldDxTdHJpbmc+KHZhcmlhbnQpKTsKICAg ICB9IGVsc2UgewogICAgICAgICBtX3R5cGUgPSBUeXBlOjpBcnJheTsKLSAgICAgICAgbV9hcnJh eSA9IFdURk1vdmUoV1RGOjpnZXQ8VmVjdG9yPFN0cmluZz4+KCp2YXJpYW50KSk7CisgICAgICAg IG1fYXJyYXkgPSBXVEZNb3ZlKFdURjo6Z2V0PFZlY3RvcjxTdHJpbmc+Pih2YXJpYW50KSk7CiAg ICAgfQogfQogCi1ib29sIElEQktleVBhdGg6OmlzVmFsaWQoKSBjb25zdAorYm9vbCBpc0lEQktl eVBhdGhWYWxpZChjb25zdCBJREJLZXlQYXRoVmFyaWFudCYga2V5UGF0aCkKIHsKLSAgICBzd2l0 Y2ggKG1fdHlwZSkgewotICAgIGNhc2UgVHlwZTo6TnVsbDoKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIGNhc2UgVHlwZTo6U3RyaW5nOgotICAgICAgICByZXR1cm4gSURCSXNWYWxpZEtleVBh dGgobV9zdHJpbmcpOwotICAgIGNhc2UgVHlwZTo6QXJyYXk6Ci0gICAgICAgIGlmIChtX2FycmF5 LmlzRW1wdHkoKSkKKyAgICBhdXRvIHZpc2l0b3IgPSBXVEY6Om1ha2VWaXNpdG9yKFtdKGNvbnN0 IFN0cmluZyYgc3RyaW5nKSB7CisgICAgICAgIHJldHVybiBJREJJc1ZhbGlkS2V5UGF0aChzdHJp bmcpOworICAgIH0sIFtdKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB2ZWN0b3IpIHsKKyAgICAgICAg aWYgKHZlY3Rvci5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAg IGZvciAoYXV0byYga2V5IDogbV9hcnJheSkgeworICAgICAgICBmb3IgKGF1dG8mIGtleSA6IHZl Y3RvcikgewogICAgICAgICAgICAgaWYgKCFJREJJc1ZhbGlkS2V5UGF0aChrZXkpKQogICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAg IH0pOworICAgIHJldHVybiBXVEY6OnZpc2l0KHZpc2l0b3IsIGtleVBhdGgpOwogfQogCiBib29s IElEQktleVBhdGg6Om9wZXJhdG9yPT0oY29uc3QgSURCS2V5UGF0aCYgb3RoZXIpIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlQYXRoLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlQYXRoLmgKaW5kZXggZDZh MjFkNi4uNzVkYzVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCS2V5UGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QktleVBhdGguaApAQCAtMzQsNiArMzQsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2lu ZyBJREJLZXlQYXRoVmFyaWFudCA9IFdURjo6VmFyaWFudDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+ PjsKK2Jvb2wgaXNJREJLZXlQYXRoVmFsaWQoY29uc3QgSURCS2V5UGF0aFZhcmlhbnQmKTsKIAog Y2xhc3MgS2V5ZWREZWNvZGVyOwogY2xhc3MgS2V5ZWRFbmNvZGVyOwpAQCAtNTMsNyArNTQsNyBA QCBwdWJsaWM6CiAgICAgSURCS2V5UGF0aCgpIHsgfQogICAgIFdFQkNPUkVfRVhQT1JUIElEQktl eVBhdGgoY29uc3QgU3RyaW5nJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgSURCS2V5UGF0aChjb25z dCBWZWN0b3I8U3RyaW5nPiYgYXJyYXkpOwotICAgIFdFQkNPUkVfRVhQT1JUIElEQktleVBhdGgo T3B0aW9uYWw8SURCS2V5UGF0aFZhcmlhbnQ+JiYpOworICAgIFdFQkNPUkVfRVhQT1JUIElEQktl eVBhdGgoSURCS2V5UGF0aFZhcmlhbnQmJik7CiAKICAgICBlbnVtIGNsYXNzIFR5cGUgeyBOdWxs LCBTdHJpbmcsIEFycmF5IH07CiAgICAgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBl OyB9CkBAIC03MSw3ICs3Miw2IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICBib29sIGlzTnVsbCgp IGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBUeXBlOjpOdWxsOyB9Ci0gICAgYm9vbCBpc1ZhbGlk KCkgY29uc3Q7CiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IElEQktleVBhdGgmIG90aGVyKSBj b25zdDsKIAogICAgIElEQktleVBhdGggaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAKaW5kZXgg YTA0ZGE2MS4uODg0ZWQ5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQk9iamVjdFN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAKQEAgLTM3MSw3ICszNzEsNyBAQCBFeGNlcHRpb25P cjxSZWY8SURCUmVxdWVzdD4+IElEQk9iamVjdFN0b3JlOjpjbGVhcihFeGVjU3RhdGUmIGV4ZWNT dGF0ZSkKICAgICByZXR1cm4gbV90cmFuc2FjdGlvbi0+cmVxdWVzdENsZWFyT2JqZWN0U3RvcmUo ZXhlY1N0YXRlLCAqdGhpcyk7CiB9CiAKLUV4Y2VwdGlvbk9yPFJlZjxJREJJbmRleD4+IElEQk9i amVjdFN0b3JlOjpjcmVhdGVJbmRleChFeGVjU3RhdGUmLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IElEQktleVBhdGgmIGtleVBhdGgsIGNvbnN0IEluZGV4UGFyYW1ldGVycyYgcGFyYW1ldGVy cykKK0V4Y2VwdGlvbk9yPFJlZjxJREJJbmRleD4+IElEQk9iamVjdFN0b3JlOjpjcmVhdGVJbmRl eChFeGVjU3RhdGUmLCBjb25zdCBTdHJpbmcmIG5hbWUsIElEQktleVBhdGhWYXJpYW50JiYga2V5 UGF0aCwgY29uc3QgSW5kZXhQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogICAgIExPRyhJbmRl eGVkREIsICJJREJPYmplY3RTdG9yZTo6Y3JlYXRlSW5kZXggJXMiLCBuYW1lLnV0ZjgoKS5kYXRh KCkpOwogICAgIEFTU0VSVChjdXJyZW50VGhyZWFkKCkgPT0gbV90cmFuc2FjdGlvbi0+ZGF0YWJh c2UoKS5vcmlnaW5UaHJlYWRJRCgpKTsKQEAgLTM4NSw3ICszODUsNyBAQCBFeGNlcHRpb25PcjxS ZWY8SURCSW5kZXg+PiBJREJPYmplY3RTdG9yZTo6Y3JlYXRlSW5kZXgoRXhlY1N0YXRlJiwgY29u c3QgU3RyaW5nJgogICAgIGlmICghbV90cmFuc2FjdGlvbi0+aXNBY3RpdmUoKSkKICAgICAgICAg cmV0dXJuIEV4Y2VwdGlvbiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpUcmFuc2FjdGlvbkluYWN0 aXZlRXJyb3IgfTsKIAotICAgIGlmICgha2V5UGF0aC5pc1ZhbGlkKCkpCisgICAgaWYgKCFpc0lE QktleVBhdGhWYWxpZChrZXlQYXRoKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IElEQkRh dGFiYXNlRXhjZXB0aW9uOjpTeW50YXhFcnJvciwgQVNDSUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhl Y3V0ZSAnY3JlYXRlSW5kZXgnIG9uICdJREJPYmplY3RTdG9yZSc6IFRoZSBrZXlQYXRoIGFyZ3Vt ZW50IGNvbnRhaW5zIGFuIGludmFsaWQga2V5IHBhdGguIikgfTsKIAogICAgIGlmIChuYW1lLmlz TnVsbCgpKQpAQCAtMzk0LDExICszOTQsMTEgQEAgRXhjZXB0aW9uT3I8UmVmPElEQkluZGV4Pj4g SURCT2JqZWN0U3RvcmU6OmNyZWF0ZUluZGV4KEV4ZWNTdGF0ZSYsIGNvbnN0IFN0cmluZyYKICAg ICBpZiAobV9pbmZvLmhhc0luZGV4KG5hbWUpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg SURCRGF0YWJhc2VFeGNlcHRpb246OkNvbnN0cmFpbnRFcnJvciwgQVNDSUlMaXRlcmFsKCJGYWls ZWQgdG8gZXhlY3V0ZSAnY3JlYXRlSW5kZXgnIG9uICdJREJPYmplY3RTdG9yZSc6IEFuIGluZGV4 IHdpdGggdGhlIHNwZWNpZmllZCBuYW1lIGFscmVhZHkgZXhpc3RzLiIpIH07CiAKLSAgICBpZiAo a2V5UGF0aC50eXBlKCkgPT0gSURCS2V5UGF0aDo6VHlwZTo6QXJyYXkgJiYgcGFyYW1ldGVycy5t dWx0aUVudHJ5KQorICAgIGlmIChwYXJhbWV0ZXJzLm11bHRpRW50cnkgJiYgV1RGOjpob2xkc19h bHRlcm5hdGl2ZTxWZWN0b3I8U3RyaW5nPj4oa2V5UGF0aCkpCiAgICAgICAgIHJldHVybiBFeGNl cHRpb24geyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6SW52YWxpZEFjY2Vzc0Vycm9yLCBBU0NJSUxp dGVyYWwoIkZhaWxlZCB0byBleGVjdXRlICdjcmVhdGVJbmRleCcgb24gJ0lEQk9iamVjdFN0b3Jl JzogVGhlIGtleVBhdGggYXJndW1lbnQgd2FzIGFuIGFycmF5IGFuZCB0aGUgbXVsdGlFbnRyeSBv cHRpb24gaXMgdHJ1ZS4iKSB9OwogCiAgICAgLy8gSW5zdGFsbCB0aGUgbmV3IEluZGV4IGludG8g dGhlIE9iamVjdFN0b3JlJ3MgaW5mby4KLSAgICBJREJJbmRleEluZm8gaW5mbyA9IG1faW5mby5j cmVhdGVOZXdJbmRleChuYW1lLCBrZXlQYXRoLCBwYXJhbWV0ZXJzLnVuaXF1ZSwgcGFyYW1ldGVy cy5tdWx0aUVudHJ5KTsKKyAgICBJREJJbmRleEluZm8gaW5mbyA9IG1faW5mby5jcmVhdGVOZXdJ bmRleChuYW1lLCBXVEZNb3ZlKGtleVBhdGgpLCBwYXJhbWV0ZXJzLnVuaXF1ZSwgcGFyYW1ldGVy cy5tdWx0aUVudHJ5KTsKICAgICBtX3RyYW5zYWN0aW9uLT5kYXRhYmFzZSgpLmRpZENyZWF0ZUlu ZGV4SW5mbyhpbmZvKTsKIAogICAgIC8vIENyZWF0ZSB0aGUgYWN0dWFsIElEQk9iamVjdFN0b3Jl IGZyb20gdGhlIHRyYW5zYWN0aW9uLCB3aGljaCBhbHNvIHNjaGVkdWxlcyB0aGUgb3BlcmF0aW9u IHNlcnZlciBzaWRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCT2JqZWN0U3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE Qk9iamVjdFN0b3JlLmgKaW5kZXggYTJjYzRhNC4uYjEzZjBjNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oCkBAIC0zMCw2ICszMCw3 IEBACiAjaW5jbHVkZSAiQWN0aXZlRE9NT2JqZWN0LmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uT3Iu aCIKICNpbmNsdWRlICJJREJPYmplY3RTdG9yZUluZm8uaCIKKyNpbmNsdWRlICJJREJLZXlQYXRo LmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KIAogbmFtZXNwYWNlIEpTQyB7CkBAIC04MCw3 ICs4MSw3IEBAIHB1YmxpYzoKICAgICBFeGNlcHRpb25PcjxSZWY8SURCUmVxdWVzdD4+IGRlbGV0 ZUZ1bmN0aW9uKEpTQzo6RXhlY1N0YXRlJiwgSURCS2V5UmFuZ2UqKTsKICAgICBFeGNlcHRpb25P cjxSZWY8SURCUmVxdWVzdD4+IGRlbGV0ZUZ1bmN0aW9uKEpTQzo6RXhlY1N0YXRlJiwgSlNDOjpK U1ZhbHVlIGtleSk7CiAgICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+PiBjbGVhcihKU0M6 OkV4ZWNTdGF0ZSYpOwotICAgIEV4Y2VwdGlvbk9yPFJlZjxJREJJbmRleD4+IGNyZWF0ZUluZGV4 KEpTQzo6RXhlY1N0YXRlJiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBJREJLZXlQYXRoJiwg Y29uc3QgSW5kZXhQYXJhbWV0ZXJzJik7CisgICAgRXhjZXB0aW9uT3I8UmVmPElEQkluZGV4Pj4g Y3JlYXRlSW5kZXgoSlNDOjpFeGVjU3RhdGUmLCBjb25zdCBTdHJpbmcmIG5hbWUsIElEQktleVBh dGhWYXJpYW50JiYsIGNvbnN0IEluZGV4UGFyYW1ldGVycyYpOwogICAgIEV4Y2VwdGlvbk9yPFJl ZjxJREJJbmRleD4+IGluZGV4KGNvbnN0IFN0cmluZyYgbmFtZSk7CiAgICAgRXhjZXB0aW9uT3I8 dm9pZD4gZGVsZXRlSW5kZXgoY29uc3QgU3RyaW5nJiBuYW1lKTsKICAgICBFeGNlcHRpb25PcjxS ZWY8SURCUmVxdWVzdD4+IGNvdW50KEpTQzo6RXhlY1N0YXRlJiwgSURCS2V5UmFuZ2UqKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3Jl LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmlk bAppbmRleCBhYWZmZDk0Li42Y2QxNDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaWRsCkBAIC00NSw4ICs0NSw3IEBACiAgICAg W0NhbGxXaXRoPVNjcmlwdFN0YXRlLCBNYXlUaHJvd0V4Y2VwdGlvbl0gSURCUmVxdWVzdCBjbGVh cigpOwogICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZSwgTWF5VGhyb3dFeGNlcHRpb25dIElEQlJl cXVlc3Qgb3BlbkN1cnNvcihvcHRpb25hbCBJREJLZXlSYW5nZT8gcmFuZ2UgPSBudWxsLCBvcHRp b25hbCBET01TdHJpbmcgZGlyZWN0aW9uID0gIm5leHQiKTsKICAgICBbQ2FsbFdpdGg9U2NyaXB0 U3RhdGUsIE1heVRocm93RXhjZXB0aW9uXSBJREJSZXF1ZXN0IG9wZW5DdXJzb3IoYW55IGtleSwg b3B0aW9uYWwgRE9NU3RyaW5nIGRpcmVjdGlvbiA9ICJuZXh0Iik7Ci0gICAgW0NhbGxXaXRoPVNj cmlwdFN0YXRlLCBNYXlUaHJvd0V4Y2VwdGlvbl0gSURCSW5kZXggY3JlYXRlSW5kZXgoRE9NU3Ry aW5nIG5hbWUsIHNlcXVlbmNlPERPTVN0cmluZz4ga2V5UGF0aCwgb3B0aW9uYWwgSURCSW5kZXhQ YXJhbWV0ZXJzIG9wdGlvbnMpOwotICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZSwgTWF5VGhyb3dF eGNlcHRpb25dIElEQkluZGV4IGNyZWF0ZUluZGV4KERPTVN0cmluZyBuYW1lLCBET01TdHJpbmcg a2V5UGF0aCwgb3B0aW9uYWwgSURCSW5kZXhQYXJhbWV0ZXJzIG9wdGlvbnMpOworICAgIFtDYWxs V2l0aD1TY3JpcHRTdGF0ZSwgTWF5VGhyb3dFeGNlcHRpb25dIElEQkluZGV4IGNyZWF0ZUluZGV4 KERPTVN0cmluZyBuYW1lLCAoRE9NU3RyaW5nIG9yIHNlcXVlbmNlPERPTVN0cmluZz4pIGtleVBh dGgsIG9wdGlvbmFsIElEQkluZGV4UGFyYW1ldGVycyBvcHRpb25zKTsKICAgICBbTWF5VGhyb3dF eGNlcHRpb25dIElEQkluZGV4IGluZGV4KERPTVN0cmluZyBuYW1lKTsKICAgICBbTWF5VGhyb3dF eGNlcHRpb25dIHZvaWQgZGVsZXRlSW5kZXgoRE9NU3RyaW5nIG5hbWUpOwogICAgIFtDYWxsV2l0 aD1TY3JpcHRTdGF0ZSwgTWF5VGhyb3dFeGNlcHRpb25dIElEQlJlcXVlc3QgY291bnQob3B0aW9u YWwgSURCS2V5UmFuZ2U/IHJhbmdlID0gbnVsbCk7Cg== 292767 2016-10-25 09:57:39 -0700 2016-10-25 12:20:27 -0700 Patch bug-163935-20161025095353.patch text/plain 10550 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3ODA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc3YjAzNzhlOGIxM2Uy ODlkOGVhMWZjMjA2MTk1ZTI0MmQ4YzNiZS4uYWZkZTUyMTE1MzgxMDk2YzdmNWQwMzAwZTViMjM1 MTMwMzgxOWVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTEwLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgSURCT2JqZWN0U3RvcmUuY3Jl YXRlSW5kZXgoKSBzaG91bGQgdGFrZSBhIHVuaW9uIGluIHBhcmFtZXRlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzOTM1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSURCT2JqZWN0U3RvcmUuY3JlYXRl SW5kZXgoKSBzaG91bGQgdGFrZSBhIHVuaW9uIGluIHBhcmFtZXRlcjoKKyAgICAgICAgLSBodHRw czovL3d3dy53My5vcmcvVFIvSW5kZXhlZERCLyNpZGwtZGVmLUlEQk9iamVjdFN0b3JlCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBubyBleHBlY3RlZCBXZWItZXhwb3NlZCBiZWhhdmlvciBjaGFu Z2UuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZTo6Y3JlYXRlT2JqZWN0U3RvcmUpOgorICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL0lEQktleVBhdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNJ REJLZXlQYXRoVmFsaWQpOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UGF0aDo6aXNWYWxpZCk6 IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5oOgorICAg ICAgICAoV2ViQ29yZTo6SURCS2V5UGF0aDo6aXNOdWxsKToKKyAgICAgICAgKiBNb2R1bGVzL2lu ZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJPYmplY3RT dG9yZTo6Y3JlYXRlSW5kZXgpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVj dFN0b3JlLmg6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaWRs OgorCiAyMDE2LTEwLTI0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgSURCRGF0YWJhc2UuY3JlYXRlT2JqZWN0U3RvcmUoKSBzaG91bGQgdGFrZSBhIElEQk9iamVj dFN0b3JlUGFyYW1ldGVycyBkaWN0aW9uYXJ5IGluIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2UuY3BwCmluZGV4IDllMGQyODgzZGJh NzdiYjJlYmQ1MTUyYWRhMWI1ZTdkY2I1YWU4YjYuLmI2OTM4NzY2MDUzY2QxMmJkN2Q0YzhlZjc0 MThmMjY0MTE5NjJlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJEYXRhYmFzZS5jcHAKQEAgLTE0NiwxNSArMTQ2LDE1IEBAIEV4Y2VwdGlvbk9yPFJlZjxJ REJPYmplY3RTdG9yZT4+IElEQkRhdGFiYXNlOjpjcmVhdGVPYmplY3RTdG9yZShjb25zdCBTdHJp bmcmIG5hCiAgICAgaWYgKG1faW5mby5oYXNPYmplY3RTdG9yZShuYW1lKSkKICAgICAgICAgcmV0 dXJuIEV4Y2VwdGlvbiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpDb25zdHJhaW50RXJyb3IsIEFT Q0lJTGl0ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NyZWF0ZU9iamVjdFN0b3JlJyBvbiAnSURC RGF0YWJhc2UnOiBBbiBvYmplY3Qgc3RvcmUgd2l0aCB0aGUgc3BlY2lmaWVkIG5hbWUgYWxyZWFk eSBleGlzdHMuIikgfTsKIAotICAgIElEQktleVBhdGgga2V5UGF0aChXVEZNb3ZlKHBhcmFtZXRl cnMua2V5UGF0aCkpOwotICAgIGlmICgha2V5UGF0aC5pc051bGwoKSAmJiAha2V5UGF0aC5pc1Zh bGlkKCkpCisgICAgYXV0byYga2V5UGF0aCA9IHBhcmFtZXRlcnMua2V5UGF0aDsKKyAgICBpZiAo a2V5UGF0aCAmJiAhaXNJREJLZXlQYXRoVmFsaWQoa2V5UGF0aC52YWx1ZSgpKSkKICAgICAgICAg cmV0dXJuIEV4Y2VwdGlvbiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpTeW50YXhFcnJvciwgQVND SUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhlY3V0ZSAnY3JlYXRlT2JqZWN0U3RvcmUnIG9uICdJREJE YXRhYmFzZSc6IFRoZSBrZXlQYXRoIG9wdGlvbiBpcyBub3QgYSB2YWxpZCBrZXkgcGF0aC4iKSB9 OwogCi0gICAgaWYgKHBhcmFtZXRlcnMuYXV0b0luY3JlbWVudCAmJiAoKGtleVBhdGgudHlwZSgp ID09IElEQktleVBhdGg6OlR5cGU6OlN0cmluZyAmJiBrZXlQYXRoLnN0cmluZygpLmlzRW1wdHko KSkgfHwga2V5UGF0aC50eXBlKCkgPT0gSURCS2V5UGF0aDo6VHlwZTo6QXJyYXkpKQorICAgIGlm IChrZXlQYXRoICYmIHBhcmFtZXRlcnMuYXV0b0luY3JlbWVudCAmJiAoKFdURjo6aG9sZHNfYWx0 ZXJuYXRpdmU8U3RyaW5nPihrZXlQYXRoLnZhbHVlKCkpICYmIFdURjo6Z2V0PFN0cmluZz4oa2V5 UGF0aC52YWx1ZSgpKS5pc0VtcHR5KCkpIHx8IFdURjo6aG9sZHNfYWx0ZXJuYXRpdmU8VmVjdG9y PFN0cmluZz4+KGtleVBhdGgudmFsdWUoKSkpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg SURCRGF0YWJhc2VFeGNlcHRpb246OkludmFsaWRBY2Nlc3NFcnJvciwgQVNDSUlMaXRlcmFsKCJG YWlsZWQgdG8gZXhlY3V0ZSAnY3JlYXRlT2JqZWN0U3RvcmUnIG9uICdJREJEYXRhYmFzZSc6IFRo ZSBhdXRvSW5jcmVtZW50IG9wdGlvbiB3YXMgc2V0IGJ1dCB0aGUga2V5UGF0aCBvcHRpb24gd2Fz IGVtcHR5IG9yIGFuIGFycmF5LiIpIH07CiAKICAgICAvLyBJbnN0YWxsIHRoZSBuZXcgT2JqZWN0 U3RvcmUgaW50byB0aGUgY29ubmVjdGlvbidzIG1ldGFkYXRhLgotICAgIGF1dG8gaW5mbyA9IG1f aW5mby5jcmVhdGVOZXdPYmplY3RTdG9yZShuYW1lLCBrZXlQYXRoLCBwYXJhbWV0ZXJzLmF1dG9J bmNyZW1lbnQpOworICAgIGF1dG8gaW5mbyA9IG1faW5mby5jcmVhdGVOZXdPYmplY3RTdG9yZShu YW1lLCBXVEZNb3ZlKGtleVBhdGgpLCBwYXJhbWV0ZXJzLmF1dG9JbmNyZW1lbnQpOwogCiAgICAg Ly8gQ3JlYXRlIHRoZSBhY3R1YWwgSURCT2JqZWN0U3RvcmUgZnJvbSB0aGUgdHJhbnNhY3Rpb24s IHdoaWNoIGFsc28gc2NoZWR1bGVzIHRoZSBvcGVyYXRpb24gc2VydmVyIHNpZGUuCiAgICAgcmV0 dXJuIG1fdmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9uLT5jcmVhdGVPYmplY3RTdG9yZShpbmZvKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVBhdGgu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHAKaW5k ZXggOTI2Zjg5ZDI0NWNkMzY1NDRiMzlkNTViOTE4MGI0ZmMxNzg4NWM4NC4uYzRhNGVlMjk5MTg0 NWFhZTNiYmEyNDVjY2FlMGNmYTU5MjJkZTBkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCS2V5UGF0aC5jcHAKQEAgLTIyMiwyNCArMjIyLDIwIEBAIElEQktl eVBhdGg6OklEQktleVBhdGgoT3B0aW9uYWw8SURCS2V5UGF0aFZhcmlhbnQ+JiYgdmFyaWFudCkK ICAgICB9CiB9CiAKLWJvb2wgSURCS2V5UGF0aDo6aXNWYWxpZCgpIGNvbnN0Citib29sIGlzSURC S2V5UGF0aFZhbGlkKGNvbnN0IElEQktleVBhdGhWYXJpYW50JiBrZXlQYXRoKQogewotICAgIHN3 aXRjaCAobV90eXBlKSB7Ci0gICAgY2FzZSBUeXBlOjpOdWxsOgotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgY2FzZSBUeXBlOjpTdHJpbmc6Ci0gICAgICAgIHJldHVybiBJREJJc1ZhbGlkS2V5 UGF0aChtX3N0cmluZyk7Ci0gICAgY2FzZSBUeXBlOjpBcnJheToKLSAgICAgICAgaWYgKG1fYXJy YXkuaXNFbXB0eSgpKQorICAgIGF1dG8gdmlzaXRvciA9IFdURjo6bWFrZVZpc2l0b3IoW10oY29u c3QgU3RyaW5nJiBzdHJpbmcpIHsKKyAgICAgICAgcmV0dXJuIElEQklzVmFsaWRLZXlQYXRoKHN0 cmluZyk7CisgICAgfSwgW10oY29uc3QgVmVjdG9yPFN0cmluZz4mIHZlY3RvcikgeworICAgICAg ICBpZiAodmVjdG9yLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgZm9yIChhdXRvJiBrZXkgOiBtX2FycmF5KSB7CisgICAgICAgIGZvciAoYXV0byYga2V5IDog dmVjdG9yKSB7CiAgICAgICAgICAgICBpZiAoIUlEQklzVmFsaWRLZXlQYXRoKGtleSkpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiB0cnVl OwotICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gZmFsc2U7Cisg ICAgfSk7CisgICAgcmV0dXJuIFdURjo6dmlzaXQodmlzaXRvciwga2V5UGF0aCk7CiB9CiAKIGJv b2wgSURCS2V5UGF0aDo6b3BlcmF0b3I9PShjb25zdCBJREJLZXlQYXRoJiBvdGhlcikgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVBhdGgu aCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVBhdGguaAppbmRleCBk NmEyMWQ2NTk1M2EwMTRjMWU1M2FjN2ViMzVkMWEzYjYyZGJjMzU3Li4wZjljNWNjZDdlM2IyZmZi OWE3NTE0ODI2MWMzMGQ2YTU1MDI5ZjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJLZXlQYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCS2V5UGF0aC5oCkBAIC0zNCw2ICszNCw3IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIHVzaW5nIElEQktleVBhdGhWYXJpYW50ID0gV1RGOjpWYXJpYW50PFN0cmluZywgVmVj dG9yPFN0cmluZz4+OworYm9vbCBpc0lEQktleVBhdGhWYWxpZChjb25zdCBJREJLZXlQYXRoVmFy aWFudCYpOwogCiBjbGFzcyBLZXllZERlY29kZXI7CiBjbGFzcyBLZXllZEVuY29kZXI7CkBAIC03 MSw3ICs3Miw2IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsg cmV0dXJuIG1fdHlwZSA9PSBUeXBlOjpOdWxsOyB9Ci0gICAgYm9vbCBpc1ZhbGlkKCkgY29uc3Q7 CiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IElEQktleVBhdGgmIG90aGVyKSBjb25zdDsKIAog ICAgIElEQktleVBhdGggaXNvbGF0ZWRDb3B5KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAKaW5kZXggYTA0ZGE2MTll NzI1NDE1YTU1NGM0MzE1MTU2MTY1MTNjZGVhYmU3NS4uMTFjMTRmNTBiYzNhYTQ0YmJmYTY4OTQ0 Zjg0ZWE3YjE0YWM1YzQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCT2JqZWN0U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQk9iamVjdFN0b3JlLmNwcApAQCAtMzcxLDcgKzM3MSw3IEBAIEV4Y2VwdGlvbk9y PFJlZjxJREJSZXF1ZXN0Pj4gSURCT2JqZWN0U3RvcmU6OmNsZWFyKEV4ZWNTdGF0ZSYgZXhlY1N0 YXRlKQogICAgIHJldHVybiBtX3RyYW5zYWN0aW9uLT5yZXF1ZXN0Q2xlYXJPYmplY3RTdG9yZShl eGVjU3RhdGUsICp0aGlzKTsKIH0KIAotRXhjZXB0aW9uT3I8UmVmPElEQkluZGV4Pj4gSURCT2Jq ZWN0U3RvcmU6OmNyZWF0ZUluZGV4KEV4ZWNTdGF0ZSYsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgSURCS2V5UGF0aCYga2V5UGF0aCwgY29uc3QgSW5kZXhQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJz KQorRXhjZXB0aW9uT3I8UmVmPElEQkluZGV4Pj4gSURCT2JqZWN0U3RvcmU6OmNyZWF0ZUluZGV4 KEV4ZWNTdGF0ZSYsIGNvbnN0IFN0cmluZyYgbmFtZSwgSURCS2V5UGF0aFZhcmlhbnQmJiBrZXlQ YXRoLCBjb25zdCBJbmRleFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAgTE9HKEluZGV4 ZWREQiwgIklEQk9iamVjdFN0b3JlOjpjcmVhdGVJbmRleCAlcyIsIG5hbWUudXRmOCgpLmRhdGEo KSk7CiAgICAgQVNTRVJUKGN1cnJlbnRUaHJlYWQoKSA9PSBtX3RyYW5zYWN0aW9uLT5kYXRhYmFz ZSgpLm9yaWdpblRocmVhZElEKCkpOwpAQCAtMzg1LDcgKzM4NSw3IEBAIEV4Y2VwdGlvbk9yPFJl ZjxJREJJbmRleD4+IElEQk9iamVjdFN0b3JlOjpjcmVhdGVJbmRleChFeGVjU3RhdGUmLCBjb25z dCBTdHJpbmcmCiAgICAgaWYgKCFtX3RyYW5zYWN0aW9uLT5pc0FjdGl2ZSgpKQogICAgICAgICBy ZXR1cm4gRXhjZXB0aW9uIHsgSURCRGF0YWJhc2VFeGNlcHRpb246OlRyYW5zYWN0aW9uSW5hY3Rp dmVFcnJvciB9OwogCi0gICAgaWYgKCFrZXlQYXRoLmlzVmFsaWQoKSkKKyAgICBpZiAoIWlzSURC S2V5UGF0aFZhbGlkKGtleVBhdGgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSURCRGF0 YWJhc2VFeGNlcHRpb246OlN5bnRheEVycm9yLCBBU0NJSUxpdGVyYWwoIkZhaWxlZCB0byBleGVj dXRlICdjcmVhdGVJbmRleCcgb24gJ0lEQk9iamVjdFN0b3JlJzogVGhlIGtleVBhdGggYXJndW1l bnQgY29udGFpbnMgYW4gaW52YWxpZCBrZXkgcGF0aC4iKSB9OwogCiAgICAgaWYgKG5hbWUuaXNO dWxsKCkpCkBAIC0zOTQsMTEgKzM5NCwxMSBAQCBFeGNlcHRpb25PcjxSZWY8SURCSW5kZXg+PiBJ REJPYmplY3RTdG9yZTo6Y3JlYXRlSW5kZXgoRXhlY1N0YXRlJiwgY29uc3QgU3RyaW5nJgogICAg IGlmIChtX2luZm8uaGFzSW5kZXgobmFtZSkpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJ REJEYXRhYmFzZUV4Y2VwdGlvbjo6Q29uc3RyYWludEVycm9yLCBBU0NJSUxpdGVyYWwoIkZhaWxl ZCB0byBleGVjdXRlICdjcmVhdGVJbmRleCcgb24gJ0lEQk9iamVjdFN0b3JlJzogQW4gaW5kZXgg d2l0aCB0aGUgc3BlY2lmaWVkIG5hbWUgYWxyZWFkeSBleGlzdHMuIikgfTsKIAotICAgIGlmIChr ZXlQYXRoLnR5cGUoKSA9PSBJREJLZXlQYXRoOjpUeXBlOjpBcnJheSAmJiBwYXJhbWV0ZXJzLm11 bHRpRW50cnkpCisgICAgaWYgKHBhcmFtZXRlcnMubXVsdGlFbnRyeSAmJiBXVEY6OmhvbGRzX2Fs dGVybmF0aXZlPFZlY3RvcjxTdHJpbmc+PihrZXlQYXRoKSkKICAgICAgICAgcmV0dXJuIEV4Y2Vw dGlvbiB7IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpJbnZhbGlkQWNjZXNzRXJyb3IsIEFTQ0lJTGl0 ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NyZWF0ZUluZGV4JyBvbiAnSURCT2JqZWN0U3RvcmUn OiBUaGUga2V5UGF0aCBhcmd1bWVudCB3YXMgYW4gYXJyYXkgYW5kIHRoZSBtdWx0aUVudHJ5IG9w dGlvbiBpcyB0cnVlLiIpIH07CiAKICAgICAvLyBJbnN0YWxsIHRoZSBuZXcgSW5kZXggaW50byB0 aGUgT2JqZWN0U3RvcmUncyBpbmZvLgotICAgIElEQkluZGV4SW5mbyBpbmZvID0gbV9pbmZvLmNy ZWF0ZU5ld0luZGV4KG5hbWUsIGtleVBhdGgsIHBhcmFtZXRlcnMudW5pcXVlLCBwYXJhbWV0ZXJz Lm11bHRpRW50cnkpOworICAgIElEQkluZGV4SW5mbyBpbmZvID0gbV9pbmZvLmNyZWF0ZU5ld0lu ZGV4KG5hbWUsIE9wdGlvbmFsPElEQktleVBhdGhWYXJpYW50PihXVEZNb3ZlKGtleVBhdGgpKSwg cGFyYW1ldGVycy51bmlxdWUsIHBhcmFtZXRlcnMubXVsdGlFbnRyeSk7CiAgICAgbV90cmFuc2Fj dGlvbi0+ZGF0YWJhc2UoKS5kaWRDcmVhdGVJbmRleEluZm8oaW5mbyk7CiAKICAgICAvLyBDcmVh dGUgdGhlIGFjdHVhbCBJREJPYmplY3RTdG9yZSBmcm9tIHRoZSB0cmFuc2FjdGlvbiwgd2hpY2gg YWxzbyBzY2hlZHVsZXMgdGhlIG9wZXJhdGlvbiBzZXJ2ZXIgc2lkZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmggYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oCmluZGV4IGEyY2M0YTQ3 NjM1NzAzMWFmMjZmYTc2OTk1NjZjMzI0MzhhM2IwZDYuLjIzNTljZWUwZWUzYTM5N2UxZWNkZGYw ODk0ZjhmYzVjZDViMWFhM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQk9iamVjdFN0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCT2JqZWN0U3RvcmUuaApAQCAtMjksNiArMjksNyBAQAogCiAjaW5jbHVkZSAiQWN0 aXZlRE9NT2JqZWN0LmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uT3IuaCIKKyNpbmNsdWRlICJJREJL ZXlQYXRoLmgiCiAjaW5jbHVkZSAiSURCT2JqZWN0U3RvcmVJbmZvLmgiCiAjaW5jbHVkZSA8d3Rm L0hhc2hTZXQuaD4KIApAQCAtODAsNyArODEsNyBAQCBwdWJsaWM6CiAgICAgRXhjZXB0aW9uT3I8 UmVmPElEQlJlcXVlc3Q+PiBkZWxldGVGdW5jdGlvbihKU0M6OkV4ZWNTdGF0ZSYsIElEQktleVJh bmdlKik7CiAgICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+PiBkZWxldGVGdW5jdGlvbihK U0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNWYWx1ZSBrZXkpOwogICAgIEV4Y2VwdGlvbk9yPFJlZjxJ REJSZXF1ZXN0Pj4gY2xlYXIoSlNDOjpFeGVjU3RhdGUmKTsKLSAgICBFeGNlcHRpb25PcjxSZWY8 SURCSW5kZXg+PiBjcmVhdGVJbmRleChKU0M6OkV4ZWNTdGF0ZSYsIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgSURCS2V5UGF0aCYsIGNvbnN0IEluZGV4UGFyYW1ldGVycyYpOworICAgIEV4Y2Vw dGlvbk9yPFJlZjxJREJJbmRleD4+IGNyZWF0ZUluZGV4KEpTQzo6RXhlY1N0YXRlJiwgY29uc3Qg U3RyaW5nJiBuYW1lLCBJREJLZXlQYXRoVmFyaWFudCYmLCBjb25zdCBJbmRleFBhcmFtZXRlcnMm KTsKICAgICBFeGNlcHRpb25PcjxSZWY8SURCSW5kZXg+PiBpbmRleChjb25zdCBTdHJpbmcmIG5h bWUpOwogICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGRlbGV0ZUluZGV4KGNvbnN0IFN0cmluZyYgbmFt ZSk7CiAgICAgRXhjZXB0aW9uT3I8UmVmPElEQlJlcXVlc3Q+PiBjb3VudChKU0M6OkV4ZWNTdGF0 ZSYsIElEQktleVJhbmdlKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJPYmplY3RTdG9yZS5pZGwKaW5kZXggYWFmZmQ5NGNjMTFlODc2NzNiODhiNjA5Nzdm ZmZhOTUzZGJhMTY2NC4uNmNkMTQ3ZTZiNzU0ODc2N2I3ODRlZDFhNjc5NGU2MTQxNTRmMWQ0ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3Rv cmUuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0 b3JlLmlkbApAQCAtNDUsOCArNDUsNyBAQAogICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZSwgTWF5 VGhyb3dFeGNlcHRpb25dIElEQlJlcXVlc3QgY2xlYXIoKTsKICAgICBbQ2FsbFdpdGg9U2NyaXB0 U3RhdGUsIE1heVRocm93RXhjZXB0aW9uXSBJREJSZXF1ZXN0IG9wZW5DdXJzb3Iob3B0aW9uYWwg SURCS2V5UmFuZ2U/IHJhbmdlID0gbnVsbCwgb3B0aW9uYWwgRE9NU3RyaW5nIGRpcmVjdGlvbiA9 ICJuZXh0Iik7CiAgICAgW0NhbGxXaXRoPVNjcmlwdFN0YXRlLCBNYXlUaHJvd0V4Y2VwdGlvbl0g SURCUmVxdWVzdCBvcGVuQ3Vyc29yKGFueSBrZXksIG9wdGlvbmFsIERPTVN0cmluZyBkaXJlY3Rp b24gPSAibmV4dCIpOwotICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZSwgTWF5VGhyb3dFeGNlcHRp b25dIElEQkluZGV4IGNyZWF0ZUluZGV4KERPTVN0cmluZyBuYW1lLCBzZXF1ZW5jZTxET01TdHJp bmc+IGtleVBhdGgsIG9wdGlvbmFsIElEQkluZGV4UGFyYW1ldGVycyBvcHRpb25zKTsKLSAgICBb Q2FsbFdpdGg9U2NyaXB0U3RhdGUsIE1heVRocm93RXhjZXB0aW9uXSBJREJJbmRleCBjcmVhdGVJ bmRleChET01TdHJpbmcgbmFtZSwgRE9NU3RyaW5nIGtleVBhdGgsIG9wdGlvbmFsIElEQkluZGV4 UGFyYW1ldGVycyBvcHRpb25zKTsKKyAgICBbQ2FsbFdpdGg9U2NyaXB0U3RhdGUsIE1heVRocm93 RXhjZXB0aW9uXSBJREJJbmRleCBjcmVhdGVJbmRleChET01TdHJpbmcgbmFtZSwgKERPTVN0cmlu ZyBvciBzZXF1ZW5jZTxET01TdHJpbmc+KSBrZXlQYXRoLCBvcHRpb25hbCBJREJJbmRleFBhcmFt ZXRlcnMgb3B0aW9ucyk7CiAgICAgW01heVRocm93RXhjZXB0aW9uXSBJREJJbmRleCBpbmRleChE T01TdHJpbmcgbmFtZSk7CiAgICAgW01heVRocm93RXhjZXB0aW9uXSB2b2lkIGRlbGV0ZUluZGV4 KERPTVN0cmluZyBuYW1lKTsKICAgICBbQ2FsbFdpdGg9U2NyaXB0U3RhdGUsIE1heVRocm93RXhj ZXB0aW9uXSBJREJSZXF1ZXN0IGNvdW50KG9wdGlvbmFsIElEQktleVJhbmdlPyByYW5nZSA9IG51 bGwpOwo=