156706 2016-04-18 09:30:45 -0700 Remove all use of Deprecated::ScriptValue in generated bindings 2019-01-15 17:10:45 -0800 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin alecflett beidson cdumez cgarcia commit-queue esprehn+autocc ggaren jsbell kondapallykalyan sam oldest_to_newest 1184696 0 darin 2016-04-18 09:30:45 -0700 Remove all use of Deprecated::ScriptValue in generated bindings 1184698 1 276643 darin 2016-04-18 09:38:11 -0700 Created attachment 276643 Patch 1184699 2 darin 2016-04-18 09:39:49 -0700 Brady, I think you’ll like this patch even more than the last one. This removes Deprecated::ScriptValue use entirely from the JavaScript bindings generator. And it gets us really close to removing the need for ImplementationReturnType entirely. 1184705 3 beidson 2016-04-18 10:05:09 -0700 I have not opened the patch yet, but can't believe it's as small as it is. 1184708 4 276643 beidson 2016-04-18 10:12:59 -0700 Comment on attachment 276643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276643&action=review > Source/WebCore/Modules/indexeddb/IDBKeyRange.h:70 > + // FIXME: Eventually shoudl probably change all callers to call the ExecState version. shoudl 1184710 5 beidson 2016-04-18 10:13:45 -0700 mac-wk2 ews - while not done yet - suggests at least 1 test failure. 1184882 6 darin 2016-04-18 19:58:28 -0700 Committed r199704: <http://trac.webkit.org/changeset/199704> 1184894 7 ap 2016-04-18 21:01:35 -0700 This broke bindings tests: https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20WK2%20%28Tests%29/builds/5240/steps/bindings-generation-tests/logs/stdio 1184915 8 darin 2016-04-18 22:05:38 -0700 Fixed that. Committed r199706: <http://trac.webkit.org/changeset/199706> 276643 2016-04-18 09:38:11 -0700 2019-01-15 17:10:45 -0800 Patch bug-156706-20160418093828.patch text/plain 21543 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg4Nzg0YzBlZTkxYzlh YjdkM2VkNjUzNThmMWZlMmFlYjA1MmZkYi4uMDNjNzMyNjVkYTI5YmQyZjdlNWM1MGM4N2RkNWJi YmFhMGM0MzUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE2LTA0LTE4ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgYWxsIHVzZSBvZiBE ZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSBpbiBnZW5lcmF0ZWQgYmluZGluZ3MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjcwNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv SURCQ3Vyc29yLmlkbDogUmVtb3ZlZCB1bm5lZWRlZCBbSW1wbGVtZW50YXRpb25SZXR1cm5UeXBl PUpTVmFsdWVdLgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvcldpdGhWYWx1 ZS5pZGw6IERpdHRvLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6Omxvd2VyVmFsdWUpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6OnVwcGVyVmFsdWUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6SURCS2V5UmFuZ2U6Om9ubHkpOiBDaGFuZ2VkIHRvIHRha2UgRXhl Y1N0YXRlIHNpbmNlIHRoZSBvbGQgY29kZSBqdXN0IHVzZWQKKyAgICAgICAgdGhlIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQgdG8gZ2V0IGJhY2sgdG8gdGhlIChwb3RlbnRpYWxseSB3cm9uZykgRXhl Y1N0YXRlLiBBbHNvIGtlcHQKKyAgICAgICAgb25lIG92ZXJsb2FkIHRoYXQgdGFrZXMgU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCBiZWNhdXNlIEkgY291bGQgbm90IGNoYW5nZSBhbGwgY2FsbGVycy4K KyAgICAgICAgKFdlYkNvcmU6OklEQktleVJhbmdlOjpsb3dlckJvdW5kKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpJREJLZXlSYW5nZTo6dXBwZXJCb3VuZCk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6SURCS2V5UmFuZ2U6OmJvdW5kKTogRGl0dG8uCisKKyAgICAgICAgKiBNb2R1bGVz L2luZGV4ZWRkYi9JREJLZXlSYW5nZS5oOiBVcGRhdGVkIGZvciBhYm92ZS4KKworICAgICAgICAq IE1vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlLmlkbDogVXNlIFtJbXBsZW1lbnRhdGlvblJl dHVyblR5cGU9SURCS2V5XS4KKyAgICAgICAgVXNlIFNjcmlwdFN0YXRlIGluc3RlYWQgb2YgU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC4KKworICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbVNvdXJjZS5oOiBUYWtlIEpTVmFsdWUgaW5zdGVhZCBvZiBEZXByZWNhdGVkOjpTY3Jp cHRWYWx1ZQorICAgICAgICBmb3IgdGhlIGlnbm9yZWQgYXJndW1lbnQgdG8gdGhlIGNhbmNlbCBm dW5jdGlvbi4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6IFJlbmFtZWQgaWRiS2V5VG9KU1ZhbHVlIHRvIHRo aXMsIHRoZSB0cmFkaXRpb25hbCBuYW1lIHVzZWQgaW4gdGhlCisgICAgICAgIGJpbmRpbmdzIGdl bmVyYXRvciBmb3IgYWxsIHRoZXNlIGZ1bmN0aW9ucy4gQWxzbyBjaGFuZ2VkIHRvIHRha2UgcmVm ZXJlbmNlcy4KKyAgICAgICAgKFdlYkNvcmU6OmluamVjdElEQktleUludG9TY3JpcHRWYWx1ZSk6 IFVwZGF0ZWQgdG8gY2FsbCB3aXRoIHRoZSBuZXcgbmFtZSBhbmQgdHlwZXMuCisgICAgICAgIChX ZWJDb3JlOjppZGJLZXlEYXRhVG9TY3JpcHRWYWx1ZSk6IERpdHRvLgorCisgICAgICAgICogYmlu ZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5oOiBBZGRlZCBkZWNsYXJhdGlvbiBvZiB0b0pT IGZvciBJREJLZXkuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JK Uy5wbTogVXNlIEpTQzo6SlNWYWx1ZSBpbnN0ZWFkIG9mIERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVl CisgICAgICAgIGZvciB0aGUgImFueSIgdHlwZS4KKyAgICAgICAgKEpTVmFsdWVUb05hdGl2ZSk6 IEp1c3QgcmV0dXJuIHRoZSB2YWx1ZSB3aXRoIG5vIHRyYW5zZm9ybWF0aW9uIHdoZW4gdHlwZSBp cyAiYW55Ii4KKyAgICAgICAgKE5hdGl2ZVRvSlNWYWx1ZSk6IENoYW5nZWQgZGVmYXVsdCBiZWhh dmlvciBmb3IgImFueSIgdG8ganVzdCBwYXNzIHRoZSB2YWx1ZSBhcyBpcyB3aXRoCisgICAgICAg IG5vIHRyYW5zZm9tcmF0aW9uLiBSZW1vdmVkIHVudXNlZCBJbXBsZW1lbnRhdGlvblJldHVyblR5 cGUgY2FzZSBmb3IgaW5zaWRlIERvY3VtZW50LgorICAgICAgICBSZW1vdmVkIEpTVmFsdWUgY2Fz ZSBzaW5jZSBpdCdzIHRoZSBkZWZhdWx0IG5vdy4gQWRkZWQgSURCS2V5IGNhc2UgdGhhdCBtYXRj aGVzIHRoZQorICAgICAgICBJREJLZXlQYXRoIGNhc2UgKHN0aWxsIHdvbmRlcmluZyBpZiB3ZSBj YW4gZG8gdGhvc2Ugd2l0aG91dCBhbiBhdHRyaWJ1dGUpLiBSZW1vdmVkIGJvZ3VzCisgICAgICAg IHNlY29uZCBjaGVjayBmb3IgdHlwZSAiYW55Ii4KKwogMjAxNi0wNC0xNSAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXVtFTUVdIFByb3RlY3RlZCBjb250 ZW50IG92ZXIgSExTIGlzIG5vdCBub3RpZmllZCB3aGVuIGEgSERDUCB2aW9sYXRpb24gb2NjdXJz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29y LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5pZGwKaW5k ZXggN2JiM2M3NDEwNDg0NmRiNjdhNzljZTkyMTk1ODhhZThlYTliNzM5OC4uMWYwOWQxNjcwZDEw ZmVmOGYzNGY3NTMyNDhlNzdiZDNlNDNiNzdkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaWRsCkBAIC0zMyw4ICszMyw4IEBACiBdIGludGVyZmFj ZSBJREJDdXJzb3IgewogICAgIFtDdXN0b21HZXR0ZXJdIHJlYWRvbmx5IGF0dHJpYnV0ZSBhbnkg c291cmNlOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgZGlyZWN0aW9uOwotICAg IFtJbXBsZW1lbnRhdGlvblJldHVyblR5cGU9SlNWYWx1ZV0gcmVhZG9ubHkgYXR0cmlidXRlIGFu eSBrZXk7Ci0gICAgW0ltcGxlbWVudGF0aW9uUmV0dXJuVHlwZT1KU1ZhbHVlXSByZWFkb25seSBh dHRyaWJ1dGUgYW55IHByaW1hcnlLZXk7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIGFueSBrZXk7 CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIGFueSBwcmltYXJ5S2V5OwogCiAgICAgW0NhbGxXaXRo PVNjcmlwdFN0YXRlLCBSYWlzZXNFeGNlcHRpb25XaXRoTWVzc2FnZV0gSURCUmVxdWVzdCB1cGRh dGUoYW55IHZhbHVlKTsKICAgICBbUmFpc2VzRXhjZXB0aW9uV2l0aE1lc3NhZ2VdIHZvaWQgYWR2 YW5jZShbRW5mb3JjZVJhbmdlXSB1bnNpZ25lZCBsb25nIGNvdW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvcldpdGhWYWx1ZS5pZGwgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3JXaXRoVmFsdWUuaWRsCmlu ZGV4IDA3MjE5ODJmMGM4ZWMyOWRiNWIzZTZkNTYxYmU0ZTc0ZjYxY2U1ZjAuLjg1MmUxNDc4N2Fk ZmJmNjdjMzcyOTkwNDMxZDdjNDQ0ZTU5MzkzNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvcldpdGhWYWx1ZS5pZGwKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yV2l0aFZhbHVlLmlkbApAQCAtMzAsNSAr MzAsNSBAQAogICAgIFNraXBWVGFibGVWYWxpZGF0aW9uLAogICAgIEpTQ3VzdG9tTWFya0Z1bmN0 aW9uLAogXSBpbnRlcmZhY2UgSURCQ3Vyc29yV2l0aFZhbHVlIDogSURCQ3Vyc29yIHsKLSAgICBb SW1wbGVtZW50YXRpb25SZXR1cm5UeXBlPUpTVmFsdWVdIHJlYWRvbmx5IGF0dHJpYnV0ZSBhbnkg dmFsdWU7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIGFueSB2YWx1ZTsKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZS5jcHAKaW5kZXggMjg3MDIy MmE5YmM5ODQzZjU4OGJkYTQ2MzAzZTk1YjBhNDQ5MGRkMi4uOWQzODkxYmQ0YmY3NWI5NTlhNWQ2 YmZlMDMxMjI2ZDcwZTA3MDlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCS2V5UmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQktleVJhbmdlLmNwcApAQCAtNjEsMTYgKzYxLDYgQEAgSURCS2V5UmFuZ2U6On5J REJLZXlSYW5nZSgpCiB7CiB9CiAKLUpTVmFsdWUgSURCS2V5UmFuZ2U6Omxvd2VyVmFsdWUoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkgY29uc3QKLXsKLSAgICByZXR1cm4gaWRiS2V5 RGF0YVRvU2NyaXB0VmFsdWUoY29udGV4dCwgSURCS2V5RGF0YShtX2xvd2VyLmdldCgpKSk7Ci19 Ci0KLUpTVmFsdWUgSURCS2V5UmFuZ2U6OnVwcGVyVmFsdWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgY29udGV4dCkgY29uc3QKLXsKLSAgICByZXR1cm4gaWRiS2V5RGF0YVRvU2NyaXB0VmFsdWUo Y29udGV4dCwgSURCS2V5RGF0YShtX3VwcGVyLmdldCgpKSk7Ci19Ci0KIFJlZlB0cjxJREJLZXlS YW5nZT4gSURCS2V5UmFuZ2U6Om9ubHkoUmVmUHRyPElEQktleT4mJiBrZXksIEV4Y2VwdGlvbkNv ZGUmIGVjKQogewogICAgIGlmICgha2V5IHx8ICFrZXktPmlzVmFsaWQoKSkgewpAQCAtODEsMjAg KzcxLDE5IEBAIFJlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6Om9ubHkoUmVmUHRyPElE QktleT4mJiBrZXksIEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIHJldHVybiBjcmVhdGUoV1RGTW92 ZShrZXkpKTsKIH0KIAotUmVmUHRyPElEQktleVJhbmdlPiBJREJLZXlSYW5nZTo6b25seShTY3Jp cHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBKU1ZhbHVlIGtleVZhbHVlLCBFeGNlcHRpb25D b2RlJiBlYykKK1JlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6Om9ubHkoRXhlY1N0YXRl JiBzdGF0ZSwgSlNWYWx1ZSBrZXlWYWx1ZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgYXV0 byBrZXkgPSBzY3JpcHRWYWx1ZVRvSURCS2V5KGNvbnRleHQsIGtleVZhbHVlKTsKLSAgICBpZiAo IWtleSB8fCAha2V5LT5pc1ZhbGlkKCkpIHsKLSAgICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2Vw dGlvbjo6RGF0YUVycm9yOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9CisgICAgcmV0 dXJuIG9ubHkoc2NyaXB0VmFsdWVUb0lEQktleShzdGF0ZSwga2V5VmFsdWUpLCBlYyk7Cit9CiAK LSAgICByZXR1cm4gY3JlYXRlKFdURk1vdmUoa2V5KSk7CitSZWZQdHI8SURCS2V5UmFuZ2U+IElE QktleVJhbmdlOjpvbmx5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIEpTVmFsdWUg a2V5VmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQoreworICAgIHJldHVybiBvbmx5KHNjcmlwdFZh bHVlVG9JREJLZXkoY29udGV4dCwga2V5VmFsdWUpLCBlYyk7CiB9CiAKLVJlZlB0cjxJREJLZXlS YW5nZT4gSURCS2V5UmFuZ2U6Omxvd2VyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29u dGV4dCwgSlNWYWx1ZSBib3VuZFZhbHVlLCBib29sIG9wZW4sIEV4Y2VwdGlvbkNvZGUmIGVjKQor UmVmUHRyPElEQktleVJhbmdlPiBJREJLZXlSYW5nZTo6bG93ZXJCb3VuZChFeGVjU3RhdGUmIHN0 YXRlLCBKU1ZhbHVlIGJvdW5kVmFsdWUsIGJvb2wgb3BlbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7 Ci0gICAgYXV0byBib3VuZCA9IHNjcmlwdFZhbHVlVG9JREJLZXkoY29udGV4dCwgYm91bmRWYWx1 ZSk7CisgICAgYXV0byBib3VuZCA9IHNjcmlwdFZhbHVlVG9JREJLZXkoc3RhdGUsIGJvdW5kVmFs dWUpOwogICAgIGlmICghYm91bmQgfHwgIWJvdW5kLT5pc1ZhbGlkKCkpIHsKICAgICAgICAgZWMg PSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6RGF0YUVycm9yOwogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKQEAgLTEwMyw5ICs5Miw5IEBAIFJlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6Omxv d2VyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgSlNWCiAgICAgcmV0dXJu IGNyZWF0ZShXVEZNb3ZlKGJvdW5kKSwgbnVsbHB0ciwgb3BlbiwgdHJ1ZSk7CiB9CiAKLVJlZlB0 cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6OnVwcGVyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCwgSlNWYWx1ZSBib3VuZFZhbHVlLCBib29sIG9wZW4sIEV4Y2VwdGlvbkNv ZGUmIGVjKQorUmVmUHRyPElEQktleVJhbmdlPiBJREJLZXlSYW5nZTo6dXBwZXJCb3VuZChFeGVj U3RhdGUmIHN0YXRlLCBKU1ZhbHVlIGJvdW5kVmFsdWUsIGJvb2wgb3BlbiwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7Ci0gICAgYXV0byBib3VuZCA9IHNjcmlwdFZhbHVlVG9JREJLZXkoY29udGV4dCwg Ym91bmRWYWx1ZSk7CisgICAgYXV0byBib3VuZCA9IHNjcmlwdFZhbHVlVG9JREJLZXkoc3RhdGUs IGJvdW5kVmFsdWUpOwogICAgIGlmICghYm91bmQgfHwgIWJvdW5kLT5pc1ZhbGlkKCkpIHsKICAg ICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6RGF0YUVycm9yOwogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKQEAgLTExNCwxMCArMTAzLDEwIEBAIFJlZlB0cjxJREJLZXlSYW5nZT4gSURC S2V5UmFuZ2U6OnVwcGVyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgSlNW CiAgICAgcmV0dXJuIGNyZWF0ZShudWxscHRyLCBXVEZNb3ZlKGJvdW5kKSwgdHJ1ZSwgb3Blbik7 CiB9CiAKLVJlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6OmJvdW5kKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmIGNvbnRleHQsIEpTVmFsdWUgbG93ZXJWYWx1ZSwgSlNWYWx1ZSB1cHBlclZh bHVlLCBib29sIGxvd2VyT3BlbiwgYm9vbCB1cHBlck9wZW4sIEV4Y2VwdGlvbkNvZGUmIGVjKQor UmVmUHRyPElEQktleVJhbmdlPiBJREJLZXlSYW5nZTo6Ym91bmQoRXhlY1N0YXRlJiBzdGF0ZSwg SlNWYWx1ZSBsb3dlclZhbHVlLCBKU1ZhbHVlIHVwcGVyVmFsdWUsIGJvb2wgbG93ZXJPcGVuLCBi b29sIHVwcGVyT3BlbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgYXV0byBsb3dlciA9IHNj cmlwdFZhbHVlVG9JREJLZXkoY29udGV4dCwgbG93ZXJWYWx1ZSk7Ci0gICAgYXV0byB1cHBlciA9 IHNjcmlwdFZhbHVlVG9JREJLZXkoY29udGV4dCwgdXBwZXJWYWx1ZSk7CisgICAgYXV0byBsb3dl ciA9IHNjcmlwdFZhbHVlVG9JREJLZXkoc3RhdGUsIGxvd2VyVmFsdWUpOworICAgIGF1dG8gdXBw ZXIgPSBzY3JpcHRWYWx1ZVRvSURCS2V5KHN0YXRlLCB1cHBlclZhbHVlKTsKIAogICAgIGlmICgh bG93ZXIgfHwgIWxvd2VyLT5pc1ZhbGlkKCkgfHwgIXVwcGVyIHx8ICF1cHBlci0+aXNWYWxpZCgp KSB7CiAgICAgICAgIGVjID0gSURCRGF0YWJhc2VFeGNlcHRpb246OkRhdGFFcnJvcjsKQEAgLTE0 MCwyNCArMTI5LDI0IEBAIGJvb2wgSURCS2V5UmFuZ2U6OmlzT25seUtleSgpIGNvbnN0CiAgICAg cmV0dXJuIG1fbG93ZXIgJiYgbV91cHBlciAmJiAhbV9pc0xvd2VyT3BlbiAmJiAhbV9pc1VwcGVy T3BlbiAmJiBtX2xvd2VyLT5pc0VxdWFsKG1fdXBwZXIuZ2V0KCkpOwogfQogCi1SZWZQdHI8SURC S2V5UmFuZ2U+IElEQktleVJhbmdlOjpsb3dlckJvdW5kKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQm IGNvbnRleHQsIEpTVmFsdWUgYm91bmQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorUmVmUHRyPElEQktl eVJhbmdlPiBJREJLZXlSYW5nZTo6bG93ZXJCb3VuZChFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVl IGJvdW5kLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICByZXR1cm4gbG93ZXJCb3VuZChjb250 ZXh0LCBib3VuZCwgZmFsc2UsIGVjKTsKKyAgICByZXR1cm4gbG93ZXJCb3VuZChzdGF0ZSwgYm91 bmQsIGZhbHNlLCBlYyk7CiB9CiAKLVJlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6OnVw cGVyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgSlNWYWx1ZSBib3VuZCwg RXhjZXB0aW9uQ29kZSYgZWMpCitSZWZQdHI8SURCS2V5UmFuZ2U+IElEQktleVJhbmdlOjp1cHBl ckJvdW5kKEV4ZWNTdGF0ZSYgc3RhdGUsIEpTVmFsdWUgYm91bmQsIEV4Y2VwdGlvbkNvZGUmIGVj KQogewotICAgIHJldHVybiB1cHBlckJvdW5kKGNvbnRleHQsIGJvdW5kLCBmYWxzZSwgZWMpOwor ICAgIHJldHVybiB1cHBlckJvdW5kKHN0YXRlLCBib3VuZCwgZmFsc2UsIGVjKTsKIH0KIAotUmVm UHRyPElEQktleVJhbmdlPiBJREJLZXlSYW5nZTo6Ym91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgY29udGV4dCwgSlNWYWx1ZSBsb3dlciwgSlNWYWx1ZSB1cHBlciwgRXhjZXB0aW9uQ29kZSYg ZWMpCitSZWZQdHI8SURCS2V5UmFuZ2U+IElEQktleVJhbmdlOjpib3VuZChFeGVjU3RhdGUmIHN0 YXRlLCBKU1ZhbHVlIGxvd2VyLCBKU1ZhbHVlIHVwcGVyLCBFeGNlcHRpb25Db2RlJiBlYykKIHsK LSAgICByZXR1cm4gYm91bmQoY29udGV4dCwgbG93ZXIsIHVwcGVyLCBmYWxzZSwgZmFsc2UsIGVj KTsKKyAgICByZXR1cm4gYm91bmQoc3RhdGUsIGxvd2VyLCB1cHBlciwgZmFsc2UsIGZhbHNlLCBl Yyk7CiB9CiAKLVJlZlB0cjxJREJLZXlSYW5nZT4gSURCS2V5UmFuZ2U6OmJvdW5kKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIEpTVmFsdWUgbG93ZXIsIEpTVmFsdWUgdXBwZXIsIGJv b2wgbG93ZXJPcGVuLCBFeGNlcHRpb25Db2RlJiBlYykKK1JlZlB0cjxJREJLZXlSYW5nZT4gSURC S2V5UmFuZ2U6OmJvdW5kKEV4ZWNTdGF0ZSYgc3RhdGUsIEpTVmFsdWUgbG93ZXIsIEpTVmFsdWUg dXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICByZXR1cm4g Ym91bmQoY29udGV4dCwgbG93ZXIsIHVwcGVyLCBsb3dlck9wZW4sIGZhbHNlLCBlYyk7CisgICAg cmV0dXJuIGJvdW5kKHN0YXRlLCBsb3dlciwgdXBwZXIsIGxvd2VyT3BlbiwgZmFsc2UsIGVjKTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQktleVJhbmdlLmgKaW5kZXggZjFhYzdiYjg1NTAwNDkzOGI0MTg2MDhmMmNh NjQxZWYzYzU0YzM0Ny4uMDIyNTBkYzU3MDU2MDQ3ZGRhNDYxNGJmZGUyYWNjNzg5OTZiYWNmZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZS5oCkBA IC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgSlND IHsKK2NsYXNzIEV4ZWNTdGF0ZTsKIGNsYXNzIEpTVmFsdWU7CiB9CiAKQEAgLTUwLDI0ICs1MSwy NCBAQCBwdWJsaWM6CiAKICAgICBJREJLZXkqIGxvd2VyKCkgY29uc3QgeyByZXR1cm4gbV9sb3dl ci5nZXQoKTsgfQogICAgIElEQktleSogdXBwZXIoKSBjb25zdCB7IHJldHVybiBtX3VwcGVyLmdl dCgpOyB9Ci0KLSAgICBKU0M6OkpTVmFsdWUgbG93ZXJWYWx1ZShTY3JpcHRFeGVjdXRpb25Db250 ZXh0JikgY29uc3Q7Ci0gICAgSlNDOjpKU1ZhbHVlIHVwcGVyVmFsdWUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCYpIGNvbnN0OwogICAgIGJvb2wgbG93ZXJPcGVuKCkgY29uc3QgeyByZXR1cm4gbV9p c0xvd2VyT3BlbjsgfQogICAgIGJvb2wgdXBwZXJPcGVuKCkgY29uc3QgeyByZXR1cm4gbV9pc1Vw cGVyT3BlbjsgfQogCiAgICAgc3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gb25seShSZWZQdHI8 SURCS2V5PiYmIHZhbHVlLCBFeGNlcHRpb25Db2RlJik7Ci0gICAgc3RhdGljIFJlZlB0cjxJREJL ZXlSYW5nZT4gb25seShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgSlNDOjpKU1ZhbHVlIGtleSwg RXhjZXB0aW9uQ29kZSYpOworICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IG9ubHkoSlND OjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFsdWUga2V5LCBFeGNlcHRpb25Db2RlJik7CiAKLSAgICBz dGF0aWMgUmVmUHRyPElEQktleVJhbmdlPiBsb3dlckJvdW5kKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmLCBKU0M6OkpTVmFsdWUgYm91bmQsIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBzdGF0aWMgUmVm UHRyPElEQktleVJhbmdlPiBsb3dlckJvdW5kKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBKU0M6 OkpTVmFsdWUgYm91bmQsIGJvb2wgb3BlbiwgRXhjZXB0aW9uQ29kZSYpOworICAgIHN0YXRpYyBS ZWZQdHI8SURCS2V5UmFuZ2U+IGxvd2VyQm91bmQoSlNDOjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFs dWUgYm91bmQsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICBzdGF0aWMgUmVmUHRyPElEQktleVJhbmdl PiBsb3dlckJvdW5kKEpTQzo6RXhlY1N0YXRlJiwgSlNDOjpKU1ZhbHVlIGJvdW5kLCBib29sIG9w ZW4sIEV4Y2VwdGlvbkNvZGUmKTsKIAotICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IHVw cGVyQm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIEpTQzo6SlNWYWx1ZSBib3VuZCwgRXhj ZXB0aW9uQ29kZSYpOwotICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IHVwcGVyQm91bmQo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIEpTQzo6SlNWYWx1ZSBib3VuZCwgYm9vbCBvcGVuLCBF eGNlcHRpb25Db2RlJik7CisgICAgc3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gdXBwZXJCb3Vu ZChKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNWYWx1ZSBib3VuZCwgRXhjZXB0aW9uQ29kZSYpOwor ICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IHVwcGVyQm91bmQoSlNDOjpFeGVjU3RhdGUm LCBKU0M6OkpTVmFsdWUgYm91bmQsIGJvb2wgb3BlbiwgRXhjZXB0aW9uQ29kZSYpOwogCi0gICAg c3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gYm91bmQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYs IEpTQzo6SlNWYWx1ZSBsb3dlciwgSlNDOjpKU1ZhbHVlIHVwcGVyLCBFeGNlcHRpb25Db2RlJik7 Ci0gICAgc3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gYm91bmQoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYsIEpTQzo6SlNWYWx1ZSBsb3dlciwgSlNDOjpKU1ZhbHVlIHVwcGVyLCBib29sIGxvd2Vy T3BlbiwgRXhjZXB0aW9uQ29kZSYpOwotICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IGJv dW5kKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBKU0M6OkpTVmFsdWUgbG93ZXIsIEpTQzo6SlNW YWx1ZSB1cHBlciwgYm9vbCBsb3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuLCBFeGNlcHRpb25Db2Rl Jik7CisgICAgc3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gYm91bmQoSlNDOjpFeGVjU3RhdGUm LCBKU0M6OkpTVmFsdWUgbG93ZXIsIEpTQzo6SlNWYWx1ZSB1cHBlciwgRXhjZXB0aW9uQ29kZSYp OworICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+IGJvdW5kKEpTQzo6RXhlY1N0YXRlJiwg SlNDOjpKU1ZhbHVlIGxvd2VyLCBKU0M6OkpTVmFsdWUgdXBwZXIsIGJvb2wgbG93ZXJPcGVuLCBF eGNlcHRpb25Db2RlJik7CisgICAgc3RhdGljIFJlZlB0cjxJREJLZXlSYW5nZT4gYm91bmQoSlND OjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFsdWUgbG93ZXIsIEpTQzo6SlNWYWx1ZSB1cHBlciwgYm9v bCBsb3dlck9wZW4sIGJvb2wgdXBwZXJPcGVuLCBFeGNlcHRpb25Db2RlJik7CisKKyAgICAvLyBG SVhNRTogRXZlbnR1YWxseSBzaG91ZGwgcHJvYmFibHkgY2hhbmdlIGFsbCBjYWxsZXJzIHRvIGNh bGwgdGhlIEV4ZWNTdGF0ZSB2ZXJzaW9uLgorICAgIHN0YXRpYyBSZWZQdHI8SURCS2V5UmFuZ2U+ IG9ubHkoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIEpTQzo6SlNWYWx1ZSBrZXksIEV4Y2VwdGlv bkNvZGUmKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNPbmx5S2V5KCkgY29uc3Q7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdl LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQktleVJhbmdlLmlkbApp bmRleCAxMDQyMjBkNzZmNjRiN2Y2OWI1ZTU3ZWRhYTI2ZTg4YWQwN2JkY2JhLi4xOGUyNTU5Y2M1 NGI5NTJhYzc2OTdkMzFhNTNiYWMxMWNlODYxZjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJLZXlSYW5nZS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCS2V5UmFuZ2UuaWRsCkBAIC0yOCwxNCArMjgsMTMgQEAKICAg ICBJbXBsZW1lbnRhdGlvbkxhY2tzVlRhYmxlLAogICAgIEVuYWJsZWRBdFJ1bnRpbWU9SW5kZXhl ZERCLAogXSBpbnRlcmZhY2UgSURCS2V5UmFuZ2UgewotICAgIFtJbXBsZW1lbnRlZEFzPWxvd2Vy VmFsdWUsIENhbGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIEltcGxlbWVudGF0aW9uUmV0 dXJuVHlwZT1KU1ZhbHVlXSByZWFkb25seSBhdHRyaWJ1dGUgYW55IGxvd2VyOwotICAgIFtJbXBs ZW1lbnRlZEFzPXVwcGVyVmFsdWUsIENhbGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIElt cGxlbWVudGF0aW9uUmV0dXJuVHlwZT1KU1ZhbHVlXSByZWFkb25seSBhdHRyaWJ1dGUgYW55IHVw cGVyOworICAgIFtJbXBsZW1lbnRhdGlvblJldHVyblR5cGU9SURCS2V5XSByZWFkb25seSBhdHRy aWJ1dGUgYW55IGxvd2VyOworICAgIFtJbXBsZW1lbnRhdGlvblJldHVyblR5cGU9SURCS2V5XSBy ZWFkb25seSBhdHRyaWJ1dGUgYW55IHVwcGVyOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29s ZWFuIGxvd2VyT3BlbjsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiB1cHBlck9wZW47 CiAKLSAgICBbQ2FsbFdpdGg9U2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgUmFpc2VzRXhjZXB0aW9u XSBzdGF0aWMgSURCS2V5UmFuZ2Ugb25seShhbnkgdmFsdWUpOwotICAgIFtDYWxsV2l0aD1TY3Jp cHRFeGVjdXRpb25Db250ZXh0LCBSYWlzZXNFeGNlcHRpb25dIHN0YXRpYyBJREJLZXlSYW5nZSBs b3dlckJvdW5kKGFueSBsb3dlciwgb3B0aW9uYWwgYm9vbGVhbiBvcGVuKTsKLSAgICBbQ2FsbFdp dGg9U2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgUmFpc2VzRXhjZXB0aW9uXSBzdGF0aWMgSURCS2V5 UmFuZ2UgdXBwZXJCb3VuZChhbnkgdXBwZXIsIG9wdGlvbmFsIGJvb2xlYW4gb3Blbik7Ci0gICAg W0NhbGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIFJhaXNlc0V4Y2VwdGlvbl0gc3RhdGlj IElEQktleVJhbmdlIGJvdW5kKGFueSBsb3dlciwgYW55IHVwcGVyLCBvcHRpb25hbCBib29sZWFu IGxvd2VyT3Blbiwgb3B0aW9uYWwgYm9vbGVhbiB1cHBlck9wZW4pOworICAgIFtDYWxsV2l0aD1T Y3JpcHRTdGF0ZSwgUmFpc2VzRXhjZXB0aW9uXSBzdGF0aWMgSURCS2V5UmFuZ2Ugb25seShhbnkg dmFsdWUpOworICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZSwgUmFpc2VzRXhjZXB0aW9uXSBzdGF0 aWMgSURCS2V5UmFuZ2UgbG93ZXJCb3VuZChhbnkgbG93ZXIsIG9wdGlvbmFsIGJvb2xlYW4gb3Bl bik7CisgICAgW0NhbGxXaXRoPVNjcmlwdFN0YXRlLCBSYWlzZXNFeGNlcHRpb25dIHN0YXRpYyBJ REJLZXlSYW5nZSB1cHBlckJvdW5kKGFueSB1cHBlciwgb3B0aW9uYWwgYm9vbGVhbiBvcGVuKTsK KyAgICBbQ2FsbFdpdGg9U2NyaXB0U3RhdGUsIFJhaXNlc0V4Y2VwdGlvbl0gc3RhdGljIElEQktl eVJhbmdlIGJvdW5kKGFueSBsb3dlciwgYW55IHVwcGVyLCBvcHRpb25hbCBib29sZWFuIGxvd2Vy T3Blbiwgb3B0aW9uYWwgYm9vbGVhbiB1cHBlck9wZW4pOwogfTsKLQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtU291cmNlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1Tb3VyY2UuaAppbmRleCA1 OTI5NDk0MzNhZDQyZGM0Y2EzMDBlZWMwNzBmNzEzN2UxNzdiNTg4Li4wZmQxNmYzZTYxZmEwYjFj ODgwZTcyYmFkMjkyNTdjMGQ1ZGI1OTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1Tb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1Tb3VyY2UuaApAQCAtMzQsMTMgKzM0LDggQEAK IAogI2luY2x1ZGUgIkpTRE9NUHJvbWlzZS5oIgogI2luY2x1ZGUgIlJlYWRhYmxlU3RyZWFtQ29u dHJvbGxlci5oIgotI2luY2x1ZGUgPHJ1bnRpbWUvQXJyYXlCdWZmZXIuaD4KICNpbmNsdWRlIDx3 dGYvT3B0aW9uYWwuaD4KIAotbmFtZXNwYWNlIERlcHJlY2F0ZWQgewotY2xhc3MgU2NyaXB0VmFs dWU7Ci19Ci0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdHlwZWRlZiBpbnQgRXhjZXB0aW9uQ29k ZTsKQEAgLTUyLDcgKzQ3LDcgQEAgcHVibGljOgogICAgIHR5cGVkZWYgRE9NUHJvbWlzZTxzdGQ6 Om51bGxwdHJfdCwgRXhjZXB0aW9uQ29kZT4gUHJvbWlzZTsKIAogICAgIHZvaWQgc3RhcnQoUmVh ZGFibGVTdHJlYW1Db250cm9sbGVyJiYsIFByb21pc2UmJik7Ci0gICAgdm9pZCBjYW5jZWwoY29u c3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmKTsKKyAgICB2b2lkIGNhbmNlbChKU0M6OkpTVmFs dWUpOwogCiAgICAgYm9vbCBpc1N0YXJ0aW5nKCkgY29uc3QgeyByZXR1cm4gISFtX3N0YXJ0UHJv bWlzZTsgfQogCkBAIC03Miw3ICs2Nyw2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICBP cHRpb25hbDxQcm9taXNlPiBtX3N0YXJ0UHJvbWlzZTsKLQogICAgIE9wdGlvbmFsPFJlYWRhYmxl U3RyZWFtQ29udHJvbGxlcj4gbV9jb250cm9sbGVyOwogfTsKIApAQCAtOTIsNyArODYsNyBAQCBp bmxpbmUgdm9pZCBSZWFkYWJsZVN0cmVhbVNvdXJjZTo6c3RhcnRGaW5pc2hlZCgpCiAgICAgc2V0 SW5hY3RpdmUoKTsKIH0KIAotaW5saW5lIHZvaWQgUmVhZGFibGVTdHJlYW1Tb3VyY2U6OmNhbmNl bChjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYpCitpbmxpbmUgdm9pZCBSZWFkYWJsZVN0 cmVhbVNvdXJjZTo6Y2FuY2VsKEpTQzo6SlNWYWx1ZSkKIHsKICAgICBjbGVhbigpOwogICAgIGRv Q2FuY2VsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5k aW5nVXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdV dGlsaXRpZXMuY3BwCmluZGV4IDJhOWUyY2E1YjVhMGE0NDBiNTZjZTcyZTQ3NDljNjY0YzhiMjc1 YjUuLmM4ZGUxYmI4ZjI0ZTcxZTY3ZGUwMDRlMjliODQ1YjMxMzAxMDYxMjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3BwCkBAIC04 MCwzMiArODAsMjkgQEAgc3RhdGljIGJvb2wgc2V0KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSYg b2JqZWN0LCBjb25zdCBTdHJpbmcmIGtleVBhdGhFbGVtZW50LAogICAgIHJldHVybiB0cnVlOwog fQogCi1zdGF0aWMgSlNWYWx1ZSBpZGJLZXlUb0pTVmFsdWUoRXhlY1N0YXRlKiBleGVjLCBKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBJREJLZXkqIGtleSkKK0pTVmFsdWUgdG9KUyhFeGVj U3RhdGUmIHN0YXRlLCBKU0dsb2JhbE9iamVjdCYgZ2xvYmFsT2JqZWN0LCBJREJLZXkqIGtleSkK IHsKLSAgICBpZiAoIWtleSB8fCAhZXhlYykgewotICAgICAgICAvLyBUaGlzIHNob3VsZCBiZSB1 bmRlZmluZWQsIG5vdCBudWxsLgorICAgIGlmICgha2V5KSB7CisgICAgICAgIC8vIFRoaXMgbXVz dCBiZSB1bmRlZmluZWQsIG5vdCBudWxsLgogICAgICAgICAvLyBTcGVjOiBodHRwOi8vZHZjcy53 My5vcmcvaGcvSW5kZXhlZERCL3Jhdy1maWxlL3RpcC9PdmVydmlldy5odG1sI2lkbC1kZWYtSURC S2V5UmFuZ2UKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAgICAgfQogCi0gICAgTG9j a2VyPEpTTG9jaz4gbG9ja2VyKGV4ZWMtPnZtKCkuYXBpTG9jaygpKTsKKyAgICBMb2NrZXI8SlNM b2NrPiBsb2NrZXIoc3RhdGUudm0oKS5hcGlMb2NrKCkpOwogCiAgICAgc3dpdGNoIChrZXktPnR5 cGUoKSkgewotICAgIGNhc2UgS2V5VHlwZTo6QXJyYXk6Ci0gICAgICAgIHsKLSAgICAgICAgICAg IGNvbnN0IFZlY3RvcjxSZWZQdHI8SURCS2V5Pj4mIGluQXJyYXkgPSBrZXktPmFycmF5KCk7Ci0g ICAgICAgICAgICBzaXplX3Qgc2l6ZSA9IGluQXJyYXkuc2l6ZSgpOwotICAgICAgICAgICAgSlNB cnJheSogb3V0QXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIDAsIGdsb2JhbE9iamVj dCwgc2l6ZSk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkg ewotICAgICAgICAgICAgICAgIElEQktleSogYXJyYXlLZXkgPSBpbkFycmF5LmF0KGkpLmdldCgp OwotICAgICAgICAgICAgICAgIG91dEFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpLCBpZGJL ZXlUb0pTVmFsdWUoZXhlYywgZ2xvYmFsT2JqZWN0LCBhcnJheUtleSkpOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWUob3V0QXJyYXkpOwotICAgICAgICB9CisgICAg Y2FzZSBLZXlUeXBlOjpBcnJheTogeworICAgICAgICBhdXRvJiBpbkFycmF5ID0ga2V5LT5hcnJh eSgpOworICAgICAgICB1bnNpZ25lZCBzaXplID0gaW5BcnJheS5zaXplKCk7CisgICAgICAgIGF1 dG8mIG91dEFycmF5ID0gKmNvbnN0cnVjdEVtcHR5QXJyYXkoJnN0YXRlLCAwLCAmZ2xvYmFsT2Jq ZWN0LCBzaXplKTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCisg ICAgICAgICAgICBvdXRBcnJheS5wdXREaXJlY3RJbmRleCgmc3RhdGUsIGksIHRvSlMoc3RhdGUs IGdsb2JhbE9iamVjdCwgaW5BcnJheS5hdChpKS5nZXQoKSkpOworICAgICAgICByZXR1cm4gJm91 dEFycmF5OworICAgIH0KICAgICBjYXNlIEtleVR5cGU6OlN0cmluZzoKLSAgICAgICAgcmV0dXJu IGpzU3RyaW5nV2l0aENhY2hlKGV4ZWMsIGtleS0+c3RyaW5nKCkpOworICAgICAgICByZXR1cm4g anNTdHJpbmdXaXRoQ2FjaGUoJnN0YXRlLCBrZXktPnN0cmluZygpKTsKICAgICBjYXNlIEtleVR5 cGU6OkRhdGU6Ci0gICAgICAgIHJldHVybiBqc0RhdGVPck51bGwoZXhlYywga2V5LT5kYXRlKCkp OworICAgICAgICByZXR1cm4ganNEYXRlT3JOdWxsKCZzdGF0ZSwga2V5LT5kYXRlKCkpOwogICAg IGNhc2UgS2V5VHlwZTo6TnVtYmVyOgogICAgICAgICByZXR1cm4ganNOdW1iZXIoa2V5LT5udW1i ZXIoKSk7CiAgICAgY2FzZSBLZXlUeXBlOjpNaW46CkBAIC0yNjEsNyArMjU4LDcgQEAgYm9vbCBp bmplY3RJREJLZXlJbnRvU2NyaXB0VmFsdWUoRXhlY1N0YXRlJiBleGVjLCBjb25zdCBJREJLZXlE YXRhJiBrZXlEYXRhLCBKU1YKICAgICBpZiAoIWtleSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgaWYgKCFzZXQoJmV4ZWMsIHBhcmVudCwga2V5UGF0aEVsZW1lbnRzLmxhc3QoKSwgaWRi S2V5VG9KU1ZhbHVlKCZleGVjLCBleGVjLmxleGljYWxHbG9iYWxPYmplY3QoKSwga2V5LmdldCgp KSkpCisgICAgaWYgKCFzZXQoJmV4ZWMsIHBhcmVudCwga2V5UGF0aEVsZW1lbnRzLmxhc3QoKSwg dG9KUyhleGVjLCAqZXhlYy5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIGtleS5nZXQoKSkpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTM2Miw3ICszNTksNyBA QCBKU0M6OkpTVmFsdWUgaWRiS2V5RGF0YVRvU2NyaXB0VmFsdWUoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgY29udGV4dCwgY29uc3QgSURCSwogICAgIGlmICghZXhlYykKICAgICAgICAgcmV0dXJu IHsgfTsKIAotICAgIHJldHVybiBpZGJLZXlUb0pTVmFsdWUoZXhlYywganNDYXN0PEpTRE9NR2xv YmFsT2JqZWN0Kj4oZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpKSwga2V5LmdldCgpKTsKKyAg ICByZXR1cm4gdG9KUygqZXhlYywgKmV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSwga2V5Lmdl dCgpKTsKIH0KIAogc3RhdGljIFZlY3RvcjxJREJLZXlEYXRhPiBjcmVhdGVLZXlQYXRoQXJyYXko RXhlY1N0YXRlJiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBjb25zdCBJREJJbmRleEluZm8mIGluZm8p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0 aWVzLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmgK aW5kZXggNzkxYTk0MmQ2ZTFiYjJiNzY2MDlkYzY3ZTg0ZGQ2ZDQzMWEwN2Q5Yi4uY2U2MzI3MGM2 Yzg3YTkxYzBmMjE1ZjVmNjUyMDBhZjJhODMwOTUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuaApAQCAtMzIsNiArMzIsNyBAQAogCiBu YW1lc3BhY2UgSlNDIHsKIGNsYXNzIEV4ZWNTdGF0ZTsKK2NsYXNzIEpTR2xvYmFsT2JqZWN0Owog Y2xhc3MgSlNWYWx1ZTsKIH0KIApAQCAtNTQsNiArNTUsNyBAQCBSZWZQdHI8SURCS2V5PiBtYXli ZUNyZWF0ZUlEQktleUZyb21TY3JpcHRWYWx1ZUFuZEtleVBhdGgoSlNDOjpFeGVjU3RhdGUmLCBj b25zdAogYm9vbCBjYW5JbmplY3RJREJLZXlJbnRvU2NyaXB0VmFsdWUoSlNDOjpFeGVjU3RhdGUm LCBjb25zdCBKU0M6OkpTVmFsdWUmLCBjb25zdCBJREJLZXlQYXRoJik7CiBib29sIGluamVjdElE QktleUludG9TY3JpcHRWYWx1ZShKU0M6OkV4ZWNTdGF0ZSYsIGNvbnN0IElEQktleURhdGEmLCBK U0M6OkpTVmFsdWUsIGNvbnN0IElEQktleVBhdGgmKTsKIAorSlNDOjpKU1ZhbHVlIHRvSlMoSlND OjpFeGVjU3RhdGUmLCBKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSURCS2V5Kik7CiBKU0M6OkpTVmFs dWUgaWRiS2V5RGF0YVRvU2NyaXB0VmFsdWUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0 IElEQktleURhdGEmKTsKIHZvaWQgZ2VuZXJhdGVJbmRleEtleUZvclZhbHVlKEpTQzo6RXhlY1N0 YXRlJiwgY29uc3QgSURCSW5kZXhJbmZvJiwgSlNDOjpKU1ZhbHVlLCBJbmRleEtleSYgb3V0S2V5 KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQppbmRleCA5NDAzOGU0MmRhOGFlYjhkY2UxZmFiYzBhYjgzMTA5OWU4YTY3ZDRmLi4x ZjFkYWI2MzlmZjhiMDYxMDZmMDg1Nzk3ZDAzYzMyZTQzMGNkZTUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQpAQCAtNDA2MSw3 ICs0MDYxLDcgQEAgbXkgJW5hdGl2ZVR5cGUgPSAoCiAgICAgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSIgPT4gIlJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IiwKICAgICAiRGF0ZSIgPT4gImRv dWJsZSIsCiAgICAgIkRpY3Rpb25hcnkiID0+ICJEaWN0aW9uYXJ5IiwKLSAgICAiYW55IiA9PiAi RGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUiLAorICAgICJhbnkiID0+ICJKU0M6OkpTVmFsdWUiLAog ICAgICJib29sZWFuIiA9PiAiYm9vbCIsCiAgICAgImRvdWJsZSIgPT4gImRvdWJsZSIsCiAgICAg ImZsb2F0IiA9PiAiZmxvYXQiLApAQCAtNDIxMyw4ICs0MjEzLDcgQEAgc3ViIEpTVmFsdWVUb05h dGl2ZQogICAgIH0KIAogICAgIGlmICgkdHlwZSBlcSAiYW55IikgewotICAgICAgICBBZGRUb0lt cGxJbmNsdWRlcygiPGJpbmRpbmdzL1NjcmlwdFZhbHVlLmg+Iik7Ci0gICAgICAgIHJldHVybiAi eyBzdGF0ZS0+dm0oKSwgJHZhbHVlIH0iOworICAgICAgICByZXR1cm4gJHZhbHVlOwogICAgIH0K IAogICAgIGlmICgkdHlwZSBlcSAiTm9kZUZpbHRlciIpIHsKQEAgLTQzNTEsMTcgKzQzNTAsMTMg QEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogCiAgICAgaWYgKCR0eXBlIGVxICJhbnkiKSB7CiAgICAg ICAgIG15ICRyZXR1cm5UeXBlID0gJHNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Iklt cGxlbWVudGF0aW9uUmV0dXJuVHlwZSJ9OwotICAgICAgICBpZiAoJGludGVyZmFjZU5hbWUgZXEg IkRvY3VtZW50IikgewotICAgICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIkpTQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJELmgiLCAkY29uZGl0aW9uYWwpOwotICAgICAgICB9IGVsc2lmIChkZWZp bmVkICRyZXR1cm5UeXBlIGFuZCAkcmV0dXJuVHlwZSBlcSAiSlNWYWx1ZSIpIHsKLSAgICAgICAg ICAgIHJldHVybiAiJHZhbHVlIjsKLSAgICAgICAgfSBlbHNpZiAoZGVmaW5lZCAkcmV0dXJuVHlw ZSBhbmQgJHJldHVyblR5cGUgZXEgIklEQktleVBhdGgiKSB7CisgICAgICAgIGlmIChkZWZpbmVk ICRyZXR1cm5UeXBlIGFuZCAoJHJldHVyblR5cGUgZXEgIklEQktleVBhdGgiIG9yICRyZXR1cm5U eXBlIGVxICJJREJLZXkiKSkgewogICAgICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIklEQkJp bmRpbmdVdGlsaXRpZXMuaCIsICRjb25kaXRpb25hbCk7CiAgICAgICAgICAgICByZXR1cm4gInRv SlMoKnN0YXRlLCAqJGdsb2JhbE9iamVjdCwgJHZhbHVlKSI7CiAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICByZXR1cm4gIigkdmFsdWUuaGFzTm9WYWx1ZSgpID8ganNOdWxsKCkgOiAkdmFs dWUuanNWYWx1ZSgpKSI7CisgICAgICAgICAgICByZXR1cm4gJHZhbHVlOwogICAgICAgICB9Ci0g ICAgfSBlbHNpZiAoJHR5cGUgZXEgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSIgb3IgJHR5cGUgZXEg ImFueSIpIHsKKyAgICB9IGVsc2lmICgkdHlwZSBlcSAiU2VyaWFsaXplZFNjcmlwdFZhbHVlIikg ewogICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgiLCAk Y29uZGl0aW9uYWwpOwogICAgICAgICByZXR1cm4gIiR2YWx1ZSA/ICR2YWx1ZS0+ZGVzZXJpYWxp emUoc3RhdGUsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCAwKSA6IGpzTnVsbCgpIjsKICAg ICB9IGVsc2lmICgkY29kZUdlbmVyYXRvci0+SXNUeXBlZEFycmF5VHlwZSgkdHlwZSkpIHsK