168039 2017-02-09 00:07:42 -0800 [EME] Implement MediaKeySession::sessionClosed() 2017-02-10 02:33:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 158841 1 zan zan calvaris jer.noble oldest_to_newest 1274777 0 zan 2017-02-09 00:07:42 -0800 SSIA. 1274781 1 301021 zan 2017-02-09 00:27:00 -0800 Created attachment 301021 Patch 1274810 2 301021 calvaris 2017-02-09 05:20:58 -0800 Comment on attachment 301021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301021&action=review > Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp:525 > + // 5. Let promise be the closed attribute of the session. > + // 6. Resolve promise. > + if (m_closedPromise) > + m_closedPromise->resolve(); These lines make me think a lot given that m_closedPromise is created when the JS closed attribute is accessed. So for this to work we would have to access closed so that the promise can be ever resolved. If the run this algorithm before accessing closed from JS we will be returning an unresolved promise that should be resolved already. I think we need to change the strategy. We need to have the promise created in advance and get it from the JS getter. Actually, please update the tests to test this situation this too. 1274827 3 301034 zan 2017-02-09 07:04:02 -0800 Created attachment 301034 Patch 1275282 4 zan 2017-02-10 02:33:33 -0800 Committed r212109: <http://trac.webkit.org/changeset/212109> 301021 2017-02-09 00:27:00 -0800 2017-02-09 07:03:56 -0800 Patch bug-168039-20170209092434.patch text/plain 14130 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExOTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRlMWFkYWIyYjAzM2E0 OTc3ZWRiNzFjMTM4ZDNmMDRkZGZlMmM4YS4uOGU2OWIxNTA3NjA1YzE2MTg4NGZkZDE5ZWM1OWE4 YzgwMzI1NDBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE3LTAyLTA5ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBJbXBsZW1l bnQgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODAzOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCB0aGUgJ3Nlc3Npb24gY2xvc2Vk JyBhbGdvcml0aG0gZm9yIE1lZGlhS2V5U2Vzc2lvbiBieQorICAgICAgICBmb2xsb3dpbmcgdGhl IHNwZWNpZmllZCBzdGVwcy4gQWZ0ZXIgdGhpcyBhbGdvcml0aG0gaXMgcnVuLCB0aGUKKyAgICAg ICAgc2Vzc2lvbiBzaG91bGQgYmUgY29uc2lkZXJlZCBjbG9zZWQsIHdoaWNoIHdlIHRyYWNrIHZp YSB0aGUgbV9jbG9zZWQKKyAgICAgICAgbWVtYmVyIHZhcmlhYmxlIG9uIHRoZSBjbGFzcy4gVGhp cyBpcyBzZXQgdG8gdHJ1ZSBiZWZvcmUgdGhlIHByb21pc2UKKyAgICAgICAgdGhhdCdzIGFjY2Vz c2libGUgdGhyb3VnaCB0aGUgJ2Nsb3NlZCcgYXR0cmlidXRlIGlzIHJlc29sdmVkLgorCisgICAg ICAgIEJlY2F1c2UgdGhlIGFsZ29yaXRobSByZXF1aXJlcyB0aGUgQ0RNIGluc3RhbmNlIHRvIHN0 b3JlIGFueSByZWNvcmQKKyAgICAgICAgb2Yga2V5IHVzYWdlIHdoZW4gdGhlIHNlc3Npb24ncyB0 eXBlIGlzICdwZXJzaXN0ZW50LXVzYWdlLXJlY29yZCcsIHRoZQorICAgICAgICBzdG9yZVJlY29y ZE9mS2V5VXNhZ2UoKSB2aXJ0dWFsIG1ldGhvZCBpcyBhZGRlZCB0byB0aGUgQ0RNSW5zdGFuY2UK KyAgICAgICAgaW50ZXJmYWNlLiBNb2NrQ0RNSW5zdGFuY2UgaW1wbGVtZW50YXRpb24gaXMgbGVm dCB1bmltcGxlbWVudGVkIGZvciBub3cuCisKKyAgICAgICAgSlNNZWRpYUtleVNlc3Npb246OmNs b3NlZCgpIGFjY2Vzc29yIG5vdyBoYXMgYSBjdXN0b20gaW1wbGVtZW50YXRpb24KKyAgICAgICAg dGhhdCBjcmVhdGVzIGEgZGVmZXJyZWQgcHJvbWlzZSBmb3IgdGhhdCBvYmplY3QgaWYgdGhlcmUn cyBub25lIHlldCwgYW5kCisgICAgICAgIHNoYXJlcyBpdCB3aXRoIHRoZSB3cmFwcGVkIGNsYXNz IHRocm91Z2ggdGhlIHJlZ2lzdGVyQ2xvc2VkUHJvbWlzZSgpCisgICAgICAgIG1ldGhvZCwgc3Rv cmluZyBhIHJlZmVyZW5jZSB0byB0aGUgcHJvbWlzZSBpbiB0aGUgbV9jbG9zZWRQcm9taXNlCisg ICAgICAgIG1lbWJlciB2YXJpYWJsZS4KKworICAgICAgICBUZXN0IGNhc2VzIGFkZGVkIHRvIG1l ZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1jbG9zZS5odG1sLgorCisg ICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1JbnN0YW5jZS5oOgorICAgICAgICAq IE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhS2V5U2Vzc2lvbjo6cmVnaXN0ZXJDbG9zZWRQcm9taXNlKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhS2V5U2Vzc2lvbjo6c2Vzc2lvbkNsb3NlZCk6CisgICAgICAgICogTW9k dWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uaDoKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9KU01lZGlhS2V5U2Vzc2lvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU01l ZGlhS2V5U2Vzc2lvbjo6Y2xvc2VkKToKKyAgICAgICAgKiB0ZXN0aW5nL01vY2tDRE1GYWN0b3J5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tDRE1JbnN0YW5jZTo6c3RvcmVSZWNvcmRPZktl eVVzYWdlKToKKyAgICAgICAgKiB0ZXN0aW5nL01vY2tDRE1GYWN0b3J5Lmg6CisKIDIwMTctMDIt MDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUHV0 IG5hbWVzIG9uIG1vcmUgVUlWaWV3cyBmb3IgZWFzZSBvZiBkZWJ1Z2dpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNSW5zdGFuY2UuaCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvQ0RNSW5zdGFuY2UuaAppbmRleCAx NTMxZDgyMGY3ZTllMmFjNGVmNzE2YjFkMTQwYjY3NjE3Njg4ZjRlLi4wMjBhZjRjYmZiMzA1NTc2 MTdkODBkZWQ2ZjUwOTZiMDZhMTE5MGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2VuY3J5cHRlZG1lZGlhL0NETUluc3RhbmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1JbnN0YW5jZS5oCkBAIC03Miw2ICs3Miw4IEBAIHB1Ymxp YzoKIAogICAgIHVzaW5nIFJlbW92ZVNlc3Npb25EYXRhQ2FsbGJhY2sgPSBGdW5jdGlvbjx2b2lk KEtleVN0YXR1c1ZlY3RvciYmLCBzdGQ6Om9wdGlvbmFsPFJlZjxTaGFyZWRCdWZmZXI+PiYmLCBT dWNjZXNzVmFsdWUpPjsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlU2Vzc2lvbkRhdGEoY29uc3Qg U3RyaW5nJiBzZXNzaW9uSWQsIExpY2Vuc2VUeXBlLCBSZW1vdmVTZXNzaW9uRGF0YUNhbGxiYWNr KSA9IDA7CisKKyAgICB2aXJ0dWFsIHZvaWQgc3RvcmVSZWNvcmRPZktleVVzYWdlKGNvbnN0IFN0 cmluZyYgc2Vzc2lvbklkKSA9IDA7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHAKaW5kZXggOGUw YjdlZmZiZmY5ZWE4M2Y3YTRmYmU1MWE2ZjJmZjUxYzM3MGE3OC4uOTNlM2MwOGYzMzE3YWVmYmNk ZjEyODg2NGQ5MTJmNTUwOTQ5MjFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmNwcApAQCAtNDY2LDYgKzQ2 NiwxMiBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6cmVtb3ZlKFJlZjxEZWZlcnJlZFByb21pc2U+ JiYgcHJvbWlzZSkKICAgICAvLyA1LiBSZXR1cm4gcHJvbWlzZS4KIH0KIAordm9pZCBNZWRpYUtl eVNlc3Npb246OnJlZ2lzdGVyQ2xvc2VkUHJvbWlzZShDbG9zZWRQcm9taXNlJiYgcHJvbWlzZSkK K3sKKyAgICBBU1NFUlQoIW1fY2xvc2VkUHJvbWlzZSk7CisgICAgbV9jbG9zZWRQcm9taXNlID0g V1RGTW92ZShwcm9taXNlKTsKK30KKwogdm9pZCBNZWRpYUtleVNlc3Npb246OmVucXVldWVNZXNz YWdlKE1lZGlhS2V5TWVzc2FnZVR5cGUgbWVzc2FnZVR5cGUsIGNvbnN0IFNoYXJlZEJ1ZmZlciYg bWVzc2FnZSkKIHsKICAgICAvLyA2LjQuMSBRdWV1ZSBhICJtZXNzYWdlIiBFdmVudApAQCAtNDkz LDcgKzQ5OSwzMCBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6dXBkYXRlRXhwaXJhdGlvbihkb3Vi bGUpCiAKIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKCkKIHsKLSAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9lbmNyeXB0ZWQtbWVk aWEvI3Nlc3Npb24tY2xvc2VkCisgICAgLy8gVzNDIEVkaXRvcidzIERyYWZ0IDA5IE5vdmVtYmVy IDIwMTYKKworICAgIC8vIDEuIExldCBzZXNzaW9uIGJlIHRoZSBhc3NvY2lhdGVkIE1lZGlhS2V5 U2Vzc2lvbiBvYmplY3QuCisgICAgLy8gMi4gSWYgc2Vzc2lvbidzIHNlc3Npb24gdHlwZSBpcyAi cGVyc2lzdGVudC11c2FnZS1yZWNvcmQiLCBleGVjdXRlIHRoZSBmb2xsb3dpbmcgc3RlcHMgaW4g cGFyYWxsZWw6CisgICAgaWYgKG1fc2Vzc2lvblR5cGUgPT0gTWVkaWFLZXlTZXNzaW9uVHlwZTo6 UGVyc2lzdGVudFVzYWdlUmVjb3JkKSB7CisgICAgICAgIC8vIDIuMS4gTGV0IGNkbSBiZSB0aGUg Q0RNIGluc3RhbmNlIHJlcHJlc2VudGVkIGJ5IHNlc3Npb24ncyBjZG0gaW5zdGFuY2UgdmFsdWUu CisgICAgICAgIC8vIDIuMi4gVXNlIGNkbSB0byBzdG9yZSBzZXNzaW9uJ3MgcmVjb3JkIG9mIGtl eSB1c2FnZSwgaWYgaXQgZXhpc3RzLgorICAgICAgICBtX2luc3RhbmNlLT5zdG9yZVJlY29yZE9m S2V5VXNhZ2UobV9zZXNzaW9uSWQpOworICAgIH0KKworICAgIC8vIDMuIFJ1biB0aGUgVXBkYXRl IEtleSBTdGF0dXNlcyBhbGdvcml0aG0gb24gdGhlIHNlc3Npb24sIHByb3ZpZGluZyBhbiBlbXB0 eSBzZXF1ZW5jZS4KKyAgICB1cGRhdGVLZXlTdGF0dXNlcyh7IH0pOworCisgICAgLy8gNC4gUnVu IHRoZSBVcGRhdGUgRXhwaXJhdGlvbiBhbGdvcml0aG0gb24gdGhlIHNlc3Npb24sIHByb3ZpZGlu ZyBOYU4uCisgICAgdXBkYXRlRXhwaXJhdGlvbihzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46 OnF1aWV0X05hTigpKTsKKworICAgIC8vIExldCdzIGNvbnNpZGVyIHRoZSBzZXNzaW9uIGNsb3Nl ZCBiZWZvcmUgYW55IHByb21pc2Ugb24gdGhlICdjbG9zZWQnIGF0dHJpYnV0ZSBpcyByZXNvbHZl ZC4KKyAgICBtX2Nsb3NlZCA9IHRydWU7CisKKyAgICAvLyA1LiBMZXQgcHJvbWlzZSBiZSB0aGUg Y2xvc2VkIGF0dHJpYnV0ZSBvZiB0aGUgc2Vzc2lvbi4KKyAgICAvLyA2LiBSZXNvbHZlIHByb21p c2UuCisgICAgaWYgKG1fY2xvc2VkUHJvbWlzZSkKKyAgICAgICAgbV9jbG9zZWRQcm9taXNlLT5y ZXNvbHZlKCk7CiB9CiAKIGJvb2wgTWVkaWFLZXlTZXNzaW9uOjpoYXNQZW5kaW5nQWN0aXZpdHko KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRp YS9NZWRpYUtleVNlc3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvTWVkaWFLZXlTZXNzaW9uLmgKaW5kZXggOGY0MGYzN2VjOGM2M2RkNjBhNTdmNjRjMWQ1Njc3 NWE3YzUzODA1My4uNjlhY2Q4ZTBmOGM2OTc5ZDgwYzg3ZTg3M2Y3ZGE1YmEwNDhlNjg1OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNl c3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlh S2V5U2Vzc2lvbi5oCkBAIC02OSw2ICs2OSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsb3NlKFJl ZjxEZWZlcnJlZFByb21pc2U+JiYpOwogICAgIHZvaWQgcmVtb3ZlKFJlZjxEZWZlcnJlZFByb21p c2U+JiYpOwogCisgICAgdXNpbmcgQ2xvc2VkUHJvbWlzZSA9IERPTVByb21pc2U8dm9pZD47Cisg ICAgdm9pZCByZWdpc3RlckNsb3NlZFByb21pc2UoQ2xvc2VkUHJvbWlzZSYmKTsKKwogcHJpdmF0 ZToKICAgICBNZWRpYUtleVNlc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIE1lZGlhS2V5 U2Vzc2lvblR5cGUsIGJvb2wgdXNlRGlzdGluY3RpdmVJZGVudGlmaWVyLCBSZWY8Q0RNPiYmLCBS ZWY8Q0RNSW5zdGFuY2U+JiYpOwogICAgIHZvaWQgZW5xdWV1ZU1lc3NhZ2UoTWVkaWFLZXlNZXNz YWdlVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJik7CkBAIC05MCw2ICs5Myw3IEBAIHByaXZhdGU6 CiAKICAgICBTdHJpbmcgbV9zZXNzaW9uSWQ7CiAgICAgZG91YmxlIG1fZXhwaXJhdGlvbjsKKyAg ICBzdGQ6Om9wdGlvbmFsPENsb3NlZFByb21pc2U+IG1fY2xvc2VkUHJvbWlzZTsKICAgICBSZWY8 TWVkaWFLZXlTdGF0dXNNYXA+IG1fa2V5U3RhdHVzZXM7CiAgICAgYm9vbCBtX2Nsb3NlZCB7IGZh bHNlIH07CiAgICAgYm9vbCBtX3VuaW5pdGlhbGl6ZWQgeyB0cnVlIH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lZGlhS2V5U2Vzc2lvbkN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lZGlhS2V5U2Vzc2lvbkN1c3RvbS5jcHAKaW5k ZXggYTM3MTUzY2MxNzgxNjk5Yjc2OTk2OWYwYWMzNTY1YmFiOTZmNTYyNS4uNDIyN2NjZDM5NWEz MWNhNDhkZWMyN2RlOTAxMGU5NmM2MWVhZTdhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNNZWRpYUtleVNlc3Npb25DdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTTWVkaWFLZXlTZXNzaW9uQ3VzdG9tLmNwcApAQCAtMzIsMTQgKzMy LDE2IEBACiAKICNpbmNsdWRlICJKU01lZGlhS2V5U2Vzc2lvbi5oIgogCi0jaW5jbHVkZSAiTm90 SW1wbGVtZW50ZWQuaCIKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1KU0M6OkpTVmFsdWUgSlNN ZWRpYUtleVNlc3Npb246OmNsb3NlZChKU0M6OkV4ZWNTdGF0ZSYpIGNvbnN0CitKU0M6OkpTVmFs dWUgSlNNZWRpYUtleVNlc3Npb246OmNsb3NlZChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUpIGNvbnN0 CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gSlNDOjpqc1VuZGVmaW5lZCgp OworICAgIGlmICghbV9jbG9zZWQpIHsKKyAgICAgICAgYXV0byBwcm9taXNlID0gY3JlYXRlRGVm ZXJyZWRQcm9taXNlKHN0YXRlLCBkb21XaW5kb3coKSk7CisgICAgICAgIG1fY2xvc2VkLnNldChz dGF0ZS52bSgpLCB0aGlzLCBwcm9taXNlLT5wcm9taXNlKCkpOworICAgICAgICB3cmFwcGVkKCku cmVnaXN0ZXJDbG9zZWRQcm9taXNlKFdURk1vdmUocHJvbWlzZSkpOworICAgIH0KKyAgICByZXR1 cm4gbV9jbG9zZWQuZ2V0KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja0NETUZhY3RvcnkuY3BwIGIvU291cmNlL1dl YkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5jcHAKaW5kZXggOWEwZDI2MGE5YTYzOTgxYTc2 NzBjNmU1NGM2ZTkyYWZlNjk4YmRhMS4uZGJmNWE0MTBmOGFjMTE3YmY3YmNmMTNhYzQyY2M5YTA5 YjJmMGVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9y eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5jcHAKQEAg LTMyOCw2ICszMjgsMTEgQEAgdm9pZCBNb2NrQ0RNSW5zdGFuY2U6OnJlbW92ZVNlc3Npb25EYXRh KGNvbnN0IFN0cmluZyYgaWQsIExpY2Vuc2VUeXBlLCBSZW1vdmVTZXMKICAgICBjYWxsYmFjayhX VEZNb3ZlKGtleVN0YXR1c1ZlY3RvciksIFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKG1lc3NhZ2UuZGF0 YSgpLCBtZXNzYWdlLmxlbmd0aCgpKSwgU3VjY2Vzc1ZhbHVlOjpTdWNjZWVkZWQpOwogfQogCit2 b2lkIE1vY2tDRE1JbnN0YW5jZTo6c3RvcmVSZWNvcmRPZktleVVzYWdlKGNvbnN0IFN0cmluZyYp Cit7CisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGltcGxlbWVudGVkIGFsb25nIHdpdGgg dGhlIHN1cHBvcnQgZm9yIHBlcnNpc3RlbnQtdXNhZ2UtcmVjb3JkIHNlc3Npb25zLgorfQorCiB9 CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFj dG9yeS5oIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5oCmluZGV4IDAx ZjFiYzM2MTJhMDdiNjkzMDkyOTA4ODgzZWM4ZmMxZDZhMjhhMGQuLjBiMTEzOWNkMmRiMmFjMjY3 Yjk2MWI5NDg2ZWQzMTg0MDEwMWVkNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvTW9ja0NETUZhY3RvcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL01vY2tDRE1G YWN0b3J5LmgKQEAgLTEzMyw2ICsxMzMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlTGlj ZW5zZShMaWNlbnNlVHlwZSwgY29uc3QgU2hhcmVkQnVmZmVyJiwgTGljZW5zZVVwZGF0ZUNhbGxi YWNrKSBmaW5hbDsKICAgICB2b2lkIGNsb3NlU2Vzc2lvbihjb25zdCBTdHJpbmcmLCBDbG9zZVNl c3Npb25DYWxsYmFjaykgZmluYWw7CiAgICAgdm9pZCByZW1vdmVTZXNzaW9uRGF0YShjb25zdCBT dHJpbmcmLCBMaWNlbnNlVHlwZSwgUmVtb3ZlU2Vzc2lvbkRhdGFDYWxsYmFjaykgZmluYWw7Cisg ICAgdm9pZCBzdG9yZVJlY29yZE9mS2V5VXNhZ2UoY29uc3QgU3RyaW5nJikgZmluYWw7CiAKICAg ICBXZWFrUHRyPE1vY2tDRE0+IG1fY2RtOwogICAgIGJvb2wgbV9kaXN0aW5jdGl2ZUlkZW50aWZp ZXJzQWxsb3dlZCB7IHRydWUgfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZTA3MGFjZTYwYTQwYTMzMWUzZDk1Nzk2NGZh MzM1NjA3YmIwMDY1Li45OTY0MzU0OGFjNGFiZjZhYTE0NmI1MTlmODQzNTQ5MDViZWRkZjM0IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTctMDItMDkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNl a0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtFTUVdIEltcGxlbWVudCBNZWRpYUtleVNlc3Npb246 OnNlc3Npb25DbG9zZWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY4MDM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRW5oYW5jZSB0aGUgbW9jay1NZWRpYUtleVNlc3Npb24tY2xvc2UuaHRtbCB0ZXN0 IGJ5IGFkZGluZyB0ZXN0IGNhc2VzCisgICAgICAgIGNvdmVyaW5nIHRoZSBkaXNwYXRjaCBvZiB0 aGUgcHJvbWlzZSB0aGF0J3MgYWNjZXNzaWJsZSB0aHJvdWdoIHRoZQorICAgICAgICAnY2xvc2Vk JyBhdHRyaWJ1dGUgYW5kIGNvdmVyaW5nIHRoZSBzZXNzaW9uIGNsb3N1cmUgc3RhdHVzLCBtYWtp bmcKKyAgICAgICAgc3VyZSB0aGF0IHZhcmlvdXMgb3BlcmF0aW9ucyBwcm9wZXJseSByZXNvbHZl IG9yIHJlamVjdCBhZnRlciB0aGUKKyAgICAgICAgc2Vzc2lvbiBvYmplY3Qgd2FzIGNsb3NlZC4K KworICAgICAgICAqIG1lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1j bG9zZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2st TWVkaWFLZXlTZXNzaW9uLWNsb3NlLmh0bWw6CisKIDIwMTctMDItMDggIFJ5YW4gSGFkZGFkICA8 cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgUmViYXNlbGluZSBlbW9qaSB0ZXN0cyBm b3IgaW9zLXNpbXVsYXRvci4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL2VuY3J5cHRl ZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1jbG9zZS1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9tZWRpYS9lbmNyeXB0ZWQtbWVkaWEvbW9jay1NZWRpYUtleVNlc3Npb24tY2xvc2UtZXhw ZWN0ZWQudHh0CmluZGV4IGE1YzQ5ODYwZjkzNzE0YjBlOWM5NDdjMTE2MWI1OWY2MzE3MTFlMTYu LjY3NDlmMWE5MTkwMTM3YTgyZWQ5NGU0YjY1OWJiNTFhZjkyZWNjYWYgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1jbG9z ZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21v Y2stTWVkaWFLZXlTZXNzaW9uLWNsb3NlLWV4cGVjdGVkLnR4dApAQCAtMzEsNiArMzEsMTYgQEAg UHJvbWlzZSByZXNvbHZlZCBPSwogUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2Uo KSkKIFByb21pc2UgcmVzb2x2ZWQgT0sKIAorQ2xvc2luZyBhIHZhbGlkIE1lZGlhS2V5U2Vzc2lv biBzaG91bGQgcmVzb2x2ZSB0aGUgImNsb3NlZCIgcHJvbWlzZS4KK1JVTihraWRzID0gSlNPTi5z dHJpbmdpZnkoeyBraWRzOiBbICJNVEl6TkRVPSIgXSB9KSkKK1JVTihtZWRpYUtleVNlc3Npb24g PSBtZWRpYUtleXMuY3JlYXRlU2Vzc2lvbigidGVtcG9yYXJ5IikpCitSVU4ocHJvbWlzZSA9IG1l ZGlhS2V5U2Vzc2lvbi5nZW5lcmF0ZVJlcXVlc3QoImtleWlkcyIsIGVuY29kZXIuZW5jb2RlKGtp ZHMpKSkKK1Byb21pc2UgcmVzb2x2ZWQgT0sKK1JVTihwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9u LmNsb3NlKCkpCitQcm9taXNlIHJlc29sdmVkIE9LCitQcm9taXNlIHJlc29sdmVkIE9LCisiY2xv c2VkIiBwcm9taXNlIGNvcnJlY3RseSByZXNvbHZlZC4KKwogQ2xvc2luZyBhIGNsb3NlZCBNZWRp YUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUuCiBSVU4oa2lkcyA9IEpTT04uc3RyaW5naWZ5KHsg a2lkczogWyAiTVRJek5EVT0iIF0gfSkpCiBSVU4obWVkaWFLZXlTZXNzaW9uID0gbWVkaWFLZXlz LmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpKQpAQCAtNDAsNSArNTAsMjEgQEAgUlVOKHByb21p c2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKSkKIFByb21pc2UgcmVzb2x2ZWQgT0sKIFJVTihw cm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmNsb3NlKCkpCiBQcm9taXNlIHJlc29sdmVkIE9LCisK K09wZXJhdGluZyBvbiBhIGNsb3NlZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUgZm9y IGNsb3NlKCksIHJlamVjdCBvdGhlcndpc2UuCitSVU4oa2lkcyA9IEpTT04uc3RyaW5naWZ5KHsg a2lkczogWyAiTVRJek5EVT0iIF0gfSkpCitSVU4obWVkaWFLZXlTZXNzaW9uID0gbWVkaWFLZXlz LmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpKQorUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Np b24uZ2VuZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSkpCitQcm9t aXNlIHJlc29sdmVkIE9LCitSVU4ocHJvbWlzZSA9IG1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgpKQor UHJvbWlzZSByZXNvbHZlZCBPSworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2VuZXJh dGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSkpCitQcm9taXNlIHJlamVj dGVkIGNvcnJlY3RseSBPSworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24udXBkYXRlKGVu Y29kZXIuZW5jb2RlKCJzb21lLWRhdGEiKSkpCitQcm9taXNlIHJlamVjdGVkIGNvcnJlY3RseSBP SworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKSkKK1Byb21pc2UgcmVzb2x2 ZWQgT0sKK1JVTihwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLnJlbW92ZSgpKQorUHJvbWlzZSBy ZWplY3RlZCBjb3JyZWN0bHkgT0sKIEVORCBPRiBURVNUCiAKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1jbG9zZS5odG1s IGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2stTWVkaWFLZXlTZXNzaW9u LWNsb3NlLmh0bWwKaW5kZXggZDdmMWQ5ODBjYWRkMjUzNTYwZDZiZGM0NGM1MjlhNDg3ZGNhZDk0 MS4uOTQzYjgzMDA0MTA5ZWI4ZWViZjY0ZGQyNDU3ZDg4ZDVlMDY3Njg3NSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2stTWVkaWFLZXlTZXNzaW9uLWNs b3NlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2stTWVk aWFLZXlTZXNzaW9uLWNsb3NlLmh0bWwKQEAgLTg3LDYgKzg3LDIyIEBACiAgICAgICAgIH0sCiAK ICAgICAgICAgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ0Nsb3Npbmcg YSB2YWxpZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUgdGhlICJjbG9zZWQiIHByb21p c2UuJykKKyAgICAgICAgICAgIHJ1bigna2lkcyA9IEpTT04uc3RyaW5naWZ5KHsga2lkczogWyAi TVRJek5EVT0iIF0gfSknKTsKKyAgICAgICAgICAgIHJ1bignbWVkaWFLZXlTZXNzaW9uID0gbWVk aWFLZXlzLmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpJyk7CisgICAgICAgICAgICBydW4oJ3By b21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2VuZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVy LmVuY29kZShraWRzKSknKTsKKyAgICAgICAgICAgIHNob3VsZFJlc29sdmUocHJvbWlzZSkudGhl bihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBzaG91bGRSZXNvbHZlKG1lZGlhS2V5U2Vz c2lvbi5jbG9zZWQpLnRoZW4oZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgnImNsb3NlZCIgcHJvbWlzZSBjb3JyZWN0bHkgcmVzb2x2ZWQuJyk7CisgICAgICAg ICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgICAgICB9LCBuZXh0KTsKKworICAgICAg ICAgICAgICAgIHJ1bigncHJvbWlzZSA9IG1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgpJyk7CisgICAg ICAgICAgICAgICAgc2hvdWxkUmVzb2x2ZShwcm9taXNlKTsKKyAgICAgICAgICAgIH0sIG5leHQp OworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgY29uc29s ZVdyaXRlKCdDbG9zaW5nIGEgY2xvc2VkIE1lZGlhS2V5U2Vzc2lvbiBzaG91bGQgcmVzb2x2ZS4n KQogICAgICAgICAgICAgcnVuKCdraWRzID0gSlNPTi5zdHJpbmdpZnkoeyBraWRzOiBbICJNVEl6 TkRVPSIgXSB9KScpOwogICAgICAgICAgICAgcnVuKCdtZWRpYUtleVNlc3Npb24gPSBtZWRpYUtl eXMuY3JlYXRlU2Vzc2lvbigidGVtcG9yYXJ5IiknKTsKQEAgLTk5LDYgKzExNSwyOSBAQAogICAg ICAgICAgICAgICAgIH0sIG5leHQpOwogICAgICAgICAgICAgfSwgbmV4dCk7CiAgICAgICAgIH0s CisKKyAgICAgICAgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ09wZXJh dGluZyBvbiBhIGNsb3NlZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUgZm9yIGNsb3Nl KCksIHJlamVjdCBvdGhlcndpc2UuJykKKyAgICAgICAgICAgIHJ1bigna2lkcyA9IEpTT04uc3Ry aW5naWZ5KHsga2lkczogWyAiTVRJek5EVT0iIF0gfSknKTsKKyAgICAgICAgICAgIHJ1bignbWVk aWFLZXlTZXNzaW9uID0gbWVkaWFLZXlzLmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpJyk7Cisg ICAgICAgICAgICBydW4oJ3Byb21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2VuZXJhdGVSZXF1ZXN0 KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSknKTsKKyAgICAgICAgICAgIHNob3VsZFJl c29sdmUocHJvbWlzZSkudGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBydW4oJ3By b21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKScpOworICAgICAgICAgICAgICAgIHNob3Vs ZFJlc29sdmUocHJvbWlzZSkudGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAg cnVuKCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmdlbmVyYXRlUmVxdWVzdCgia2V5aWRzIiwg ZW5jb2Rlci5lbmNvZGUoa2lkcykpJyk7CisgICAgICAgICAgICAgICAgICAgIHNob3VsZFJlamVj dChwcm9taXNlKS50aGVuKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICAgICAgcnVu KCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLnVwZGF0ZShlbmNvZGVyLmVuY29kZSgic29tZS1k YXRhIikpJyk7CisgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRSZWplY3QocHJvbWlzZSku dGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBydW4oJ3Byb21p c2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKScpOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNob3VsZFJlc29sdmUocHJvbWlzZSkudGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcnVuKCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLnJlbW92 ZSgpJyk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3VsZFJlamVjdChwcm9t aXNlKS50aGVuKG5leHQsIG5leHQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sIG5l eHQpOworICAgICAgICAgICAgICAgICAgICAgICAgfSwgbmV4dCk7CisgICAgICAgICAgICAgICAg ICAgIH0sIG5leHQpOworICAgICAgICAgICAgICAgIH0sIG5leHQpOworICAgICAgICAgICAgfSwg bmV4dCk7CisgICAgICAgIH0sCiAgICAgXTsKICAgICA8L3NjcmlwdD4KIDwvaGVhZD4K 301034 2017-02-09 07:04:02 -0800 2017-02-09 08:25:36 -0800 Patch bug-168039-20170209160136.patch text/plain 15531 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExOTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRlMWFkYWIyYjAzM2E0 OTc3ZWRiNzFjMTM4ZDNmMDRkZGZlMmM4YS4uYjA5MTAxMTQ3NDJiYzI1NTFkNmM5ODEyNjA0OTg3 MGZhZTQxMDQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE3LTAyLTA5ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBJbXBsZW1l bnQgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODAzOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCB0aGUgJ3Nlc3Npb24gY2xvc2Vk JyBhbGdvcml0aG0gZm9yIE1lZGlhS2V5U2Vzc2lvbiBieQorICAgICAgICBmb2xsb3dpbmcgdGhl IHNwZWNpZmllZCBzdGVwcy4gQWZ0ZXIgdGhpcyBhbGdvcml0aG0gaXMgcnVuLCB0aGUKKyAgICAg ICAgc2Vzc2lvbiBzaG91bGQgYmUgY29uc2lkZXJlZCBjbG9zZWQsIHdoaWNoIHdlIHRyYWNrIHZp YSB0aGUgbV9jbG9zZWQKKyAgICAgICAgbWVtYmVyIHZhcmlhYmxlIG9uIHRoZSBjbGFzcy4gVGhp cyBpcyBzZXQgdG8gdHJ1ZSBiZWZvcmUgdGhlIHByb21pc2UKKyAgICAgICAgdGhhdCdzIGFjY2Vz c2libGUgdGhyb3VnaCB0aGUgJ2Nsb3NlZCcgYXR0cmlidXRlIGlzIHJlc29sdmVkLgorCisgICAg ICAgIEJlY2F1c2UgdGhlIGFsZ29yaXRobSByZXF1aXJlcyB0aGUgQ0RNIGluc3RhbmNlIHRvIHN0 b3JlIGFueSByZWNvcmQKKyAgICAgICAgb2Yga2V5IHVzYWdlIHdoZW4gdGhlIHNlc3Npb24ncyB0 eXBlIGlzICdwZXJzaXN0ZW50LXVzYWdlLXJlY29yZCcsIHRoZQorICAgICAgICBzdG9yZVJlY29y ZE9mS2V5VXNhZ2UoKSB2aXJ0dWFsIG1ldGhvZCBpcyBhZGRlZCB0byB0aGUgQ0RNSW5zdGFuY2UK KyAgICAgICAgaW50ZXJmYWNlLiBNb2NrQ0RNSW5zdGFuY2UgaW1wbGVtZW50YXRpb24gaXMgbGVm dCB1bmltcGxlbWVudGVkIGZvciBub3cuCisKKyAgICAgICAgSlNNZWRpYUtleVNlc3Npb246OmNs b3NlZCgpIGFjY2Vzc29yIG5vdyBoYXMgYSBjdXN0b20gaW1wbGVtZW50YXRpb24KKyAgICAgICAg dGhhdCBjcmVhdGVzIGEgZGVmZXJyZWQgcHJvbWlzZSBmb3IgdGhhdCBvYmplY3QgaWYgdGhlcmUn cyBub25lIHlldCwgYW5kCisgICAgICAgIHNoYXJlcyBpdCB3aXRoIHRoZSB3cmFwcGVkIGNsYXNz IHRocm91Z2ggdGhlIHJlZ2lzdGVyQ2xvc2VkUHJvbWlzZSgpCisgICAgICAgIG1ldGhvZCwgc3Rv cmluZyBhIHJlZmVyZW5jZSB0byB0aGUgcHJvbWlzZSBpbiB0aGUgbV9jbG9zZWRQcm9taXNlCisg ICAgICAgIG1lbWJlciB2YXJpYWJsZSwgb3IgcmVzb2x2aW5nIHRoZSBwcm9taXNlIGltbWVkaWF0 ZWx5IGlmIHRoZSBzZXNzaW9uIHdhcworICAgICAgICBhbHJlYWR5IGNsb3NlZC4KKworICAgICAg ICBUZXN0IGNhc2VzIGFkZGVkIHRvIG1lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5 U2Vzc2lvbi1jbG9zZS5odG1sLgorCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9D RE1JbnN0YW5jZS5oOgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlT ZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5U2Vzc2lvbjo6cmVnaXN0ZXJD bG9zZWRQcm9taXNlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhS2V5U2Vzc2lvbjo6c2Vzc2lv bkNsb3NlZCk6CisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Np b24uaDoKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU01lZGlhS2V5U2Vzc2lvbkN1c3RvbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpKU01lZGlhS2V5U2Vzc2lvbjo6Y2xvc2VkKToKKyAgICAgICAg KiB0ZXN0aW5nL01vY2tDRE1GYWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1vY2tDRE1J bnN0YW5jZTo6c3RvcmVSZWNvcmRPZktleVVzYWdlKToKKyAgICAgICAgKiB0ZXN0aW5nL01vY2tD RE1GYWN0b3J5Lmg6CisKIDIwMTctMDItMDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgUHV0IG5hbWVzIG9uIG1vcmUgVUlWaWV3cyBmb3IgZWFzZSBv ZiBkZWJ1Z2dpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVk bWVkaWEvQ0RNSW5zdGFuY2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVk aWEvQ0RNSW5zdGFuY2UuaAppbmRleCAxNTMxZDgyMGY3ZTllMmFjNGVmNzE2YjFkMTQwYjY3NjE3 Njg4ZjRlLi4wMjBhZjRjYmZiMzA1NTc2MTdkODBkZWQ2ZjUwOTZiMDZhMTE5MGM1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NETUluc3RhbmNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE1JbnN0YW5jZS5o CkBAIC03Miw2ICs3Miw4IEBAIHB1YmxpYzoKIAogICAgIHVzaW5nIFJlbW92ZVNlc3Npb25EYXRh Q2FsbGJhY2sgPSBGdW5jdGlvbjx2b2lkKEtleVN0YXR1c1ZlY3RvciYmLCBzdGQ6Om9wdGlvbmFs PFJlZjxTaGFyZWRCdWZmZXI+PiYmLCBTdWNjZXNzVmFsdWUpPjsKICAgICB2aXJ0dWFsIHZvaWQg cmVtb3ZlU2Vzc2lvbkRhdGEoY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQsIExpY2Vuc2VUeXBlLCBS ZW1vdmVTZXNzaW9uRGF0YUNhbGxiYWNrKSA9IDA7CisKKyAgICB2aXJ0dWFsIHZvaWQgc3RvcmVS ZWNvcmRPZktleVVzYWdlKGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkKSA9IDA7CiB9OwogCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5 U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlh S2V5U2Vzc2lvbi5jcHAKaW5kZXggOGUwYjdlZmZiZmY5ZWE4M2Y3YTRmYmU1MWE2ZjJmZjUxYzM3 MGE3OC4uMDA2NTBkY2ZmZWJjYjJjYTkwNGZjYzg1YzkyNDViZTY5ZTZlYjE0NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlT ZXNzaW9uLmNwcApAQCAtNDY2LDYgKzQ2NiwxNiBAQCB2b2lkIE1lZGlhS2V5U2Vzc2lvbjo6cmVt b3ZlKFJlZjxEZWZlcnJlZFByb21pc2U+JiYgcHJvbWlzZSkKICAgICAvLyA1LiBSZXR1cm4gcHJv bWlzZS4KIH0KIAordm9pZCBNZWRpYUtleVNlc3Npb246OnJlZ2lzdGVyQ2xvc2VkUHJvbWlzZShD bG9zZWRQcm9taXNlJiYgcHJvbWlzZSkKK3sKKyAgICBBU1NFUlQoIW1fY2xvc2VkUHJvbWlzZSk7 CisgICAgaWYgKG1fY2xvc2VkKSB7CisgICAgICAgIHByb21pc2UucmVzb2x2ZSgpOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIG1fY2xvc2VkUHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSk7 Cit9CisKIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjplbnF1ZXVlTWVzc2FnZShNZWRpYUtleU1lc3Nh Z2VUeXBlIG1lc3NhZ2VUeXBlLCBjb25zdCBTaGFyZWRCdWZmZXImIG1lc3NhZ2UpCiB7CiAgICAg Ly8gNi40LjEgUXVldWUgYSAibWVzc2FnZSIgRXZlbnQKQEAgLTQ5Myw3ICs1MDMsMzAgQEAgdm9p ZCBNZWRpYUtleVNlc3Npb246OnVwZGF0ZUV4cGlyYXRpb24oZG91YmxlKQogCiB2b2lkIE1lZGlh S2V5U2Vzc2lvbjo6c2Vzc2lvbkNsb3NlZCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICAvLyBodHRwczovL3czYy5naXRodWIuaW8vZW5jcnlwdGVkLW1lZGlhLyNzZXNzaW9uLWNsb3Nl ZAorICAgIC8vIFczQyBFZGl0b3IncyBEcmFmdCAwOSBOb3ZlbWJlciAyMDE2CisKKyAgICAvLyAx LiBMZXQgc2Vzc2lvbiBiZSB0aGUgYXNzb2NpYXRlZCBNZWRpYUtleVNlc3Npb24gb2JqZWN0Lgor ICAgIC8vIDIuIElmIHNlc3Npb24ncyBzZXNzaW9uIHR5cGUgaXMgInBlcnNpc3RlbnQtdXNhZ2Ut cmVjb3JkIiwgZXhlY3V0ZSB0aGUgZm9sbG93aW5nIHN0ZXBzIGluIHBhcmFsbGVsOgorICAgIGlm IChtX3Nlc3Npb25UeXBlID09IE1lZGlhS2V5U2Vzc2lvblR5cGU6OlBlcnNpc3RlbnRVc2FnZVJl Y29yZCkgeworICAgICAgICAvLyAyLjEuIExldCBjZG0gYmUgdGhlIENETSBpbnN0YW5jZSByZXBy ZXNlbnRlZCBieSBzZXNzaW9uJ3MgY2RtIGluc3RhbmNlIHZhbHVlLgorICAgICAgICAvLyAyLjIu IFVzZSBjZG0gdG8gc3RvcmUgc2Vzc2lvbidzIHJlY29yZCBvZiBrZXkgdXNhZ2UsIGlmIGl0IGV4 aXN0cy4KKyAgICAgICAgbV9pbnN0YW5jZS0+c3RvcmVSZWNvcmRPZktleVVzYWdlKG1fc2Vzc2lv bklkKTsKKyAgICB9CisKKyAgICAvLyAzLiBSdW4gdGhlIFVwZGF0ZSBLZXkgU3RhdHVzZXMgYWxn b3JpdGhtIG9uIHRoZSBzZXNzaW9uLCBwcm92aWRpbmcgYW4gZW1wdHkgc2VxdWVuY2UuCisgICAg dXBkYXRlS2V5U3RhdHVzZXMoeyB9KTsKKworICAgIC8vIDQuIFJ1biB0aGUgVXBkYXRlIEV4cGly YXRpb24gYWxnb3JpdGhtIG9uIHRoZSBzZXNzaW9uLCBwcm92aWRpbmcgTmFOLgorICAgIHVwZGF0 ZUV4cGlyYXRpb24oc3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+OjpxdWlldF9OYU4oKSk7CisK KyAgICAvLyBMZXQncyBjb25zaWRlciB0aGUgc2Vzc2lvbiBjbG9zZWQgYmVmb3JlIGFueSBwcm9t aXNlIG9uIHRoZSAnY2xvc2VkJyBhdHRyaWJ1dGUgaXMgcmVzb2x2ZWQuCisgICAgbV9jbG9zZWQg PSB0cnVlOworCisgICAgLy8gNS4gTGV0IHByb21pc2UgYmUgdGhlIGNsb3NlZCBhdHRyaWJ1dGUg b2YgdGhlIHNlc3Npb24uCisgICAgLy8gNi4gUmVzb2x2ZSBwcm9taXNlLgorICAgIGlmIChtX2Ns b3NlZFByb21pc2UpCisgICAgICAgIG1fY2xvc2VkUHJvbWlzZS0+cmVzb2x2ZSgpOwogfQogCiBi b29sIE1lZGlhS2V5U2Vzc2lvbjo6aGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9u LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlhS2V5U2Vzc2lv bi5oCmluZGV4IDhmNDBmMzdlYzhjNjNkZDYwYTU3ZjY0YzFkNTY3NzVhN2M1MzgwNTMuLjY5YWNk OGUwZjhjNjk3OWQ4MGM4N2U4NzNmN2RhNWJhMDQ4ZTY4NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFLZXlTZXNzaW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Npb24uaApAQCAt NjksNiArNjksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbG9zZShSZWY8RGVmZXJyZWRQcm9taXNl PiYmKTsKICAgICB2b2lkIHJlbW92ZShSZWY8RGVmZXJyZWRQcm9taXNlPiYmKTsKIAorICAgIHVz aW5nIENsb3NlZFByb21pc2UgPSBET01Qcm9taXNlPHZvaWQ+OworICAgIHZvaWQgcmVnaXN0ZXJD bG9zZWRQcm9taXNlKENsb3NlZFByb21pc2UmJik7CisKIHByaXZhdGU6CiAgICAgTWVkaWFLZXlT ZXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBNZWRpYUtleVNlc3Npb25UeXBlLCBib29s IHVzZURpc3RpbmN0aXZlSWRlbnRpZmllciwgUmVmPENETT4mJiwgUmVmPENETUluc3RhbmNlPiYm KTsKICAgICB2b2lkIGVucXVldWVNZXNzYWdlKE1lZGlhS2V5TWVzc2FnZVR5cGUsIGNvbnN0IFNo YXJlZEJ1ZmZlciYpOwpAQCAtOTAsNiArOTMsNyBAQCBwcml2YXRlOgogCiAgICAgU3RyaW5nIG1f c2Vzc2lvbklkOwogICAgIGRvdWJsZSBtX2V4cGlyYXRpb247CisgICAgc3RkOjpvcHRpb25hbDxD bG9zZWRQcm9taXNlPiBtX2Nsb3NlZFByb21pc2U7CiAgICAgUmVmPE1lZGlhS2V5U3RhdHVzTWFw PiBtX2tleVN0YXR1c2VzOwogICAgIGJvb2wgbV9jbG9zZWQgeyBmYWxzZSB9OwogICAgIGJvb2wg bV91bmluaXRpYWxpemVkIHsgdHJ1ZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNNZWRpYUtleVNlc3Npb25DdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNNZWRpYUtleVNlc3Npb25DdXN0b20uY3BwCmluZGV4IGEzNzE1M2NjMTc4MTY5 OWI3Njk5NjlmMGFjMzU2NWJhYjk2ZjU2MjUuLjQyMjdjY2QzOTVhMzFjYTQ4ZGVjMjdkZTkwMTBl OTZjNjFlYWU3YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTWVk aWFLZXlTZXNzaW9uQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U01lZGlhS2V5U2Vzc2lvbkN1c3RvbS5jcHAKQEAgLTMyLDE0ICszMiwxNiBAQAogCiAjaW5jbHVk ZSAiSlNNZWRpYUtleVNlc3Npb24uaCIKIAotI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCi0K IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotSlNDOjpKU1ZhbHVlIEpTTWVkaWFLZXlTZXNzaW9uOjpj bG9zZWQoSlNDOjpFeGVjU3RhdGUmKSBjb25zdAorSlNDOjpKU1ZhbHVlIEpTTWVkaWFLZXlTZXNz aW9uOjpjbG9zZWQoSlNDOjpFeGVjU3RhdGUmIHN0YXRlKSBjb25zdAogewotICAgIG5vdEltcGxl bWVudGVkKCk7Ci0gICAgcmV0dXJuIEpTQzo6anNVbmRlZmluZWQoKTsKKyAgICBpZiAoIW1fY2xv c2VkKSB7CisgICAgICAgIGF1dG8gcHJvbWlzZSA9IGNyZWF0ZURlZmVycmVkUHJvbWlzZShzdGF0 ZSwgZG9tV2luZG93KCkpOworICAgICAgICBtX2Nsb3NlZC5zZXQoc3RhdGUudm0oKSwgdGhpcywg cHJvbWlzZS0+cHJvbWlzZSgpKTsKKyAgICAgICAgd3JhcHBlZCgpLnJlZ2lzdGVyQ2xvc2VkUHJv bWlzZShXVEZNb3ZlKHByb21pc2UpKTsKKyAgICB9CisgICAgcmV0dXJuIG1fY2xvc2VkLmdldCgp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL01vY2tDRE1GYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9j a0NETUZhY3RvcnkuY3BwCmluZGV4IDlhMGQyNjBhOWE2Mzk4MWE3NjcwYzZlNTRjNmU5MmFmZTY5 OGJkYTEuLmRiZjVhNDEwZjhhYzExN2JmN2JjZjEzYWM0MmNjOWEwOWIyZjBlYzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja0NETUZhY3RvcnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja0NETUZhY3RvcnkuY3BwCkBAIC0zMjgsNiArMzI4LDExIEBA IHZvaWQgTW9ja0NETUluc3RhbmNlOjpyZW1vdmVTZXNzaW9uRGF0YShjb25zdCBTdHJpbmcmIGlk LCBMaWNlbnNlVHlwZSwgUmVtb3ZlU2VzCiAgICAgY2FsbGJhY2soV1RGTW92ZShrZXlTdGF0dXNW ZWN0b3IpLCBTaGFyZWRCdWZmZXI6OmNyZWF0ZShtZXNzYWdlLmRhdGEoKSwgbWVzc2FnZS5sZW5n dGgoKSksIFN1Y2Nlc3NWYWx1ZTo6U3VjY2VlZGVkKTsKIH0KIAordm9pZCBNb2NrQ0RNSW5zdGFu Y2U6OnN0b3JlUmVjb3JkT2ZLZXlVc2FnZShjb25zdCBTdHJpbmcmKQoreworICAgIC8vIEZJWE1F OiBUaGlzIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBhbG9uZyB3aXRoIHRoZSBzdXBwb3J0IGZvciBw ZXJzaXN0ZW50LXVzYWdlLXJlY29yZCBzZXNzaW9ucy4KK30KKwogfQogCiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja0NETUZhY3RvcnkuaCBiL1NvdXJjZS9X ZWJDb3JlL3Rlc3RpbmcvTW9ja0NETUZhY3RvcnkuaAppbmRleCAwMWYxYmMzNjEyYTA3YjY5MzA5 MjkwODg4M2VjOGZjMWQ2YTI4YTBkLi4wYjExMzljZDJkYjJhYzI2N2I5NjFiOTQ4NmVkMzE4NDAx MDFlZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL01vY2tDRE1GYWN0b3J5 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ0RNRmFjdG9yeS5oCkBAIC0xMzMs NiArMTMzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUxpY2Vuc2UoTGljZW5zZVR5cGUs IGNvbnN0IFNoYXJlZEJ1ZmZlciYsIExpY2Vuc2VVcGRhdGVDYWxsYmFjaykgZmluYWw7CiAgICAg dm9pZCBjbG9zZVNlc3Npb24oY29uc3QgU3RyaW5nJiwgQ2xvc2VTZXNzaW9uQ2FsbGJhY2spIGZp bmFsOwogICAgIHZvaWQgcmVtb3ZlU2Vzc2lvbkRhdGEoY29uc3QgU3RyaW5nJiwgTGljZW5zZVR5 cGUsIFJlbW92ZVNlc3Npb25EYXRhQ2FsbGJhY2spIGZpbmFsOworICAgIHZvaWQgc3RvcmVSZWNv cmRPZktleVVzYWdlKGNvbnN0IFN0cmluZyYpIGZpbmFsOwogCiAgICAgV2Vha1B0cjxNb2NrQ0RN PiBtX2NkbTsKICAgICBib29sIG1fZGlzdGluY3RpdmVJZGVudGlmaWVyc0FsbG93ZWQgeyB0cnVl IH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggMmUwNzBhY2U2MGE0MGEzMzFlM2Q5NTc5NjRmYTMzNTYwN2JiMDA2NS4uOTk2 NDM1NDhhYzRhYmY2YWExNDZiNTE5Zjg0MzU0OTA1YmVkZGYzNCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDE3LTAyLTA5ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbRU1FXSBJbXBsZW1lbnQgTWVkaWFLZXlTZXNzaW9uOjpzZXNzaW9uQ2xvc2VkKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODAzOQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuaGFuY2Ug dGhlIG1vY2stTWVkaWFLZXlTZXNzaW9uLWNsb3NlLmh0bWwgdGVzdCBieSBhZGRpbmcgdGVzdCBj YXNlcworICAgICAgICBjb3ZlcmluZyB0aGUgZGlzcGF0Y2ggb2YgdGhlIHByb21pc2UgdGhhdCdz IGFjY2Vzc2libGUgdGhyb3VnaCB0aGUKKyAgICAgICAgJ2Nsb3NlZCcgYXR0cmlidXRlIGFuZCBj b3ZlcmluZyB0aGUgc2Vzc2lvbiBjbG9zdXJlIHN0YXR1cywgbWFraW5nCisgICAgICAgIHN1cmUg dGhhdCB2YXJpb3VzIG9wZXJhdGlvbnMgcHJvcGVybHkgcmVzb2x2ZSBvciByZWplY3QgYWZ0ZXIg dGhlCisgICAgICAgIHNlc3Npb24gb2JqZWN0IHdhcyBjbG9zZWQuCisKKyAgICAgICAgKiBtZWRp YS9lbmNyeXB0ZWQtbWVkaWEvbW9jay1NZWRpYUtleVNlc3Npb24tY2xvc2UtZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIG1lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1j bG9zZS5odG1sOgorCiAyMDE3LTAyLTA4ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJlYmFzZWxpbmUgZW1vamkgdGVzdHMgZm9yIGlvcy1zaW11bGF0b3Iu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9lbmNyeXB0ZWQtbWVkaWEvbW9jay1NZWRp YUtleVNlc3Npb24tY2xvc2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlw dGVkLW1lZGlhL21vY2stTWVkaWFLZXlTZXNzaW9uLWNsb3NlLWV4cGVjdGVkLnR4dAppbmRleCBh NWM0OTg2MGY5MzcxNGIwZTljOTQ3YzExNjFiNTlmNjMxNzExZTE2Li5hZTM4OTU0ZTY0ZTMzZDll NDljMzJhMjM0NzhiYjBkN2E3YzIxYzdlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9l bmNyeXB0ZWQtbWVkaWEvbW9jay1NZWRpYUtleVNlc3Npb24tY2xvc2UtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lv bi1jbG9zZS1leHBlY3RlZC50eHQKQEAgLTMxLDYgKzMxLDI2IEBAIFByb21pc2UgcmVzb2x2ZWQg T0sKIFJVTihwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmNsb3NlKCkpCiBQcm9taXNlIHJlc29s dmVkIE9LCiAKK0Nsb3NpbmcgYSB2YWxpZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUg dGhlICJjbG9zZWQiIHByb21pc2UuCitSVU4oa2lkcyA9IEpTT04uc3RyaW5naWZ5KHsga2lkczog WyAiTVRJek5EVT0iIF0gfSkpCitSVU4obWVkaWFLZXlTZXNzaW9uID0gbWVkaWFLZXlzLmNyZWF0 ZVNlc3Npb24oInRlbXBvcmFyeSIpKQorUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2Vu ZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSkpCitQcm9taXNlIHJl c29sdmVkIE9LCitSVU4ocHJvbWlzZSA9IG1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgpKQorUHJvbWlz ZSByZXNvbHZlZCBPSworUHJvbWlzZSByZXNvbHZlZCBPSworImNsb3NlZCIgcHJvbWlzZSBjb3Jy ZWN0bHkgcmVzb2x2ZWQuCisKK0FscmVhZHkgY2xvc2VkIE1lZGlhS2V5U2Vzc2lvbiBzaG91bGQg cmVzb2x2ZSB0aGUgImNsb3NlZCIgcHJvbWlzZSBpbW1lZGlhdGVseS4KK1JVTihraWRzID0gSlNP Ti5zdHJpbmdpZnkoeyBraWRzOiBbICJNVEl6TkRVPSIgXSB9KSkKK1JVTihtZWRpYUtleVNlc3Np b24gPSBtZWRpYUtleXMuY3JlYXRlU2Vzc2lvbigidGVtcG9yYXJ5IikpCitSVU4ocHJvbWlzZSA9 IG1lZGlhS2V5U2Vzc2lvbi5nZW5lcmF0ZVJlcXVlc3QoImtleWlkcyIsIGVuY29kZXIuZW5jb2Rl KGtpZHMpKSkKK1Byb21pc2UgcmVzb2x2ZWQgT0sKK1JVTihwcm9taXNlID0gbWVkaWFLZXlTZXNz aW9uLmNsb3NlKCkpCitQcm9taXNlIHJlc29sdmVkIE9LCitQcm9taXNlIHJlc29sdmVkIE9LCisi Y2xvc2VkIiBwcm9taXNlIGNvcnJlY3RseSByZXNvbHZlZC4KKwogQ2xvc2luZyBhIGNsb3NlZCBN ZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUuCiBSVU4oa2lkcyA9IEpTT04uc3RyaW5naWZ5 KHsga2lkczogWyAiTVRJek5EVT0iIF0gfSkpCiBSVU4obWVkaWFLZXlTZXNzaW9uID0gbWVkaWFL ZXlzLmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpKQpAQCAtNDAsNSArNjAsMjEgQEAgUlVOKHBy b21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKSkKIFByb21pc2UgcmVzb2x2ZWQgT0sKIFJV Tihwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmNsb3NlKCkpCiBQcm9taXNlIHJlc29sdmVkIE9L CisKK09wZXJhdGluZyBvbiBhIGNsb3NlZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUg Zm9yIGNsb3NlKCksIHJlamVjdCBvdGhlcndpc2UuCitSVU4oa2lkcyA9IEpTT04uc3RyaW5naWZ5 KHsga2lkczogWyAiTVRJek5EVT0iIF0gfSkpCitSVU4obWVkaWFLZXlTZXNzaW9uID0gbWVkaWFL ZXlzLmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpKQorUlVOKHByb21pc2UgPSBtZWRpYUtleVNl c3Npb24uZ2VuZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSkpCitQ cm9taXNlIHJlc29sdmVkIE9LCitSVU4ocHJvbWlzZSA9IG1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgp KQorUHJvbWlzZSByZXNvbHZlZCBPSworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2Vu ZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29kZShraWRzKSkpCitQcm9taXNlIHJl amVjdGVkIGNvcnJlY3RseSBPSworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24udXBkYXRl KGVuY29kZXIuZW5jb2RlKCJzb21lLWRhdGEiKSkpCitQcm9taXNlIHJlamVjdGVkIGNvcnJlY3Rs eSBPSworUlVOKHByb21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xvc2UoKSkKK1Byb21pc2UgcmVz b2x2ZWQgT0sKK1JVTihwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLnJlbW92ZSgpKQorUHJvbWlz ZSByZWplY3RlZCBjb3JyZWN0bHkgT0sKIEVORCBPRiBURVNUCiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9tb2NrLU1lZGlhS2V5U2Vzc2lvbi1jbG9zZS5o dG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2stTWVkaWFLZXlTZXNz aW9uLWNsb3NlLmh0bWwKaW5kZXggZDdmMWQ5ODBjYWRkMjUzNTYwZDZiZGM0NGM1MjlhNDg3ZGNh ZDk0MS4uMTRkMjU2YTJmNzJmNzViNjFiM2QzODg2ZWVmZmRhMDMxMzQ1NWIzMyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2stTWVkaWFLZXlTZXNzaW9u LWNsb3NlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZW5jcnlwdGVkLW1lZGlhL21vY2st TWVkaWFLZXlTZXNzaW9uLWNsb3NlLmh0bWwKQEAgLTg3LDYgKzg3LDM4IEBACiAgICAgICAgIH0s CiAKICAgICAgICAgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ0Nsb3Np bmcgYSB2YWxpZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUgdGhlICJjbG9zZWQiIHBy b21pc2UuJykKKyAgICAgICAgICAgIHJ1bigna2lkcyA9IEpTT04uc3RyaW5naWZ5KHsga2lkczog WyAiTVRJek5EVT0iIF0gfSknKTsKKyAgICAgICAgICAgIHJ1bignbWVkaWFLZXlTZXNzaW9uID0g bWVkaWFLZXlzLmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpJyk7CisgICAgICAgICAgICBydW4o J3Byb21pc2UgPSBtZWRpYUtleVNlc3Npb24uZ2VuZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNv ZGVyLmVuY29kZShraWRzKSknKTsKKyAgICAgICAgICAgIHNob3VsZFJlc29sdmUocHJvbWlzZSku dGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBzaG91bGRSZXNvbHZlKG1lZGlhS2V5 U2Vzc2lvbi5jbG9zZWQpLnRoZW4oZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgnImNsb3NlZCIgcHJvbWlzZSBjb3JyZWN0bHkgcmVzb2x2ZWQuJyk7CisgICAg ICAgICAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgICAgICAgICB9LCBuZXh0KTsKKworICAg ICAgICAgICAgICAgIHJ1bigncHJvbWlzZSA9IG1lZGlhS2V5U2Vzc2lvbi5jbG9zZSgpJyk7Cisg ICAgICAgICAgICAgICAgc2hvdWxkUmVzb2x2ZShwcm9taXNlKTsKKyAgICAgICAgICAgIH0sIG5l eHQpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgY29u c29sZVdyaXRlKCdBbHJlYWR5IGNsb3NlZCBNZWRpYUtleVNlc3Npb24gc2hvdWxkIHJlc29sdmUg dGhlICJjbG9zZWQiIHByb21pc2UgaW1tZWRpYXRlbHkuJyk7CisgICAgICAgICAgICBydW4oJ2tp ZHMgPSBKU09OLnN0cmluZ2lmeSh7IGtpZHM6IFsgIk1USXpORFU9IiBdIH0pJyk7CisgICAgICAg ICAgICBydW4oJ21lZGlhS2V5U2Vzc2lvbiA9IG1lZGlhS2V5cy5jcmVhdGVTZXNzaW9uKCJ0ZW1w b3JhcnkiKScpOworICAgICAgICAgICAgcnVuKCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmdl bmVyYXRlUmVxdWVzdCgia2V5aWRzIiwgZW5jb2Rlci5lbmNvZGUoa2lkcykpJyk7CisgICAgICAg ICAgICBzaG91bGRSZXNvbHZlKHByb21pc2UpLnRoZW4oZnVuY3Rpb24oKSB7CisgICAgICAgICAg ICAgICAgcnVuKCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLmNsb3NlKCknKTsKKyAgICAgICAg ICAgICAgICBzaG91bGRSZXNvbHZlKHByb21pc2UpLnRoZW4oZnVuY3Rpb24oKSB7CisgICAgICAg ICAgICAgICAgICAgIHNob3VsZFJlc29sdmUobWVkaWFLZXlTZXNzaW9uLmNsb3NlZCkudGhlbihm dW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoJyJjbG9z ZWQiIHByb21pc2UgY29ycmVjdGx5IHJlc29sdmVkLicpOworICAgICAgICAgICAgICAgICAgICAg ICAgbmV4dCgpOworICAgICAgICAgICAgICAgICAgICB9LCBuZXh0KTsKKyAgICAgICAgICAgICAg ICB9LCBuZXh0KTsKKyAgICAgICAgICAgIH0sIG5leHQpOworICAgICAgICB9LAorCisgICAgICAg IGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgY29uc29sZVdyaXRlKCdDbG9zaW5nIGEgY2xvc2Vk IE1lZGlhS2V5U2Vzc2lvbiBzaG91bGQgcmVzb2x2ZS4nKQogICAgICAgICAgICAgcnVuKCdraWRz ID0gSlNPTi5zdHJpbmdpZnkoeyBraWRzOiBbICJNVEl6TkRVPSIgXSB9KScpOwogICAgICAgICAg ICAgcnVuKCdtZWRpYUtleVNlc3Npb24gPSBtZWRpYUtleXMuY3JlYXRlU2Vzc2lvbigidGVtcG9y YXJ5IiknKTsKQEAgLTk5LDYgKzEzMSwyOSBAQAogICAgICAgICAgICAgICAgIH0sIG5leHQpOwog ICAgICAgICAgICAgfSwgbmV4dCk7CiAgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24oKSB7 CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ09wZXJhdGluZyBvbiBhIGNsb3NlZCBNZWRpYUtl eVNlc3Npb24gc2hvdWxkIHJlc29sdmUgZm9yIGNsb3NlKCksIHJlamVjdCBvdGhlcndpc2UuJykK KyAgICAgICAgICAgIHJ1bigna2lkcyA9IEpTT04uc3RyaW5naWZ5KHsga2lkczogWyAiTVRJek5E VT0iIF0gfSknKTsKKyAgICAgICAgICAgIHJ1bignbWVkaWFLZXlTZXNzaW9uID0gbWVkaWFLZXlz LmNyZWF0ZVNlc3Npb24oInRlbXBvcmFyeSIpJyk7CisgICAgICAgICAgICBydW4oJ3Byb21pc2Ug PSBtZWRpYUtleVNlc3Npb24uZ2VuZXJhdGVSZXF1ZXN0KCJrZXlpZHMiLCBlbmNvZGVyLmVuY29k ZShraWRzKSknKTsKKyAgICAgICAgICAgIHNob3VsZFJlc29sdmUocHJvbWlzZSkudGhlbihmdW5j dGlvbigpIHsKKyAgICAgICAgICAgICAgICBydW4oJ3Byb21pc2UgPSBtZWRpYUtleVNlc3Npb24u Y2xvc2UoKScpOworICAgICAgICAgICAgICAgIHNob3VsZFJlc29sdmUocHJvbWlzZSkudGhlbihm dW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgcnVuKCdwcm9taXNlID0gbWVkaWFLZXlT ZXNzaW9uLmdlbmVyYXRlUmVxdWVzdCgia2V5aWRzIiwgZW5jb2Rlci5lbmNvZGUoa2lkcykpJyk7 CisgICAgICAgICAgICAgICAgICAgIHNob3VsZFJlamVjdChwcm9taXNlKS50aGVuKGZ1bmN0aW9u KCkgeworICAgICAgICAgICAgICAgICAgICAgICAgcnVuKCdwcm9taXNlID0gbWVkaWFLZXlTZXNz aW9uLnVwZGF0ZShlbmNvZGVyLmVuY29kZSgic29tZS1kYXRhIikpJyk7CisgICAgICAgICAgICAg ICAgICAgICAgICBzaG91bGRSZWplY3QocHJvbWlzZSkudGhlbihmdW5jdGlvbigpIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBydW4oJ3Byb21pc2UgPSBtZWRpYUtleVNlc3Npb24uY2xv c2UoKScpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3VsZFJlc29sdmUocHJvbWlz ZSkudGhlbihmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVu KCdwcm9taXNlID0gbWVkaWFLZXlTZXNzaW9uLnJlbW92ZSgpJyk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNob3VsZFJlamVjdChwcm9taXNlKS50aGVuKG5leHQsIG5leHQpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sIG5leHQpOworICAgICAgICAgICAgICAgICAg ICAgICAgfSwgbmV4dCk7CisgICAgICAgICAgICAgICAgICAgIH0sIG5leHQpOworICAgICAgICAg ICAgICAgIH0sIG5leHQpOworICAgICAgICAgICAgfSwgbmV4dCk7CisgICAgICAgIH0sCiAgICAg XTsKICAgICA8L3NjcmlwdD4KIDwvaGVhZD4K