238591 2022-03-30 22:13:04 -0700 Add more push-related logging 2022-04-01 13:48:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham beidson ews-watchlist hi mkwst nham webkit-bug-importer youennf oldest_to_newest 1856686 0 nham 2022-03-30 22:13:04 -0700 Add more push-related logging 1856689 1 nham 2022-03-30 22:32:19 -0700 rdar://91067124 1856690 2 456204 nham 2022-03-30 22:36:29 -0700 Created attachment 456204 Patch 1856791 3 456204 youennf 2022-03-31 06:44:15 -0700 Comment on attachment 456204 Patch r=me once bots are happy. View in context: https://bugs.webkit.org/attachment.cgi?id=456204&action=review > Source/WebCore/Modules/push-api/PushManager.cpp:143 > + RELEASE_LOG(Push, "Failing PushManager.subscribe call due to failed transient activation check; last activated %.2f sec ago", lastActivationDuration.value()); RELEASE_LOG_ERROR > Source/WebCore/workers/service/server/SWServer.cpp:1287 > + RELEASE_LOG(Push, "Cannot process push message: Failed to find SW registration for registration key %s", registrationKey.loggingString().utf8().data()); RELEASE_LOG_ERROR > Source/WebCore/workers/service/server/SWServer.cpp:1294 > + RELEASE_LOG(Push, "Cannot process push message: No active worker for registration key %s", registrationKey.loggingString().utf8().data()); RELEASE_LOG_ERROR > Source/WebKit/NetworkProcess/NetworkProcess.cpp:2305 > + RELEASE_LOG(Push, "NetworkProcess getting pending push messages for session ID %" PRIu64, sessionID.toUInt64()); Is this one really useful? > Source/WebKit/NetworkProcess/NetworkProcess.cpp:2310 > + RELEASE_LOG_ERROR(Push, "NetworkProcess could not find session for ID %llu to get pending push messages", sessionID.toUInt64()); Ditto. > Source/WebKit/NetworkProcess/NetworkProcess.cpp:2332 > + RELEASE_LOG_ERROR(Push, "Networking process asked to handle a push message from UI process in session %llu, but that session doesn't exist", sessionID.toUInt64()); We generally do not release log missing session errors. 1856880 4 456258 nham 2022-03-31 11:20:24 -0700 Created attachment 456258 Patch 1857120 5 456314 nham 2022-03-31 20:20:57 -0700 Created attachment 456314 Patch 1857389 6 ews-feeder 2022-04-01 13:48:55 -0700 Committed r292232 (249134@main): <https://commits.webkit.org/249134@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456314. 456204 2022-03-30 22:36:29 -0700 2022-03-31 11:20:22 -0700 Patch bug-238591-20220330223628.patch text/plain 12332 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2U3YTBjYjlmYThhNzgw ZDk0OGZkNzU1OGRmMzQwMWUxZWE2NDYwOC4uZDYzMjBmMmQ0MTU0YmI4MDQ2ZWRiOGRiNGRhMDcx MmNlMDY0ODUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAzLTMwICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIHB1c2gtcmVsYXRlZCBs b2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mzg1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbG9nZ2luZyB0byBoZWxwIGRpYWdub3NlIFB1c2ggQVBJIGVycm9ycy4gV2UgY3VycmVudGx5 IGxvZyB2ZXJ5IGxpdHRsZSwgd2hpY2ggaXMgbWFraW5nCisgICAgICAgIGl0IGhhcmQgZm9yIHVz IHRvIGRpYWdub3NlIGJ1ZyByZXBvcnRzLgorCisgICAgICAgICAtIExvZyBpZiBQdXNoTWFuYWdl ci5zdWJzY3JpYmUgZmFpbHMgdGhlIHVzZXIgZ2VzdHVyZSBjaGVjay4gV2UgbG9nIHRoaXMgdG8g Ym90aCBzeXNsb2cgYW5kCisgICAgICAgICAgIHRoZSBkZXZlbG9wZXIgY29uc29sZS4gV2UgZG8g dGhlIGxhdHRlciB0byBpbmZvcm0gZGV2ZWxvcGVycywgYW5kIHdlIGFscmVhZHkgbG9nIGFuCisg ICAgICAgICAgIGlkZW50aWNhbCBtZXNzYWdlIGZyb20gTm90aWZpY2F0aW9uLnJlcXVlc3RQZXJt aXNzaW9uIHdoZW4gdGhhdCBmYWlscyBpbiB0aGlzIG1hbm5lci4KKyAgICAgICAgIC0gTG9nIGlm IHdlIGNhbid0IGZpcmUgYSBwdXNoIGV2ZW50IGJlY2F1c2UgdGhlIHNlcnZpY2Ugd29ya2VyIHJl Z2lzdHJhdGlvbiB3ZW50IGF3YXkuCisKKyAgICAgICAgKiBNb2R1bGVzL3B1c2gtYXBpL1B1c2hN YW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlB1c2hNYW5hZ2VyOjpzdWJzY3JpYmUpOgor ICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U1dTZXJ2ZXI6OnByb2Nlc3NQdXNoTWVzc2FnZSk6CisKIDIwMjItMDMtMzAgIEth dGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgTWlncmF0 ZSBtYW5pZmVzdCB2ZXJzaW9uIGNvbnRlbnQgc2VjdXJpdHkgcG9saWN5IGZpbHRlcmluZyBmb3Ig ZXh0ZW5zaW9ucyBpbnRvIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBhYjcxZDRmODUwMDNlMTAwYjU4YzU0 OGU5MTFjYjNlMzY2MWRmNDNkLi41YzcwYzIxYjM2YjE0NmUzZDdhOGUzNTUwYjg5ODAwZTZlOGU5 Yjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAzLTMwICBCZW4gTmhhbSAgPG5o YW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIHB1c2gtcmVsYXRlZCBsb2dnaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg1OTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbG9nZ2lu ZyB0byBoZWxwIGRpYWdub3NlIFB1c2ggQVBJIGVycm9ycy4gV2UgY3VycmVudGx5IGxvZyB2ZXJ5 IGxpdHRsZSwgd2hpY2ggaXMgbWFraW5nCisgICAgICAgIGl0IGhhcmQgZm9yIHVzIHRvIGRpYWdu b3NlIGJ1ZyByZXBvcnRzLgorCisgICAgICAgICAtIExvZyB3aGVuIHdlIHRyeSB0byBmZXRjaCBv ciBwcm9jZXNzIHB1c2ggbWVzc2FnZXMgaW4gTmV0d29ya1Byb2Nlc3MuCisgICAgICAgICAtIExv ZyB3aGVuIHdlIGVucXVldWUsIHN0YXJ0LCBhbmQgZmluaXNoIGEgUHVzaFNlcnZpY2VSZXF1ZXN0 LiBUaGlzIGhlbHBzIGNhdGNoIGlzc3VlcyBzdWNoCisgICAgICAgICAgIGFzIGEgcXVldWVkIHJl cXVlc3QgbmV2ZXIgcnVubmluZyBiZWNhdXNlIHRoZSBPUyBwdXNoIGRhZW1vbiBuZXZlciBjb21w bGV0aW5nIGEgcmVxdWVzdC4KKyAgICAgICAgIC0gTG9nIGlmIHdlIGZhaWxlZCB0cnlpbmcgdG8g d2FrZSB1cCB0aGUgYnJvd3NlciB0byBwcm9jZXNzIGEgcHVzaCBtZXNzYWdlLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUHJvY2Vzczo6Z2V0UGVuZGluZ1B1c2hNZXNzYWdlcyk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtQcm9jZXNzOjpwcm9jZXNzUHVzaE1lc3NhZ2UpOgorICAgICAgICAqIHdlYnB1c2hk L1B1c2hTZXJ2aWNlLm1tOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlUmVxdWVzdElt cGw6OmZ1bGZpbGwpOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlUmVxdWVzdEltcGw6 OnJlamVjdCk6CisgICAgICAgIChXZWJQdXNoRDo6UHVzaFNlcnZpY2U6OmVucXVldWVQdXNoU2Vy dmljZVJlcXVlc3QpOgorICAgICAgICAqIHdlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW06CisgICAg ICAgIChXZWJQdXNoRDo6RGFlbW9uOjpub3RpZnlDbGllbnRQdXNoTWVzc2FnZUlzQXZhaWxhYmxl KToKKyAgICAgICAgKFdlYlB1c2hEOjpEYWVtb246OmdldFBlbmRpbmdQdXNoTWVzc2FnZXMpOgor CiAyMDIyLTAzLTMwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgog CiAgICAgICAgIE1pZ3JhdGUgbWFuaWZlc3QgdmVyc2lvbiBjb250ZW50IHNlY3VyaXR5IHBvbGlj eSBmaWx0ZXJpbmcgZm9yIGV4dGVuc2lvbnMgaW50byBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvcHVzaC1hcGkvUHVzaE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9wdXNoLWFwaS9QdXNoTWFuYWdlci5jcHAKaW5kZXggOGM1ODdkN2Y4NjA0OGJh ODU3YmZiZTBjOTVmODhmYWU0Y2M1ZjVjYS4uY2Y5YzM1YWUxNTE1NmQzYmJkNThhYTc4MmM2YmYz YTA3NTAzY2Q5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wdXNoLWFwaS9Q dXNoTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wdXNoLWFwaS9QdXNo TWFuYWdlci5jcHAKQEAgLTEzOSw3ICsxMzksMTIgQEAgdm9pZCBQdXNoTWFuYWdlcjo6c3Vic2Ny aWJlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIHN0ZDo6b3B0aW9uYWw8UHVzaFMK IAogICAgICAgICAgICAgYXV0byogd2luZG93ID0gZG9jdW1lbnQuZnJhbWUoKSA/IGRvY3VtZW50 LmZyYW1lKCktPndpbmRvdygpIDogbnVsbHB0cjsKICAgICAgICAgICAgIGlmICghd2luZG93IHx8 ICF3aW5kb3ctPmNvbnN1bWVUcmFuc2llbnRBY3RpdmF0aW9uKCkpIHsKLSAgICAgICAgICAgICAg ICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBOb3RBbGxvd2VkRXJyb3IsICJQdXNoIG5vdGlm aWNhdGlvbiBwcm9tcHRpbmcgY2FuIG9ubHkgYmUgZG9uZSBmcm9tIGEgdXNlciBnZXN0dXJlIl9z IH0pOworICAgICAgICAgICAgICAgIFNlY29uZHMgbGFzdEFjdGl2YXRpb25EdXJhdGlvbiA9IHdp bmRvdyA/IE1vbm90b25pY1RpbWU6Om5vdygpIC0gd2luZG93LT5sYXN0QWN0aXZhdGlvblRpbWVz dGFtcCgpIDogU2Vjb25kczo6aW5maW5pdHkoKTsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xP RyhQdXNoLCAiRmFpbGluZyBQdXNoTWFuYWdlci5zdWJzY3JpYmUgY2FsbCBkdWUgdG8gZmFpbGVk IHRyYW5zaWVudCBhY3RpdmF0aW9uIGNoZWNrOyBsYXN0IGFjdGl2YXRlZCAlLjJmIHNlYyBhZ28i LCBsYXN0QWN0aXZhdGlvbkR1cmF0aW9uLnZhbHVlKCkpOworCisgICAgICAgICAgICAgICAgYXV0 byBlcnJvck1lc3NhZ2UgPSAiUHVzaCBub3RpZmljYXRpb24gcHJvbXB0aW5nIGNhbiBvbmx5IGJl IGRvbmUgZnJvbSBhIHVzZXIgZ2VzdHVyZS4iX3M7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQu YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6 RXJyb3IsIGVycm9yTWVzc2FnZSk7CisgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhj ZXB0aW9uIHsgTm90QWxsb3dlZEVycm9yLCBlcnJvck1lc3NhZ2UgfSk7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCmluZGV4IGEzMWY0N2JkNTc3ZjZlNjJmNjNk NTk0MDFjODM4YzVkNTFjNjVjYzEuLjgzZTQxMGFlODk3NmM3MjBlZmRjOTgzZjVkNWMxMTkwM2I2 ZDUzMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwCkBAIC0xMjg0LDE0ICsxMjg0LDE0IEBAIHZvaWQgU1dTZXJ2ZXI6OnByb2Nl c3NQdXNoTWVzc2FnZShzdGQ6Om9wdGlvbmFsPFZlY3Rvcjx1aW50OF90Pj4mJiBkYXRhLCBVUkwm JiByCiAgICAgICAgIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXkgcmVnaXN0cmF0aW9uS2V5 IHsgV1RGTW92ZShvcmlnaW4pLCBXVEZNb3ZlKHJlZ2lzdHJhdGlvblVSTCkgfTsKICAgICAgICAg YXV0byByZWdpc3RyYXRpb24gPSBtX3Njb3BlVG9SZWdpc3RyYXRpb25NYXAuZ2V0KHJlZ2lzdHJh dGlvbktleSk7CiAgICAgICAgIGlmICghcmVnaXN0cmF0aW9uKSB7Ci0gICAgICAgICAgICBMT0co UHVzaCwgIkNhbm5vdCBwcm9jZXNzIHB1c2ggbWVzc2FzZ2U6IEZhaWxlZCB0byBmaW5kIFNXIHJl Z2lzdHJhdGlvbiBmb3IgcmVnaXN0cmF0aW9uIGtleSAlcyIsIHJlZ2lzdHJhdGlvbktleS5sb2dn aW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNo LCAiQ2Fubm90IHByb2Nlc3MgcHVzaCBtZXNzYWdlOiBGYWlsZWQgdG8gZmluZCBTVyByZWdpc3Ry YXRpb24gZm9yIHJlZ2lzdHJhdGlvbiBrZXkgJXMiLCByZWdpc3RyYXRpb25LZXkubG9nZ2luZ1N0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgY2FsbGJhY2sodHJ1ZSk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAgICAgICBhdXRvKiB3b3JrZXIgPSByZWdp c3RyYXRpb24tPmFjdGl2ZVdvcmtlcigpOwogICAgICAgICBpZiAoIXdvcmtlcikgewotICAgICAg ICAgICAgTE9HKFB1c2gsICJDYW5ub3QgcHJvY2VzcyBwdXNoIG1lc3Nhc2dlOiBObyBhY3RpdmUg d29ya2VyIGZvciByZWdpc3RyYXRpb24ga2V5ICVzIiwgcmVnaXN0cmF0aW9uS2V5LmxvZ2dpbmdT dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJD YW5ub3QgcHJvY2VzcyBwdXNoIG1lc3NhZ2U6IE5vIGFjdGl2ZSB3b3JrZXIgZm9yIHJlZ2lzdHJh dGlvbiBrZXkgJXMiLCByZWdpc3RyYXRpb25LZXkubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwogICAgICAgICAgICAgY2FsbGJhY2sodHJ1ZSk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz cy5jcHAKaW5kZXggNzg4ZWRjZTY5MGJjOGRkMDFmNTNlN2YzZmNkMGQ5ZDQzNGVlMDE5Ni4uNDNm YjRhNGMxNTYwNGJlMzkxODc4MWJmZTFkNTRjNzg4NzZhNTA0NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIzMDIsMTcgKzIzMDIs MTggQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6cHJvY2Vzc05vdGlmaWNhdGlvbkV2ZW50KE5vdGlm aWNhdGlvbkRhdGEmJiBkYXRhLCBOb3RpZmljYXQKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmdldFBl bmRpbmdQdXNoTWVzc2FnZXMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJQdXNoTWVzc2FnZT4mKT4mJiBjYWxsYmFjaykKIHsK ICAgICBpZiAoYXV0byogc2Vzc2lvbiA9IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpIHsKLSAg ICAgICAgTE9HKE5vdGlmaWNhdGlvbnMsICJOZXR3b3JrUHJvY2VzcyBnZXR0aW5nIHBlbmRpbmcg cHVzaCBtZXNzYWdlcyBmb3Igc2Vzc2lvbiBJRCAlIiBQUkl1NjQsIHNlc3Npb25JRC50b1VJbnQ2 NCgpKTsKKyAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIk5ldHdvcmtQcm9jZXNzIGdldHRpbmcg cGVuZGluZyBwdXNoIG1lc3NhZ2VzIGZvciBzZXNzaW9uIElEICUiIFBSSXU2NCwgc2Vzc2lvbklE LnRvVUludDY0KCkpOwogICAgICAgICBzZXNzaW9uLT5ub3RpZmljYXRpb25NYW5hZ2VyKCkuZ2V0 UGVuZGluZ1B1c2hNZXNzYWdlcyhXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgICAgIHJldHVybjsK LSAgICB9IGVsc2UKLSAgICAgICAgTE9HKE5vdGlmaWNhdGlvbnMsICJOZXR3b3JrUHJvY2VzcyBj b3VsZCBub3QgZmluZCBzZXNzaW9uIGZvciBJRCAlbGx1IHRvIGdldCBwZW5kaW5nIHB1c2ggbWVz c2FnZXMiLCBzZXNzaW9uSUQudG9VSW50NjQoKSk7CisgICAgfQorCisgICAgUkVMRUFTRV9MT0df RVJST1IoUHVzaCwgIk5ldHdvcmtQcm9jZXNzIGNvdWxkIG5vdCBmaW5kIHNlc3Npb24gZm9yIElE ICVsbHUgdG8gZ2V0IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyIsIHNlc3Npb25JRC50b1VJbnQ2NCgp KTsKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6cHJvY2Vzc1B1c2hNZXNzYWdlKFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRCwgV2ViUHVzaE1lc3NhZ2UmJiBwdXNoTWVzc2FnZSwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT4mJiBjYWxsYmFjaykKIHsKICAgICBpZiAoYXV0byogc2Vzc2lv biA9IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpIHsKLSAgICAgICAgTE9HKFB1c2gsICJOZXR3 b3JraW5nIHByb2Nlc3MgaGFuZGxpbmcgYSBwdXNoIG1lc3NhZ2UgZnJvbSBVSSBwcm9jZXNzIGlu IHNlc3Npb24gJWxsdSIsIHNlc3Npb25JRC50b1VJbnQ2NCgpKTsKKyAgICAgICAgUkVMRUFTRV9M T0coUHVzaCwgIk5ldHdvcmtpbmcgcHJvY2VzcyBoYW5kbGluZyBhIHB1c2ggbWVzc2FnZSBmcm9t IFVJIHByb2Nlc3MgaW4gc2Vzc2lvbiAlbGx1Iiwgc2Vzc2lvbklELnRvVUludDY0KCkpOwogICAg ICAgICBhdXRvIG9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVVSTChwdXNoTWVzc2Fn ZS5yZWdpc3RyYXRpb25VUkwpOwogICAgICAgICBzZXNzaW9uLT5lbnN1cmVTV1NlcnZlcigpLnBy b2Nlc3NQdXNoTWVzc2FnZShXVEZNb3ZlKHB1c2hNZXNzYWdlLnB1c2hEYXRhKSwgV1RGTW92ZShw dXNoTWVzc2FnZS5yZWdpc3RyYXRpb25VUkwpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7 ICp0aGlzIH0sIHNlc3Npb25JRCwgb3JpZ2luID0gV1RGTW92ZShvcmlnaW4pLCBjYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spXShib29sIHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBO ZXR3b3JrU2Vzc2lvbiogc2Vzc2lvbjsKQEAgLTIzMjUsOCArMjMyNiwxMCBAQCB2b2lkIE5ldHdv cmtQcm9jZXNzOjpwcm9jZXNzUHVzaE1lc3NhZ2UoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBX ZWJQdXNoTWVzc2FnZQogCiAgICAgICAgICAgICBjYWxsYmFjayhyZXN1bHQpOwogICAgICAgICB9 KTsKLSAgICB9IGVsc2UKLSAgICAgICAgTE9HKFB1c2gsICJOZXR3b3JraW5nIHByb2Nlc3MgYXNr ZWQgdG8gaGFuZGxlIGEgcHVzaCBtZXNzYWdlIGZyb20gVUkgcHJvY2VzcyBpbiBzZXNzaW9uICVs bHUsIGJ1dCB0aGF0IHNlc3Npb24gZG9lc24ndCBleGlzdCIsIHNlc3Npb25JRC50b1VJbnQ2NCgp KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gs ICJOZXR3b3JraW5nIHByb2Nlc3MgYXNrZWQgdG8gaGFuZGxlIGEgcHVzaCBtZXNzYWdlIGZyb20g VUkgcHJvY2VzcyBpbiBzZXNzaW9uICVsbHUsIGJ1dCB0aGF0IHNlc3Npb24gZG9lc24ndCBleGlz dCIsIHNlc3Npb25JRC50b1VJbnQ2NCgpKTsKIH0KIAogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvd2VicHVzaGQvUHVzaFNlcnZpY2UubW0gYi9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hk L1B1c2hTZXJ2aWNlLm1tCmluZGV4IDRhMjdiNDM2N2RkZWUyNjU3Yzg1NWE2ZTNhYzI1Mjc5YjJk YjhlZTUuLjgwOTA3NGFjMWU2Mjg3MGJjMWMzNGVkMzJlMjE2MmI4MWUzYzNkZTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvUHVzaFNlcnZpY2UubW0KKysrIGIvU291cmNlL1dl YktpdC93ZWJwdXNoZC9QdXNoU2VydmljZS5tbQpAQCAtMTg0LDYgKzE4NCw4IEBAIHB1YmxpYzoK IAogICAgICAgICBTdHJpbmcgdHJhbnNhY3Rpb25EZXNjcmlwdGlvbiA9IFN0cmluZygiY29tLmFw cGxlLndlYmtpdC53ZWJwdXNoZDoiX3MpICsgZGVzY3JpcHRpb24oKSArICI6Il9zICsgbV9idW5k bGVJZGVudGlmaWVyICsgIjoiX3MgKyBtX3Njb3BlOwogICAgICAgICBtX3RyYW5zYWN0aW9uID0g YWRvcHRPU09iamVjdChvc190cmFuc2FjdGlvbl9jcmVhdGUodHJhbnNhY3Rpb25EZXNjcmlwdGlv bi51dGY4KCkuZGF0YSgpKSk7CisKKyAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIlN0YXJ0ZWQg cHVzaFNlcnZpY2VSZXF1ZXN0ICVzICglcCkgZm9yIGJ1bmRsZUlEID0gJXtwcml2YXRlfXMsIHNj b3BlID0gJXtwcml2YXRlfXMiLCBkZXNjcmlwdGlvbigpLmNoYXJhY3RlcnMoKSwgdGhpcywgbV9i dW5kbGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CiAg ICAgICAgIHN0YXJ0SW50ZXJuYWwoKTsKICAgICB9CiAKQEAgLTIwMSwxMiArMjAzLDE2IEBAIHBy b3RlY3RlZDoKIAogICAgIHZvaWQgZnVsZmlsbChSZXN1bHRUeXBlIHJlc3VsdCkKICAgICB7Cisg ICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJGaW5pc2hlZCBwdXNoU2VydmljZVJlcXVlc3QgJXMg KCVwKSB3aXRoIHJlc3VsdCBmb3IgYnVuZGxlSUQgPSAle3ByaXZhdGV9cywgc2NvcGUgPSAle3By aXZhdGV9cyIsIGRlc2NyaXB0aW9uKCkuY2hhcmFjdGVycygpLCB0aGlzLCBtX2J1bmRsZUlkZW50 aWZpZXIudXRmOCgpLmRhdGEoKSwgbV9zY29wZS51dGY4KCkuZGF0YSgpKTsKKwogICAgICAgICBt X3Jlc3VsdEhhbmRsZXIoV1RGTW92ZShyZXN1bHQpKTsKICAgICAgICAgZmluaXNoKCk7CiAgICAg fQogCiAgICAgdm9pZCByZWplY3QoV2ViQ29yZTo6RXhjZXB0aW9uRGF0YSYmIGRhdGEpCiAgICAg eworICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiRmluaXNoZWQgcHVzaFNlcnZpY2VSZXF1ZXN0 ICVzICglcCkgd2l0aCBleGNlcHRpb24gZm9yIGJ1bmRsZUlEID0gJXtwcml2YXRlfXMsIHNjb3Bl ID0gJXtwcml2YXRlfXMiLCBkZXNjcmlwdGlvbigpLmNoYXJhY3RlcnMoKSwgdGhpcywgbV9idW5k bGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CisKICAg ICAgICAgbV9yZXN1bHRIYW5kbGVyKG1ha2VVbmV4cGVjdGVkKFdURk1vdmUoZGF0YSkpKTsKICAg ICAgICAgZmluaXNoKCk7CiAgICAgfQpAQCAtNDA2LDcgKzQxMiwxMCBAQCB2b2lkIFB1c2hTZXJ2 aWNlOjplbnF1ZXVlUHVzaFNlcnZpY2VSZXF1ZXN0KFB1c2hTZXJ2aWNlUmVxdWVzdE1hcCYgbWFw LCBzdGQ6OnVuaQogICAgIH0pOwogCiAgICAgYXV0byBhZGRlZFJlcXVlc3QgPSByZXF1ZXN0Lmdl dCgpOwotICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUuYXBwZW5kKFdURk1vdmUocmVxdWVz dCkpOworICAgIGF1dG8mIHF1ZXVlID0gYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsKKworICAg IFJFTEVBU0VfTE9HKFB1c2gsICJFbnF1ZXVpbmcgUHVzaFNlcnZpY2VSZXF1ZXN0ICVwIChjdXJy ZW50IHF1ZXVlIHNpemU6ICV6dSIsIHJlcXVlc3QuZ2V0KCksIHF1ZXVlLnNpemUoKSk7CisgICAg cXVldWUuYXBwZW5kKFdURk1vdmUocmVxdWVzdCkpOwogCiAgICAgaWYgKGFkZFJlc3VsdC5pc05l d0VudHJ5KQogICAgICAgICBhZGRlZFJlcXVlc3QtPnN0YXJ0KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0gYi9Tb3VyY2UvV2ViS2l0L3dlYnB1 c2hkL1dlYlB1c2hEYWVtb24ubW0KaW5kZXggY2JkMTI3MDNiNTllY2Y1ZjI1MDdjODBkYWEwMDNi ZmUyYzk3MzRlNC4uMzgwZWQxNTk0NzAxYzEwNjAzYjQ0YWE4MWFiZTc0ZjI4ZDdkOTI1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC93ZWJwdXNoZC9XZWJQdXNoRGFlbW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvd2VicHVzaGQvV2ViUHVzaERhZW1vbi5tbQpAQCAtNTgxLDYgKzU4MSw4IEBA IHZvaWQgRGFlbW9uOjpoYW5kbGVJbmNvbWluZ1B1c2goY29uc3QgU3RyaW5nJiBidW5kbGVJZGVu dGlmaWVyLCBXZWJLaXQ6OldlYlB1c2hNCiAKIHZvaWQgRGFlbW9uOjpub3RpZnlDbGllbnRQdXNo TWVzc2FnZUlzQXZhaWxhYmxlKGNvbnN0IFN0cmluZyYgY2xpZW50Q29kZVNpZ25pbmdJZGVudGlm aWVyKQogeworICAgIFJFTEVBU0VfTE9HKFB1c2gsICJMYXVuY2hpbmcgJXMgaW4gcmVzcG9uc2Ug dG8gcHVzaCIsIGNsaWVudENvZGVTaWduaW5nSWRlbnRpZmllci51dGY4KCkuZGF0YSgpKTsKKwog I2lmIFBMQVRGT1JNKE1BQykKICAgICBDRkFycmF5UmVmIHVybHMgPSAoX19icmlkZ2UgQ0ZBcnJh eVJlZilAWyBbTlNVUkwgVVJMV2l0aFN0cmluZzpAIngtd2Via2l0LWFwcC1sYXVuY2g6Ly8xIl0g XTsKICAgICBDRlN0cmluZ1JlZiBpZGVudGlmaWVyID0gKF9fYnJpZGdlIENGU3RyaW5nUmVmKSgo TlNTdHJpbmcgKiljbGllbnRDb2RlU2lnbmluZ0lkZW50aWZpZXIpOwpAQCAtNTkzLDcgKzU5NSw5 IEBAIHZvaWQgRGFlbW9uOjpub3RpZnlDbGllbnRQdXNoTWVzc2FnZUlzQXZhaWxhYmxlKGNvbnN0 IFN0cmluZyYgY2xpZW50Q29kZVNpZ25pbmdJCiAgICAgICAgIChpZClfa0xTT3Blbk9wdGlvbkhp ZGVLZXk6IEBZRVMsCiAgICAgfTsKIAotICAgIF9MU09wZW5VUkxzVXNpbmdCdW5kbGVJZGVudGlm aWVyV2l0aENvbXBsZXRpb25IYW5kbGVyKHVybHMsIGlkZW50aWZpZXIsIG9wdGlvbnMsIF4oTFNB U05SZWYgbmV3UHJvY2Vzc1NlcmlhbE51bWJlciwgQm9vbGVhbiBwcm9jZXNzV2FzTGF1bmNoZWQs IENGRXJyb3JSZWYgY2ZFcnJvcikgeyB9KTsKKyAgICBfTFNPcGVuVVJMc1VzaW5nQnVuZGxlSWRl bnRpZmllcldpdGhDb21wbGV0aW9uSGFuZGxlcih1cmxzLCBpZGVudGlmaWVyLCBvcHRpb25zLCBe KExTQVNOUmVmLCBCb29sZWFuLCBDRkVycm9yUmVmIGNmRXJyb3IpIHsKKyAgICAgICAgUkVMRUFT RV9MT0dfRVJST1JfSUYoY2ZFcnJvciwgUHVzaCwgIkZhaWxlZCB0byBsYXVuY2ggcHJvY2VzcyBp biByZXNwb25zZSB0byBwdXNoOiAle3B1YmxpY31AIiwgKF9fYnJpZGdlIE5TRXJyb3IgKiljZkVy cm9yKTsKKyAgICB9KTsKICNlbHNlCiAgICAgLy8gRklYTUU6IEZpZ3VyZSBvdXQgZXF1aXZhbGVu dCBpT1MgY29kZSBoZXJlCiAgICAgVU5VU0VEX1BBUkFNKGNsaWVudENvZGVTaWduaW5nSWRlbnRp Zmllcik7CkBAIC02MjIsNiArNjI2LDcgQEAgdm9pZCBEYWVtb246OmdldFBlbmRpbmdQdXNoTWVz c2FnZXMoQ2xpZW50Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29tcGxldGlvbkhhbmQKICAgICAg ICAgbV90ZXN0aW5nUHVzaE1lc3NhZ2VzLnJlbW92ZShpdGVyYXRvcik7CiAgICAgfQogCisgICAg UkVMRUFTRV9MT0coUHVzaCwgIkZldGNoZWQgJXp1IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyBmb3Ig JXMiLCByZXN1bHRNZXNzYWdlcy5zaXplKCksIGhvc3RBcHBDb2RlU2lnbmluZ0lkZW50aWZpZXIu dXRmOCgpLmRhdGEoKSk7CiAgICAgY29ubmVjdGlvbi0+YnJvYWRjYXN0RGVidWdNZXNzYWdlKG1h a2VTdHJpbmcoIkZldGNoaW5nICIsIFN0cmluZzo6bnVtYmVyKHJlc3VsdE1lc3NhZ2VzLnNpemUo KSksICIgcGVuZGluZyBwdXNoIG1lc3NhZ2VzIikpOwogCiAgICAgcmVwbHlTZW5kZXIoV1RGTW92 ZShyZXN1bHRNZXNzYWdlcykpOwo= 456258 2022-03-31 11:20:24 -0700 2022-03-31 20:20:55 -0700 Patch bug-238591-20220331112023.patch text/plain 23771 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFjYjZkNjgyYWI3YmIw Y2I0ZDNlMzZiZDIzMzc2NWZhZDZmZjczMi4uMTM1YTVkN2JmMzNiNDI4NGM5OWM5MmU2YjJlZmQx ZjQwYmI2MzcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAzLTMwICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIHB1c2gtcmVsYXRlZCBs b2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mzg1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIEFk ZCBsb2dnaW5nIHRvIGhlbHAgZGlhZ25vc2UgUHVzaCBBUEkgZXJyb3JzLiBXZSBjdXJyZW50bHkg bG9nIHZlcnkgbGl0dGxlLCB3aGljaCBpcyBtYWtpbmcKKyAgICAgICAgaXQgaGFyZCBmb3IgdXMg dG8gZGlhZ25vc2UgYnVnIHJlcG9ydHMuCisKKyAgICAgICAgIC0gTG9nIGlmIFB1c2hNYW5hZ2Vy LnN1YnNjcmliZSBmYWlscyB0aGUgdXNlciBnZXN0dXJlIGNoZWNrLiBXZSBsb2cgdGhpcyB0byBi b3RoIHN5c2xvZyBhbmQKKyAgICAgICAgICAgdGhlIGRldmVsb3BlciBjb25zb2xlLiBXZSBkbyB0 aGUgbGF0dGVyIHRvIGluZm9ybSBkZXZlbG9wZXJzLCBhbmQgd2UgYWxyZWFkeSBsb2cgYW4KKyAg ICAgICAgICAgaWRlbnRpY2FsIG1lc3NhZ2UgZnJvbSBOb3RpZmljYXRpb24ucmVxdWVzdFBlcm1p c3Npb24gd2hlbiB0aGF0IGZhaWxzIGluIHRoaXMgbWFubmVyLgorICAgICAgICAgLSBMb2cgaWYg d2UgY2FuJ3QgZmlyZSBhIHB1c2ggZXZlbnQgYmVjYXVzZSB0aGUgc2VydmljZSB3b3JrZXIgcmVn aXN0cmF0aW9uIHdlbnQgYXdheS4KKworICAgICAgICAqIE1vZHVsZXMvcHVzaC1hcGkvUHVzaE1h bmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHVzaE1hbmFnZXI6OnN1YnNjcmliZSk6Cisg ICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTV1NlcnZlcjo6cHJvY2Vzc1B1c2hNZXNzYWdlKToKKwogMjAyMi0wMy0zMSAgRGll Z28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIFVucmV2 aWV3ZWQsIGZpeCBub24tdW5pZmllZCBidWlsZCBhZnRlciByMjkyMTUwCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3 MmNmMTgxNjA0ODZjNzk2OTA0ZWUwYTRiYTVlZTI1NjY4M2NhMjMuLjg3NDFmZWUzYTk0OGI5OTVh MTgxOGVlYjhjNTJlOTdkZDkyMTlmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjIt MDMtMzAgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1vcmUgcHVz aC1yZWxhdGVkIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzODU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisK KyAgICAgICAgQWRkIGxvZ2dpbmcgdG8gaGVscCBkaWFnbm9zZSBQdXNoIEFQSSBlcnJvcnMuIFdl IGN1cnJlbnRseSBsb2cgdmVyeSBsaXR0bGUsIHdoaWNoIGlzIG1ha2luZworICAgICAgICBpdCBo YXJkIGZvciB1cyB0byBkaWFnbm9zZSBidWcgcmVwb3J0cy4KKworICAgICAgICAgLSBMb2cgd2hl biB3ZSB0cnkgdG8gZmV0Y2ggb3IgcHJvY2VzcyBwdXNoIG1lc3NhZ2VzIGluIE5ldHdvcmtQcm9j ZXNzLgorICAgICAgICAgLSBMb2cgd2hlbiB3ZSBlbnF1ZXVlLCBzdGFydCwgYW5kIGZpbmlzaCBh IFB1c2hTZXJ2aWNlUmVxdWVzdC4gVGhpcyBoZWxwcyBjYXRjaCBpc3N1ZXMgc3VjaAorICAgICAg ICAgICBhcyBhIHF1ZXVlZCByZXF1ZXN0IG5ldmVyIHJ1bm5pbmcgYmVjYXVzZSB0aGUgT1MgcHVz aCBkYWVtb24gbmV2ZXIgY29tcGxldGluZyBhIHJlcXVlc3QuCisgICAgICAgICAtIExvZyBpZiB3 ZSBmYWlsZWQgdHJ5aW5nIHRvIHdha2UgdXAgdGhlIGJyb3dzZXIgdG8gcHJvY2VzcyBhIHB1c2gg bWVzc2FnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAg ICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfZ2V0UGVuZGluZ1B1c2hNZXNzYWdlczpdKToKKyAg ICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9wcm9jZXNzUHVzaE1lc3NhZ2U6Y29tcGxldGlv bkhhbmRsZXI6XSk6CisgICAgICAgICogd2VicHVzaGQvUHVzaFNlcnZpY2UubW06CisgICAgICAg IChXZWJQdXNoRDo6UHVzaFNlcnZpY2U6OmNyZWF0ZSk6CisgICAgICAgIChXZWJQdXNoRDo6UHVz aFNlcnZpY2VSZXF1ZXN0SW1wbDo6ZnVsZmlsbCk6CisgICAgICAgIChXZWJQdXNoRDo6UHVzaFNl cnZpY2VSZXF1ZXN0SW1wbDo6cmVqZWN0KToKKyAgICAgICAgKFdlYlB1c2hEOjpTdWJzY3JpYmVS ZXF1ZXN0OjpzdGFydEltcGwpOgorICAgICAgICAoV2ViUHVzaEQ6OlVuc3Vic2NyaWJlUmVxdWVz dDo6c3RhcnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJQdXNoRDo6UHVzaFNlcnZpY2U6OmVucXVl dWVQdXNoU2VydmljZVJlcXVlc3QpOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlOjpp bmNyZW1lbnRTaWxlbnRQdXNoQ291bnQpOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNl OjpyZW1vdmVSZWNvcmRzSW1wbCk6CisgICAgICAgIChXZWJQdXNoRDo6bWFrZVJhd1B1c2hNZXNz YWdlKToKKyAgICAgICAgKFdlYlB1c2hEOjpQdXNoU2VydmljZTo6ZGlkUmVjZWl2ZVB1c2hNZXNz YWdlKToKKyAgICAgICAgKiB3ZWJwdXNoZC9XZWJQdXNoRGFlbW9uLm1tOgorICAgICAgICAoV2Vi UHVzaEQ6OkRhZW1vbjo6aW5qZWN0RW5jcnlwdGVkUHVzaE1lc3NhZ2VGb3JUZXN0aW5nKToKKyAg ICAgICAgKFdlYlB1c2hEOjpEYWVtb246Om5vdGlmeUNsaWVudFB1c2hNZXNzYWdlSXNBdmFpbGFi bGUpOgorICAgICAgICAoV2ViUHVzaEQ6OkRhZW1vbjo6Z2V0UGVuZGluZ1B1c2hNZXNzYWdlcyk6 CisKIDIwMjItMDMtMzEgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlIHB1c2ggc3Vic2NyaXB0aW9ucyB3aGVuIHBlcm1pc3Npb25zIGFyZSByZXNldApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wdXNoLWFwaS9QdXNoTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3B1c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcAppbmRleCA4YzU4 N2Q3Zjg2MDQ4YmE4NTdiZmJlMGM5NWY4OGZhZTRjYzVmNWNhLi4xM2E4NjFmZGQ2ZTFhNmQxZGUy YzVlMTRiZTA2MGFjNjg2NmRkMjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3B1c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3B1 c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkV4Y2Vw dGlvbi5oIgogI2luY2x1ZGUgIkpTUHVzaFBlcm1pc3Npb25TdGF0ZS5oIgogI2luY2x1ZGUgIkpT UHVzaFN1YnNjcmlwdGlvbi5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJOb3Rp ZmljYXRpb25DbGllbnQuaCIKICNpbmNsdWRlICJQdXNoQ3J5cHRvLmgiCiAjaW5jbHVkZSAiU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5oIgpAQCAtMTM5LDcgKzE0MCwxMiBAQCB2b2lkIFB1c2hNYW5h Z2VyOjpzdWJzY3JpYmUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgc3RkOjpvcHRp b25hbDxQdXNoUwogCiAgICAgICAgICAgICBhdXRvKiB3aW5kb3cgPSBkb2N1bWVudC5mcmFtZSgp ID8gZG9jdW1lbnQuZnJhbWUoKS0+d2luZG93KCkgOiBudWxscHRyOwogICAgICAgICAgICAgaWYg KCF3aW5kb3cgfHwgIXdpbmRvdy0+Y29uc3VtZVRyYW5zaWVudEFjdGl2YXRpb24oKSkgewotICAg ICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IE5vdEFsbG93ZWRFcnJvciwg IlB1c2ggbm90aWZpY2F0aW9uIHByb21wdGluZyBjYW4gb25seSBiZSBkb25lIGZyb20gYSB1c2Vy IGdlc3R1cmUiX3MgfSk7CisgICAgICAgICAgICAgICAgU2Vjb25kcyBsYXN0QWN0aXZhdGlvbkR1 cmF0aW9uID0gd2luZG93ID8gTW9ub3RvbmljVGltZTo6bm93KCkgLSB3aW5kb3ctPmxhc3RBY3Rp dmF0aW9uVGltZXN0YW1wKCkgOiBTZWNvbmRzOjppbmZpbml0eSgpOworICAgICAgICAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJGYWlsaW5nIFB1c2hNYW5hZ2VyLnN1YnNjcmliZSBj YWxsIGR1ZSB0byBmYWlsZWQgdHJhbnNpZW50IGFjdGl2YXRpb24gY2hlY2s7IGxhc3QgYWN0aXZh dGVkICUuMmYgc2VjIGFnbyIsIGxhc3RBY3RpdmF0aW9uRHVyYXRpb24udmFsdWUoKSk7CisKKyAg ICAgICAgICAgICAgICBhdXRvIGVycm9yTWVzc2FnZSA9ICJQdXNoIG5vdGlmaWNhdGlvbiBwcm9t cHRpbmcgY2FuIG9ubHkgYmUgZG9uZSBmcm9tIGEgdXNlciBnZXN0dXJlLiJfczsKKyAgICAgICAg ICAgICAgICBkb2N1bWVudC5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0 eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdlKTsKKyAgICAgICAgICAgICAgICBw cm9taXNlLnJlamVjdChFeGNlcHRpb24geyBOb3RBbGxvd2VkRXJyb3IsIGVycm9yTWVzc2FnZSB9 KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKaW5kZXggYTMx ZjQ3YmQ1NzdmNmU2MmY2M2Q1OTQwMWM4MzhjNWQ1MWM2NWNjMS4uYzgwNzJiOTFkNDg0ZjliZjQw YzJiMGI1OTg5YzcyYmVhYzAxOGUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTEyODQsMTQgKzEyODQsMTQgQEAgdm9p ZCBTV1NlcnZlcjo6cHJvY2Vzc1B1c2hNZXNzYWdlKHN0ZDo6b3B0aW9uYWw8VmVjdG9yPHVpbnQ4 X3Q+PiYmIGRhdGEsIFVSTCYmIHIKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktl eSByZWdpc3RyYXRpb25LZXkgeyBXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUocmVnaXN0cmF0aW9u VVJMKSB9OwogICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IG1fc2NvcGVUb1JlZ2lzdHJhdGlv bk1hcC5nZXQocmVnaXN0cmF0aW9uS2V5KTsKICAgICAgICAgaWYgKCFyZWdpc3RyYXRpb24pIHsK LSAgICAgICAgICAgIExPRyhQdXNoLCAiQ2Fubm90IHByb2Nlc3MgcHVzaCBtZXNzYXNnZTogRmFp bGVkIHRvIGZpbmQgU1cgcmVnaXN0cmF0aW9uIGZvciByZWdpc3RyYXRpb24ga2V5ICVzIiwgcmVn aXN0cmF0aW9uS2V5LmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJDYW5ub3QgcHJvY2VzcyBwdXNoIG1lc3NhZ2U6IEZh aWxlZCB0byBmaW5kIFNXIHJlZ2lzdHJhdGlvbiBmb3Igc2NvcGUgJSIgUFJJVkFURV9MT0dfU1RS SU5HLCByZWdpc3RyYXRpb25LZXkuc2NvcGUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgICAgIGNhbGxiYWNrKHRydWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKICAgICAgICAgYXV0byogd29ya2VyID0gcmVnaXN0cmF0aW9uLT5hY3RpdmVXb3JrZXIoKTsK ICAgICAgICAgaWYgKCF3b3JrZXIpIHsKLSAgICAgICAgICAgIExPRyhQdXNoLCAiQ2Fubm90IHBy b2Nlc3MgcHVzaCBtZXNzYXNnZTogTm8gYWN0aXZlIHdvcmtlciBmb3IgcmVnaXN0cmF0aW9uIGtl eSAlcyIsIHJlZ2lzdHJhdGlvbktleS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Cisg ICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQdXNoLCAiQ2Fubm90IHByb2Nlc3MgcHVzaCBt ZXNzYWdlOiBObyBhY3RpdmUgd29ya2VyIGZvciBzY29wZSAlIiBQUklWQVRFX0xPR19TVFJJTkcs IHJlZ2lzdHJhdGlvbktleS5zY29wZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAg ICAgICAgY2FsbGJhY2sodHJ1ZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3Bw IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXgg NGFhNjNkYzBlMzg0YTlmNmIyOTVhMThkNjM5MWRhMmVlZTljODBmYi4uYzNiOTVhOTAzZjEwODBl NDIwNWFmMmNiNDE0ZjFlODIxODI2NmI5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIzMTksNyArMjMxOSw2IEBAIHZvaWQgTmV0 d29ya1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQs IFdlYlB1c2hNZXNzYWdlCiAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiUHVzaCBtZXNz YWdlIGZyb20gJSIgUFJJVkFURV9MT0dfU1RSSU5HICIgd29uJ3QgYmUgcHJvY2Vzc2VkIHNpbmNl IHBlcm1pc3Npb24gaXMgaW4gdGhlIHByb21wdCBzdGF0ZTsgcmVtb3ZpbmcgcHVzaCBzdWJzY3Jp cHRpb24iLCBvcmlnaW4udG9TdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIHNl c3Npb24tPm5vdGlmaWNhdGlvbk1hbmFnZXIoKS5yZW1vdmVQdXNoU3Vic2NyaXB0aW9uc0Zvck9y aWdpbihTZWN1cml0eU9yaWdpbkRhdGEgeyBvcmlnaW4gfSwgW2NhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldKGF1dG8mJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soZmFs c2UpOwotICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0pOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0yMzMyLDEwICsyMzMxLDEyIEBAIHZvaWQgTmV0d29y a1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFdl YlB1c2hNZXNzYWdlCiAgICAgICAgIH0KIAogICAgICAgICBBU1NFUlQocGVybWlzc2lvblN0YXRl ID09IFB1c2hQZXJtaXNzaW9uU3RhdGU6OkdyYW50ZWQpOwotICAgICAgICBzZXNzaW9uLT5lbnN1 cmVTV1NlcnZlcigpLnByb2Nlc3NQdXNoTWVzc2FnZShXVEZNb3ZlKHB1c2hNZXNzYWdlLnB1c2hE YXRhKSwgV1RGTW92ZShwdXNoTWVzc2FnZS5yZWdpc3RyYXRpb25VUkwpLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIHNlc3Npb25JRCwgb3JpZ2luID0gV1RGTW92ZShvcmln aW4pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShib29sIHJlc3VsdCkgbXV0YWJsZSB7 CisgICAgICAgIGF1dG8gc2NvcGUgPSBwdXNoTWVzc2FnZS5yZWdpc3RyYXRpb25VUkwuc3RyaW5n KCk7CisgICAgICAgIHNlc3Npb24tPmVuc3VyZVNXU2VydmVyKCkucHJvY2Vzc1B1c2hNZXNzYWdl KFdURk1vdmUocHVzaE1lc3NhZ2UucHVzaERhdGEpLCBXVEZNb3ZlKHB1c2hNZXNzYWdlLnJlZ2lz dHJhdGlvblVSTCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfSwgc2Vzc2lv bklELCBvcmlnaW4gPSBXVEZNb3ZlKG9yaWdpbiksIHNjb3BlID0gV1RGTW92ZShzY29wZSksIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGJvb2wgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAg ICAgICAgIE5ldHdvcmtTZXNzaW9uKiBzZXNzaW9uOwogICAgICAgICAgICAgaWYgKCFyZXN1bHQg JiYgKHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQpKSkgewotICAgICAgICAgICAg ICAgIHNlc3Npb24tPm5vdGlmaWNhdGlvbk1hbmFnZXIoKS5pbmNyZW1lbnRTaWxlbnRQdXNoQ291 bnQoV1RGTW92ZShvcmlnaW4pLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgcmVzdWx0 XSh1bnNpZ25lZCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgc2Vzc2lvbi0+bm90aWZpY2F0 aW9uTWFuYWdlcigpLmluY3JlbWVudFNpbGVudFB1c2hDb3VudChXVEZNb3ZlKG9yaWdpbiksIFtz Y29wZSA9IFdURk1vdmUoc2NvcGUpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCByZXN1 bHRdKHVuc2lnbmVkIG5ld1NpbGVudFB1c2hDb3VudCkgbXV0YWJsZSB7CisgICAgICAgICAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoIG1lc3NhZ2UgZm9yIHNjb3BlICUi IFBSSVZBVEVfTE9HX1NUUklORyAiIG5vdCBoYW5kbGVkIHByb3Blcmx5OyBuZXcgc2lsZW50IHB1 c2ggY291bnQ6ICV1Iiwgc2NvcGUudXRmOCgpLmRhdGEoKSwgbmV3U2lsZW50UHVzaENvdW50KTsK ICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2socmVzdWx0KTsKICAgICAgICAgICAgICAgICB9 KTsKICAgICAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCBkNzY3MTliYTFh ODY0YmI3N2VjM2JkODQxZjVkNDRlODdlYmFiYzBkLi41NmEwZTBkODM5OTI4ZGFlODEyZjA2Y2Iy ODI4YzIyMzY1YjY3Y2U5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAgLTc5OSw3ICs3OTksNyBAQCAtKGJv b2wpX2hhc1NlcnZpY2VXb3JrZXJCYWNrZ3JvdW5kQWN0aXZpdHlGb3JUZXN0aW5nCiAKIC0odm9p ZClfZ2V0UGVuZGluZ1B1c2hNZXNzYWdlczoodm9pZCheKShOU0FycmF5PE5TRGljdGlvbmFyeSAq PiAqKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIExPRyhQdXNoLCAiR2V0dGluZyBwZW5kaW5n IHB1c2ggbWVzc2FnZXMiKTsKKyAgICBSRUxFQVNFX0xPRyhQdXNoLCAiR2V0dGluZyBwZW5kaW5n IHB1c2ggbWVzc2FnZXMiKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKICAgICBfd2Vi c2l0ZURhdGFTdG9yZS0+bmV0d29ya1Byb2Nlc3MoKS5nZXRQZW5kaW5nUHVzaE1lc3NhZ2VzKF93 ZWJzaXRlRGF0YVN0b3JlLT5zZXNzaW9uSUQoKSwgW2NvbXBsZXRpb25IYW5kbGVyID0gbWFrZUJs b2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKGNvbnN0IFZlY3RvcjxXZWJLaXQ6OldlYlB1c2hN ZXNzYWdlPiYgbWVzc2FnZXMpIHsKQEAgLTgwNyw3ICs4MDcsNyBAQCAtKHZvaWQpX2dldFBlbmRp bmdQdXNoTWVzc2FnZXM6KHZvaWQoXikoTlNBcnJheTxOU0RpY3Rpb25hcnkgKj4gKikpY29tcGxl dGlvbkhhbgogICAgICAgICBmb3IgKGF1dG8mIG1lc3NhZ2UgOiBtZXNzYWdlcykKICAgICAgICAg ICAgIFtyZXN1bHQgYWRkT2JqZWN0Om1lc3NhZ2UudG9EaWN0aW9uYXJ5KCldOwogCi0gICAgICAg IExPRyhQdXNoLCAiR2l2aW5nIGFwcGxpY2F0aW9uICV1IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyIs IG1lc3NhZ2VzLnNpemUoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJHaXZpbmcgYXBw bGljYXRpb24gJXp1IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyIsIG1lc3NhZ2VzLnNpemUoKSk7CiAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlc3VsdC5nZXQoKSk7CiAgICAgfSk7CiAjZW5kaWYK QEAgLTgxOCwxNCArODE4LDE0IEBAIC0odm9pZClfcHJvY2Vzc1B1c2hNZXNzYWdlOihOU0RpY3Rp b25hcnkgKilwdXNoTWVzc2FnZURpY3Rpb25hcnkgY29tcGxldGlvbkhhbmRsCiAjaWYgRU5BQkxF KFNFUlZJQ0VfV09SS0VSKQogICAgIGF1dG8gcHVzaE1lc3NhZ2UgPSBXZWJLaXQ6OldlYlB1c2hN ZXNzYWdlOjpmcm9tRGljdGlvbmFyeShwdXNoTWVzc2FnZURpY3Rpb25hcnkpOwogICAgIGlmICgh cHVzaE1lc3NhZ2UpIHsKLSAgICAgICAgTE9HKFB1c2gsICJBc2tlZCB0byBoYW5kbGUgYW4gaW52 YWxpZCBwdXNoIG1lc3NhZ2UiKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHVzaCwgIkFz a2VkIHRvIGhhbmRsZSBhbiBpbnZhbGlkIHB1c2ggbWVzc2FnZSIpOwogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihmYWxzZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBMT0coUHVz aCwgIlNlbmRpbmcgcHVzaCBtZXNzYWdlIHRvIG5ldHdvcmsgcHJvY2VzcyB0byBoYW5kbGUiKTsK KyAgICBSRUxFQVNFX0xPRyhQdXNoLCAiU2VuZGluZyBwdXNoIG1lc3NhZ2UgZm9yIHNjb3BlICUi IFBSSVZBVEVfTE9HX1NUUklORyAiIHRvIG5ldHdvcmsgcHJvY2VzcyB0byBoYW5kbGUiLCBwdXNo TWVzc2FnZS0+cmVnaXN0cmF0aW9uVVJMLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIF93 ZWJzaXRlRGF0YVN0b3JlLT5uZXR3b3JrUHJvY2VzcygpLnByb2Nlc3NQdXNoTWVzc2FnZShfd2Vi c2l0ZURhdGFTdG9yZS0+c2Vzc2lvbklEKCksICpwdXNoTWVzc2FnZSwgW2NvbXBsZXRpb25IYW5k bGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKGJvb2wgd2FzUHJvY2Vzc2Vk KSB7Ci0gICAgICAgIExPRyhQdXNoLCAiUHVzaCBtZXNzYWdlIHByb2Nlc3NpbmcgY29tcGxldGUu IENhbGxiYWNrIHJlc3VsdDogJWkiLCB3YXNQcm9jZXNzZWQpOworICAgICAgICBSRUxFQVNFX0xP RyhQdXNoLCAiUHVzaCBtZXNzYWdlIHByb2Nlc3NpbmcgY29tcGxldGUuIENhbGxiYWNrIHJlc3Vs dDogJWQiLCB3YXNQcm9jZXNzZWQpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih3YXNQcm9j ZXNzZWQpOwogICAgIH0pOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dlYnB1 c2hkL1B1c2hTZXJ2aWNlLm1tIGIvU291cmNlL1dlYktpdC93ZWJwdXNoZC9QdXNoU2VydmljZS5t bQppbmRleCBlZWNjYzEyYzFjY2JkMWE4NDdhMzIyZmQ2MGFjZDUwZWIzMTQ4ZWU4Li5lMjY4NDRk M2I2ODY4OTlmZTczMTdkOWRhNWE0N2U3Mzc4MmYwMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3dlYnB1c2hkL1B1c2hTZXJ2aWNlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQv UHVzaFNlcnZpY2UubW0KQEAgLTYzLDcgKzYzLDcgQEAgdm9pZCBQdXNoU2VydmljZTo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgaW5jb21pbmdQdXNoU2VydmljZU5hbWUsIGNvbnN0IFN0cmluZyYgZGEK IAogICAgIFB1c2hEYXRhYmFzZTo6Y3JlYXRlKGRhdGFiYXNlUGF0aCwgW3RyYW5zYWN0aW9uID0g V1RGTW92ZSh0cmFuc2FjdGlvbiksIGNvbm5lY3Rpb24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pLCBt ZXNzYWdlSGFuZGxlciA9IFdURk1vdmUobWVzc2FnZUhhbmRsZXIpLCBjcmVhdGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNyZWF0aW9uSGFuZGxlcildKGF1dG8mJiBkYXRhYmFzZVJlc3VsdCkgbXV0YWJs ZSB7CiAgICAgICAgIGlmICghZGF0YWJhc2VSZXN1bHQpIHsKLSAgICAgICAgICAgIFJFTEVBU0Vf TE9HKFB1c2gsICJQdXNoIHNlcnZpY2UgaW5pdGlhbGl6YXRpb24gZmFpbGVkIHdpdGggZGF0YWJh c2UgZXJyb3IiKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoIHNl cnZpY2UgaW5pdGlhbGl6YXRpb24gZmFpbGVkIHdpdGggZGF0YWJhc2UgZXJyb3IiKTsKICAgICAg ICAgICAgIGNyZWF0aW9uSGFuZGxlcihzdGQ6OnVuaXF1ZV9wdHI8UHVzaFNlcnZpY2U+KCkpOwog ICAgICAgICAgICAgdHJhbnNhY3Rpb24gPSBudWxscHRyOwogICAgICAgICAgICAgcmV0dXJuOwpA QCAtMTg0LDYgKzE4NCw4IEBAIHB1YmxpYzoKIAogICAgICAgICBTdHJpbmcgdHJhbnNhY3Rpb25E ZXNjcmlwdGlvbiA9IFN0cmluZygiY29tLmFwcGxlLndlYmtpdC53ZWJwdXNoZDoiX3MpICsgZGVz Y3JpcHRpb24oKSArICI6Il9zICsgbV9idW5kbGVJZGVudGlmaWVyICsgIjoiX3MgKyBtX3Njb3Bl OwogICAgICAgICBtX3RyYW5zYWN0aW9uID0gYWRvcHRPU09iamVjdChvc190cmFuc2FjdGlvbl9j cmVhdGUodHJhbnNhY3Rpb25EZXNjcmlwdGlvbi51dGY4KCkuZGF0YSgpKSk7CisKKyAgICAgICAg UkVMRUFTRV9MT0coUHVzaCwgIlN0YXJ0ZWQgcHVzaFNlcnZpY2VSZXF1ZXN0ICV7cHVibGljfXMg KCVwKSBmb3IgYnVuZGxlSUQgPSAle3B1YmxpY31zLCBzY29wZSA9ICV7cHJpdmF0ZX1zIiwgZGVz Y3JpcHRpb24oKS5jaGFyYWN0ZXJzKCksIHRoaXMsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCku ZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBzdGFydEludGVybmFsKCk7 CiAgICAgfQogCkBAIC0yMDEsMTIgKzIwMywxNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGZ1 bGZpbGwoUmVzdWx0VHlwZSByZXN1bHQpCiAgICAgeworICAgICAgICBSRUxFQVNFX0xPRyhQdXNo LCAiRmluaXNoZWQgcHVzaFNlcnZpY2VSZXF1ZXN0ICV7cHVibGljfXMgKCVwKSB3aXRoIHJlc3Vs dCBmb3IgYnVuZGxlSUQgPSAle3B1YmxpY31zLCBzY29wZSA9ICV7cHJpdmF0ZX1zIiwgZGVzY3Jp cHRpb24oKS5jaGFyYWN0ZXJzKCksIHRoaXMsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCkuZGF0 YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgICAgIG1fcmVzdWx0SGFuZGxlcihX VEZNb3ZlKHJlc3VsdCkpOwogICAgICAgICBmaW5pc2goKTsKICAgICB9CiAKICAgICB2b2lkIHJl amVjdChXZWJDb3JlOjpFeGNlcHRpb25EYXRhJiYgZGF0YSkKICAgICB7CisgICAgICAgIFJFTEVB U0VfTE9HKFB1c2gsICJGaW5pc2hlZCBwdXNoU2VydmljZVJlcXVlc3QgJXtwdWJsaWN9cyAoJXAp IHdpdGggZXhjZXB0aW9uIGZvciBidW5kbGVJRCA9ICV7cHVibGljfXMsIHNjb3BlID0gJXtwcml2 YXRlfXMiLCBkZXNjcmlwdGlvbigpLmNoYXJhY3RlcnMoKSwgdGhpcywgbV9idW5kbGVJZGVudGlm aWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CisKICAgICAgICAgbV9y ZXN1bHRIYW5kbGVyKG1ha2VVbmV4cGVjdGVkKFdURk1vdmUoZGF0YSkpKTsKICAgICAgICAgZmlu aXNoKCk7CiAgICAgfQpAQCAtMjkzLDcgKzI5OSw3IEBAIHZvaWQgU3Vic2NyaWJlUmVxdWVzdDo6 c3RhcnRJbXBsKElzUmV0cnkgaXNSZXRyeSkKICAgICAgICAgICAgICAgICB9CiAjZW5kaWYKIAot ICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUo YnVuZGxlSUQ6ICV7cHVibGljfXMsIHNjb3BlOiAle3NlbnNpdGl2ZX1zKSBmYWlsZWQgd2l0aCBk b21haW46ICV7cHVibGljfXMgY29kZTogJWxsZCkiLCBtX2J1bmRsZUlkZW50aWZpZXIudXRmOCgp LmRhdGEoKSwgbV9zY29wZS51dGY4KCkuZGF0YSgpLCBlcnJvci5kb21haW4uVVRGOFN0cmluZywg c3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29kZSkpOworICAgICAgICAgICAgICAgIFJFTEVB U0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUoYnVuZGxlSUQ6ICV7cHVi bGljfXMsIHNjb3BlOiAle3ByaXZhdGV9cykgZmFpbGVkIHdpdGggZG9tYWluOiAle3B1YmxpY31z IGNvZGU6ICVsbGQpIiwgbV9idW5kbGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUu dXRmOCgpLmRhdGEoKSwgZXJyb3IuZG9tYWluLlVURjhTdHJpbmcsIHN0YXRpY19jYXN0PGludDY0 X3Q+KGVycm9yLmNvZGUpKTsKICAgICAgICAgICAgICAgICByZWplY3QoV2ViQ29yZTo6RXhjZXB0 aW9uRGF0YSB7IFdlYkNvcmU6OkFib3J0RXJyb3IsICJGYWlsZWQgZHVlIHRvIGludGVybmFsIHNl cnZpY2UgZXJyb3IiX3MgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQpAQCAtMzEyLDcgKzMxOCw3IEBAIHZvaWQgU3Vic2NyaWJlUmVxdWVzdDo6c3RhcnRJbXBsKElz UmV0cnkgaXNSZXRyeSkKIAogICAgICAgICAgICAgbV9kYXRhYmFzZS5pbnNlcnRSZWNvcmQocmVj b3JkLCBbdGhpc10oYXV0byYmIHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYg KCFyZXN1bHQpIHsKLSAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIlB1c2hN YW5hZ2VyLnN1YnNjcmliZShidW5kbGVJRDogJXtwdWJsaWN9cywgc2NvcGU6ICV7c2Vuc2l0aXZl fXMpIGZhaWxlZCB3aXRoIGRhdGFiYXNlIGVycm9yIiwgbV9idW5kbGVJZGVudGlmaWVyLnV0Zjgo KS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUoYnVuZGxlSUQ6ICV7 cHVibGljfXMsIHNjb3BlOiAle3ByaXZhdGV9cykgZmFpbGVkIHdpdGggZGF0YWJhc2UgZXJyb3Ii LCBtX2J1bmRsZUlkZW50aWZpZXIudXRmOCgpLmRhdGEoKSwgbV9zY29wZS51dGY4KCkuZGF0YSgp KTsKICAgICAgICAgICAgICAgICAgICAgcmVqZWN0KFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGEgeyBX ZWJDb3JlOjpBYm9ydEVycm9yLCAiRmFpbGVkIGR1ZSB0byBpbnRlcm5hbCBkYXRhYmFzZSBlcnJv ciJfcyB9KTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0K QEAgLTM4OSw3ICszOTUsNyBAQCB2b2lkIFVuc3Vic2NyaWJlUmVxdWVzdDo6c3RhcnRJbnRlcm5h bCgpCiAKICAgICAgICAgICAgIGF1dG8gdG9waWMgPSBtYWtlUHVzaFRvcGljKG1fYnVuZGxlSWRl bnRpZmllciwgbV9zY29wZSk7CiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24udW5zdWJzY3JpYmUo dG9waWMsIHNlcnZlclZBUElEUHVibGljS2V5LCBbdGhpc10oYm9vbCB1bnN1YnNjcmliZWQsIE5T RXJyb3IgKmVycm9yKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJP Ul9JRighdW5zdWJzY3JpYmVkLCBQdXNoLCAiUHVzaFN1YnNjcmlwdGlvbi51bnN1YnNjcmliZShi dW5kbGVJRDogJXtwdWJsaWN9cywgc2NvcGU6ICV7c2Vuc2l0aXZlfXMpIGZhaWxlZCB3aXRoIGRv bWFpbjogJXtwdWJsaWN9cyBjb2RlOiAlbGxkKSIsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCku ZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCksIGVycm9yLmRvbWFpbi5VVEY4U3RyaW5nID86 ICJub25lIiwgc3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29kZSkpOworICAgICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKCF1bnN1YnNjcmliZWQsIFB1c2gsICJQdXNoU3Vic2Ny aXB0aW9uLnVuc3Vic2NyaWJlKGJ1bmRsZUlEOiAle3B1YmxpY31zLCBzY29wZTogJXtwcml2YXRl fXMpIGZhaWxlZCB3aXRoIGRvbWFpbjogJXtwdWJsaWN9cyBjb2RlOiAlbGxkKSIsIG1fYnVuZGxl SWRlbnRpZmllci51dGY4KCkuZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCksIGVycm9yLmRv bWFpbi5VVEY4U3RyaW5nID86ICJub25lIiwgc3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29k ZSkpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtNDA2LDcgKzQx MiwxMCBAQCB2b2lkIFB1c2hTZXJ2aWNlOjplbnF1ZXVlUHVzaFNlcnZpY2VSZXF1ZXN0KFB1c2hT ZXJ2aWNlUmVxdWVzdE1hcCYgbWFwLCBzdGQ6OnVuaQogICAgIH0pOwogCiAgICAgYXV0byBhZGRl ZFJlcXVlc3QgPSByZXF1ZXN0LmdldCgpOwotICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUu YXBwZW5kKFdURk1vdmUocmVxdWVzdCkpOworICAgIGF1dG8mIHF1ZXVlID0gYWRkUmVzdWx0Lml0 ZXJhdG9yLT52YWx1ZTsKKworICAgIFJFTEVBU0VfTE9HKFB1c2gsICJFbnF1ZXVpbmcgUHVzaFNl cnZpY2VSZXF1ZXN0ICVwIChjdXJyZW50IHF1ZXVlIHNpemU6ICV6dSIsIHJlcXVlc3QuZ2V0KCks IHF1ZXVlLnNpemUoKSk7CisgICAgcXVldWUuYXBwZW5kKFdURk1vdmUocmVxdWVzdCkpOwogCiAg ICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICBhZGRlZFJlcXVlc3QtPnN0YXJ0 KCk7CkBAIC00OTgsNyArNTA3LDcgQEAgdm9pZCBQdXNoU2VydmljZTo6aW5jcmVtZW50U2lsZW50 UHVzaENvdW50KGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgY29uc3QKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJSZW1v dmluZyBhbGwgc3Vic2NyaXB0aW9ucyBhc3NvY2lhdGVkIHdpdGggJXtwdWJsaWN9cyAle3NlbnNp dGl2ZX1zIHNpbmNlIGl0IHByb2Nlc3NlZCAldSBzaWxlbnQgcHVzaGVzIiwgYnVuZGxlSWRlbnRp Zmllci51dGY4KCkuZGF0YSgpLCBzZWN1cml0eU9yaWdpbi51dGY4KCkuZGF0YSgpLCBzaWxlbnRQ dXNoQ291bnQpOworICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiUmVtb3ZpbmcgYWxsIHN1YnNj cmlwdGlvbnMgYXNzb2NpYXRlZCB3aXRoICV7cHVibGljfXMgJXtwcml2YXRlfXMgc2luY2UgaXQg cHJvY2Vzc2VkICV1IHNpbGVudCBwdXNoZXMiLCBidW5kbGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRh KCksIHNlY3VyaXR5T3JpZ2luLnV0ZjgoKS5kYXRhKCksIHNpbGVudFB1c2hDb3VudCk7CiAKICAg ICAgICAgcmVtb3ZlUmVjb3Jkc0ltcGwoYnVuZGxlSWRlbnRpZmllciwgc2VjdXJpdHlPcmlnaW4s IFtoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgc2lsZW50UHVzaENvdW50XShhdXRvJiYpIG11 dGFibGUgewogICAgICAgICAgICAgaGFuZGxlcihzaWxlbnRQdXNoQ291bnQpOwpAQCAtNTI3LDcg KzUzNiw3IEBAIHZvaWQgUHVzaFNlcnZpY2U6OnJlbW92ZVJlY29yZHNJbXBsKGNvbnN0IFN0cmlu ZyYgYnVuZGxlSWRlbnRpZmllciwgY29uc3Qgc3RkOjpvCiAgICAgYXV0byByZW1vdmVkUmVjb3Jk c0hhbmRsZXIgPSBbdGhpcywgYnVuZGxlSWRlbnRpZmllciwgc2VjdXJpdHlPcmlnaW4sIGhhbmRs ZXIgPSBXVEZNb3ZlKGhhbmRsZXIpXShWZWN0b3I8UmVtb3ZlZFB1c2hSZWNvcmQ+JiYgcmVtb3Zl ZFJlY29yZHMpIG11dGFibGUgewogICAgICAgICBmb3IgKGF1dG8mIHJlY29yZCA6IHJlbW92ZWRS ZWNvcmRzKSB7CiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24tPnVuc3Vic2NyaWJlKHJlY29yZC50 b3BpYywgcmVjb3JkLnNlcnZlclZBUElEUHVibGljS2V5LCBbdG9waWMgPSByZWNvcmQudG9waWNd KGJvb2wgdW5zdWJzY3JpYmVkLCBOU0Vycm9yKiBlcnJvcikgewotICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SX0lGKCF1bnN1YnNjcmliZWQsIFB1c2gsICJyZW1vdmVSZWNvcmRzSW1w bCBjb3VsZG4ndCByZW1vdmUgc3Vic2NyaXB0aW9uIGZvciB0b3BpYyAle3NlbnNpdGl2ZX1zOiAl e3B1YmxpY31zIGNvZGU6ICVsbGQpIiwgdG9waWMudXRmOCgpLmRhdGEoKSwgZXJyb3IuZG9tYWlu LlVURjhTdHJpbmcgPzogIm5vbmUiLCBzdGF0aWNfY2FzdDxpbnQ2NF90PihlcnJvci5jb2RlKSk7 CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUYoIXVuc3Vic2NyaWJlZCwgUHVz aCwgInJlbW92ZVJlY29yZHNJbXBsIGNvdWxkbid0IHJlbW92ZSBzdWJzY3JpcHRpb24gZm9yIHRv cGljICV7cHJpdmF0ZX1zOiAle3B1YmxpY31zIGNvZGU6ICVsbGQpIiwgdG9waWMudXRmOCgpLmRh dGEoKSwgZXJyb3IuZG9tYWluLlVURjhTdHJpbmcgPzogIm5vbmUiLCBzdGF0aWNfY2FzdDxpbnQ2 NF90PihlcnJvci5jb2RlKSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCkBAIC01ODMs MjcgKzU5MiwyNyBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxSYXdQdXNoTWVzc2FnZT4gbWFrZVJh d1B1c2hNZXNzYWdlKE5TU3RyaW5nICp0b3BpYywgTlNEaWN0aQogICAgICAgICAgICAgTlNTdHJp bmcgKnNlcnZlclB1YmxpY0tleUJhc2U2NFVSTCA9IHVzZXJJbmZvW0AiYXNfcHVibGlja2V5Il07 CiAgICAgICAgICAgICBOU1N0cmluZyAqc2FsdEJhc2U2NFVSTCA9IHVzZXJJbmZvW0AiYXNfc2Fs dCJdOwogICAgICAgICAgICAgaWYgKCFzZXJ2ZXJQdWJsaWNLZXlCYXNlNjRVUkwgfHwgIXNhbHRC YXNlNjRVUkwpIHsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiRHJvcHBpbmcg YWVzZ2NtLWVuY3J5cHRlZCBwdXNoIHdpdGhvdXQgcmVxdWlyZWQgc2VydmVyIGtleSBhbmQgc2Fs dCIpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJEcm9wcGluZyBh ZXNnY20tZW5jcnlwdGVkIHB1c2ggd2l0aG91dCByZXF1aXJlZCBzZXJ2ZXIga2V5IGFuZCBzYWx0 Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgYXV0byBzZXJ2ZXJQdWJsaWNLZXkgPSBiYXNlNjRVUkxEZWNvZGUoc2Vy dmVyUHVibGljS2V5QmFzZTY0VVJMKTsKICAgICAgICAgICAgIGF1dG8gc2FsdCA9IGJhc2U2NFVS TERlY29kZShzYWx0QmFzZTY0VVJMKTsKICAgICAgICAgICAgIGlmICghc2VydmVyUHVibGljS2V5 IHx8ICFzYWx0KSB7Ci0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIkRyb3BwaW5n IGFlc2djbS1lbmNyeXB0ZWQgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBzZXJ2ZXIga2V5 IGFuZCBzYWx0Iik7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHVzaCwgIkRy b3BwaW5nIGFlc2djbS1lbmNyeXB0ZWQgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBzZXJ2 ZXIga2V5IGFuZCBzYWx0Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsK ICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbWVzc2FnZS5zZXJ2ZXJQdWJsaWNLZXkgPSBX VEZNb3ZlKCpzZXJ2ZXJQdWJsaWNLZXkpOwogICAgICAgICAgICAgbWVzc2FnZS5zYWx0ID0gV1RG TW92ZSgqc2FsdCk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQ dXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIHVua25vd24gY29udGVudCBlbmNvZGluZzogJXtwdWJs aWN9cyIsIGNvbnRlbnRFbmNvZGluZy5VVEY4U3RyaW5nKTsKKyAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKFB1c2gsICJEcm9wcGluZyBwdXNoIHdpdGggdW5rbm93biBjb250ZW50IGVuY29k aW5nOiAle3B1YmxpY31zIiwgY29udGVudEVuY29kaW5nLlVURjhTdHJpbmcpOwogICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gcGF5bG9h ZCA9IGJhc2U2NERlY29kZShwYXlsb2FkQmFzZTY0KTsKICAgICAgICAgaWYgKCFwYXlsb2FkKSB7 Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIGltcHJv cGVybHkgZW5jb2RlZCBwYXlsb2FkIik7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQ dXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBwYXlsb2FkIik7CiAg ICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogICAgICAgICB9CiAgICAgICAgIG1lc3Nh Z2UuZW5jcnlwdGVkUGF5bG9hZCA9IFdURk1vdmUoKnBheWxvYWQpOwpAQCAtNjIwLDcgKzYyOSw3 IEBAIHZvaWQgUHVzaFNlcnZpY2U6OmRpZFJlY2VpdmVQdXNoTWVzc2FnZShOU1N0cmluZyogdG9w aWMsIE5TRGljdGlvbmFyeSogdXNlckluZm8sCiAKICAgICBtX2RhdGFiYXNlLT5nZXRSZWNvcmRC eVRvcGljKHRvcGljLCBbdGhpcywgbWVzc2FnZSA9IFdURk1vdmUoKm1lc3NhZ2VSZXN1bHQpLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShhdXRvJiYgcmVj b3JkUmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFyZWNvcmRSZXN1bHQpIHsKLSAgICAg ICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJEcm9wcGluZyBpbmNvbWluZyBwdXNoIHNlbnQgdG8g dW5rbm93biB0b3BpYzogJXtzZW5zaXRpdmV9cyIsIG1lc3NhZ2UudG9waWMudXRmOCgpLmRhdGEo KSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQdXNoLCAiRHJvcHBpbmcgaW5jb21p bmcgcHVzaCBzZW50IHRvIHVua25vd24gdG9waWM6ICV7cHJpdmF0ZX1zIiwgbWVzc2FnZS50b3Bp Yy51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTY0NCwxMSArNjUzLDEzIEBAIHZvaWQgUHVz aFNlcnZpY2U6OmRpZFJlY2VpdmVQdXNoTWVzc2FnZShOU1N0cmluZyogdG9waWMsIE5TRGljdGlv bmFyeSogdXNlckluZm8sCiAgICAgICAgICAgICBkZWNyeXB0ZWRQYXlsb2FkID0gZGVjcnlwdEFF U0dDTVBheWxvYWQoY2xpZW50S2V5cywgbWVzc2FnZS5zZXJ2ZXJQdWJsaWNLZXksIG1lc3NhZ2Uu c2FsdCwgbWVzc2FnZS5lbmNyeXB0ZWRQYXlsb2FkKTsKIAogICAgICAgICBpZiAoIWRlY3J5cHRl ZFBheWxvYWQpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJEcm9wcGluZyBpbmNv bWluZyBwdXNoIGR1ZSB0byBkZWNyeXB0aW9uIGVycm9yIGZvciB0b3BpYyAle3NlbnNpdGl2ZX1z IiwgbWVzc2FnZS50b3BpYy51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9H X0VSUk9SKFB1c2gsICJEcm9wcGluZyBpbmNvbWluZyBwdXNoIGR1ZSB0byBkZWNyeXB0aW9uIGVy cm9yIGZvciB0b3BpYyAle3ByaXZhdGV9cyIsIG1lc3NhZ2UudG9waWMudXRmOCgpLmRhdGEoKSk7 CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIkRlY29kZWQgaW5jb21pbmcg cHVzaCBtZXNzYWdlIGZvciAle3B1YmxpY31zICV7cHJpdmF0ZX1zIiwgcmVjb3JkLmJ1bmRsZUlE LnV0ZjgoKS5kYXRhKCksIHJlY29yZC5zY29wZS51dGY4KCkuZGF0YSgpKTsKKwogICAgICAgICBt X2luY29taW5nUHVzaE1lc3NhZ2VIYW5kbGVyKHJlY29yZC5idW5kbGVJRCwgV2ViS2l0OjpXZWJQ dXNoTWVzc2FnZSB7IFdURk1vdmUoKmRlY3J5cHRlZFBheWxvYWQpLCBVUkwgeyByZWNvcmQuc2Nv cGUgfSB9KTsKIAogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC93ZWJwdXNoZC9XZWJQdXNoRGFlbW9uLm1tIGIvU291cmNlL1dlYktpdC93ZWJw dXNoZC9XZWJQdXNoRGFlbW9uLm1tCmluZGV4IDZmOTZhZWI4YWVjNmEwZTE0ZDQ2N2U0ZmNiYmY2 MGNiOWUyOWNhYjkuLjNiNjYyY2YzMTI5MmZmMDlhZDk1Nzc0ZTAyMmZjNDk1N2I4M2ZlYTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvV2ViUHVzaERhZW1vbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0KQEAgLTU3Miw3ICs1NzIsNiBA QCB2b2lkIERhZW1vbjo6aW5qZWN0RW5jcnlwdGVkUHVzaE1lc3NhZ2VGb3JUZXN0aW5nKENsaWVu dENvbm5lY3Rpb24qIGNvbm5lY3Rpb24sCiAgICAgICAgICAgICByZXBseVNlbmRlcihmYWxzZSk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgTlNMb2coQCJnb3Qgb2Jq OiAlQCIsIG9iaik7CiAKICAgICAgICAgbV9wdXNoU2VydmljZS0+ZGlkUmVjZWl2ZVB1c2hNZXNz YWdlKG9ialtAInRvcGljIl0sIG9ialtAInVzZXJJbmZvIl0sIFtyZXBseVNlbmRlciA9IFdURk1v dmUocmVwbHlTZW5kZXIpXSgpIG11dGFibGUgewogICAgICAgICAgICAgcmVwbHlTZW5kZXIodHJ1 ZSk7CkBAIC01OTIsNiArNTkxLDggQEAgdm9pZCBEYWVtb246OmhhbmRsZUluY29taW5nUHVzaChj b25zdCBTdHJpbmcmIGJ1bmRsZUlkZW50aWZpZXIsIFdlYktpdDo6V2ViUHVzaE0KIAogdm9pZCBE YWVtb246Om5vdGlmeUNsaWVudFB1c2hNZXNzYWdlSXNBdmFpbGFibGUoY29uc3QgU3RyaW5nJiBj bGllbnRDb2RlU2lnbmluZ0lkZW50aWZpZXIpCiB7CisgICAgUkVMRUFTRV9MT0coUHVzaCwgIkxh dW5jaGluZyAle3B1YmxpY31zIGluIHJlc3BvbnNlIHRvIHB1c2giLCBjbGllbnRDb2RlU2lnbmlu Z0lkZW50aWZpZXIudXRmOCgpLmRhdGEoKSk7CisKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ0ZB cnJheVJlZiB1cmxzID0gKF9fYnJpZGdlIENGQXJyYXlSZWYpQFsgW05TVVJMIFVSTFdpdGhTdHJp bmc6QCJ4LXdlYmtpdC1hcHAtbGF1bmNoOi8vMSJdIF07CiAgICAgQ0ZTdHJpbmdSZWYgaWRlbnRp ZmllciA9IChfX2JyaWRnZSBDRlN0cmluZ1JlZikoKE5TU3RyaW5nICopY2xpZW50Q29kZVNpZ25p bmdJZGVudGlmaWVyKTsKQEAgLTYwNCw3ICs2MDUsOSBAQCB2b2lkIERhZW1vbjo6bm90aWZ5Q2xp ZW50UHVzaE1lc3NhZ2VJc0F2YWlsYWJsZShjb25zdCBTdHJpbmcmIGNsaWVudENvZGVTaWduaW5n SQogICAgICAgICAoaWQpX2tMU09wZW5PcHRpb25IaWRlS2V5OiBAWUVTLAogICAgIH07CiAKLSAg ICBfTFNPcGVuVVJMc1VzaW5nQnVuZGxlSWRlbnRpZmllcldpdGhDb21wbGV0aW9uSGFuZGxlcih1 cmxzLCBpZGVudGlmaWVyLCBvcHRpb25zLCBeKExTQVNOUmVmIG5ld1Byb2Nlc3NTZXJpYWxOdW1i ZXIsIEJvb2xlYW4gcHJvY2Vzc1dhc0xhdW5jaGVkLCBDRkVycm9yUmVmIGNmRXJyb3IpIHsgfSk7 CisgICAgX0xTT3BlblVSTHNVc2luZ0J1bmRsZUlkZW50aWZpZXJXaXRoQ29tcGxldGlvbkhhbmRs ZXIodXJscywgaWRlbnRpZmllciwgb3B0aW9ucywgXihMU0FTTlJlZiwgQm9vbGVhbiwgQ0ZFcnJv clJlZiBjZkVycm9yKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGNmRXJyb3IsIFB1 c2gsICJGYWlsZWQgdG8gbGF1bmNoIHByb2Nlc3MgaW4gcmVzcG9uc2UgdG8gcHVzaDogJXtwdWJs aWN9QCIsIChfX2JyaWRnZSBOU0Vycm9yICopY2ZFcnJvcik7CisgICAgfSk7CiAjZWxzZQogICAg IC8vIEZJWE1FOiBGaWd1cmUgb3V0IGVxdWl2YWxlbnQgaU9TIGNvZGUgaGVyZQogICAgIFVOVVNF RF9QQVJBTShjbGllbnRDb2RlU2lnbmluZ0lkZW50aWZpZXIpOwpAQCAtNjMzLDYgKzYzNiw3IEBA IHZvaWQgRGFlbW9uOjpnZXRQZW5kaW5nUHVzaE1lc3NhZ2VzKENsaWVudENvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIENvbXBsZXRpb25IYW5kCiAgICAgICAgIG1fdGVzdGluZ1B1c2hNZXNzYWdlcy5y ZW1vdmUoaXRlcmF0b3IpOwogICAgIH0KIAorICAgIFJFTEVBU0VfTE9HKFB1c2gsICJGZXRjaGVk ICV6dSBwZW5kaW5nIHB1c2ggbWVzc2FnZXMgZm9yICV7cHVibGljfXMiLCByZXN1bHRNZXNzYWdl cy5zaXplKCksIGhvc3RBcHBDb2RlU2lnbmluZ0lkZW50aWZpZXIudXRmOCgpLmRhdGEoKSk7CiAg ICAgY29ubmVjdGlvbi0+YnJvYWRjYXN0RGVidWdNZXNzYWdlKG1ha2VTdHJpbmcoIkZldGNoaW5n ICIsIFN0cmluZzo6bnVtYmVyKHJlc3VsdE1lc3NhZ2VzLnNpemUoKSksICIgcGVuZGluZyBwdXNo IG1lc3NhZ2VzIikpOwogCiAgICAgcmVwbHlTZW5kZXIoV1RGTW92ZShyZXN1bHRNZXNzYWdlcykp Owo= 456314 2022-03-31 20:20:57 -0700 2022-04-01 13:48:57 -0700 Patch bug-238591-20220331202056.patch text/plain 26764 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFjYjZkNjgyYWI3YmIw Y2I0ZDNlMzZiZDIzMzc2NWZhZDZmZjczMi4uMTM1YTVkN2JmMzNiNDI4NGM5OWM5MmU2YjJlZmQx ZjQwYmI2MzcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAzLTMwICBCZW4g TmhhbSAgPG5oYW1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIHB1c2gtcmVsYXRlZCBs b2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mzg1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgIEFk ZCBsb2dnaW5nIHRvIGhlbHAgZGlhZ25vc2UgUHVzaCBBUEkgZXJyb3JzLiBXZSBjdXJyZW50bHkg bG9nIHZlcnkgbGl0dGxlLCB3aGljaCBpcyBtYWtpbmcKKyAgICAgICAgaXQgaGFyZCBmb3IgdXMg dG8gZGlhZ25vc2UgYnVnIHJlcG9ydHMuCisKKyAgICAgICAgIC0gTG9nIGlmIFB1c2hNYW5hZ2Vy LnN1YnNjcmliZSBmYWlscyB0aGUgdXNlciBnZXN0dXJlIGNoZWNrLiBXZSBsb2cgdGhpcyB0byBi b3RoIHN5c2xvZyBhbmQKKyAgICAgICAgICAgdGhlIGRldmVsb3BlciBjb25zb2xlLiBXZSBkbyB0 aGUgbGF0dGVyIHRvIGluZm9ybSBkZXZlbG9wZXJzLCBhbmQgd2UgYWxyZWFkeSBsb2cgYW4KKyAg ICAgICAgICAgaWRlbnRpY2FsIG1lc3NhZ2UgZnJvbSBOb3RpZmljYXRpb24ucmVxdWVzdFBlcm1p c3Npb24gd2hlbiB0aGF0IGZhaWxzIGluIHRoaXMgbWFubmVyLgorICAgICAgICAgLSBMb2cgaWYg d2UgY2FuJ3QgZmlyZSBhIHB1c2ggZXZlbnQgYmVjYXVzZSB0aGUgc2VydmljZSB3b3JrZXIgcmVn aXN0cmF0aW9uIHdlbnQgYXdheS4KKworICAgICAgICAqIE1vZHVsZXMvcHVzaC1hcGkvUHVzaE1h bmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHVzaE1hbmFnZXI6OnN1YnNjcmliZSk6Cisg ICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTV1NlcnZlcjo6cHJvY2Vzc1B1c2hNZXNzYWdlKToKKwogMjAyMi0wMy0zMSAgRGll Z28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIFVucmV2 aWV3ZWQsIGZpeCBub24tdW5pZmllZCBidWlsZCBhZnRlciByMjkyMTUwCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3 MmNmMTgxNjA0ODZjNzk2OTA0ZWUwYTRiYTVlZTI1NjY4M2NhMjMuLjg3NDFmZWUzYTk0OGI5OTVh MTgxOGVlYjhjNTJlOTdkZDkyMTlmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjIt MDMtMzAgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1vcmUgcHVz aC1yZWxhdGVkIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzODU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisK KyAgICAgICAgQWRkIGxvZ2dpbmcgdG8gaGVscCBkaWFnbm9zZSBQdXNoIEFQSSBlcnJvcnMuIFdl IGN1cnJlbnRseSBsb2cgdmVyeSBsaXR0bGUsIHdoaWNoIGlzIG1ha2luZworICAgICAgICBpdCBo YXJkIGZvciB1cyB0byBkaWFnbm9zZSBidWcgcmVwb3J0cy4KKworICAgICAgICAgLSBMb2cgd2hl biB3ZSB0cnkgdG8gZmV0Y2ggb3IgcHJvY2VzcyBwdXNoIG1lc3NhZ2VzIGluIE5ldHdvcmtQcm9j ZXNzLgorICAgICAgICAgLSBMb2cgd2hlbiB3ZSBlbnF1ZXVlLCBzdGFydCwgYW5kIGZpbmlzaCBh IFB1c2hTZXJ2aWNlUmVxdWVzdC4gVGhpcyBoZWxwcyBjYXRjaCBpc3N1ZXMgc3VjaAorICAgICAg ICAgICBhcyBhIHF1ZXVlZCByZXF1ZXN0IG5ldmVyIHJ1bm5pbmcgYmVjYXVzZSB0aGUgT1MgcHVz aCBkYWVtb24gbmV2ZXIgY29tcGxldGluZyBhIHJlcXVlc3QuCisgICAgICAgICAtIExvZyBpZiB3 ZSBmYWlsZWQgdHJ5aW5nIHRvIHdha2UgdXAgdGhlIGJyb3dzZXIgdG8gcHJvY2VzcyBhIHB1c2gg bWVzc2FnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAg ICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfZ2V0UGVuZGluZ1B1c2hNZXNzYWdlczpdKToKKyAg ICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9wcm9jZXNzUHVzaE1lc3NhZ2U6Y29tcGxldGlv bkhhbmRsZXI6XSk6CisgICAgICAgICogd2VicHVzaGQvUHVzaFNlcnZpY2UubW06CisgICAgICAg IChXZWJQdXNoRDo6UHVzaFNlcnZpY2U6OmNyZWF0ZSk6CisgICAgICAgIChXZWJQdXNoRDo6UHVz aFNlcnZpY2VSZXF1ZXN0SW1wbDo6ZnVsZmlsbCk6CisgICAgICAgIChXZWJQdXNoRDo6UHVzaFNl cnZpY2VSZXF1ZXN0SW1wbDo6cmVqZWN0KToKKyAgICAgICAgKFdlYlB1c2hEOjpTdWJzY3JpYmVS ZXF1ZXN0OjpzdGFydEltcGwpOgorICAgICAgICAoV2ViUHVzaEQ6OlVuc3Vic2NyaWJlUmVxdWVz dDo6c3RhcnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJQdXNoRDo6UHVzaFNlcnZpY2U6OmVucXVl dWVQdXNoU2VydmljZVJlcXVlc3QpOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlOjpp bmNyZW1lbnRTaWxlbnRQdXNoQ291bnQpOgorICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNl OjpyZW1vdmVSZWNvcmRzSW1wbCk6CisgICAgICAgIChXZWJQdXNoRDo6bWFrZVJhd1B1c2hNZXNz YWdlKToKKyAgICAgICAgKFdlYlB1c2hEOjpQdXNoU2VydmljZTo6ZGlkUmVjZWl2ZVB1c2hNZXNz YWdlKToKKyAgICAgICAgKiB3ZWJwdXNoZC9XZWJQdXNoRGFlbW9uLm1tOgorICAgICAgICAoV2Vi UHVzaEQ6OkRhZW1vbjo6aW5qZWN0RW5jcnlwdGVkUHVzaE1lc3NhZ2VGb3JUZXN0aW5nKToKKyAg ICAgICAgKFdlYlB1c2hEOjpEYWVtb246Om5vdGlmeUNsaWVudFB1c2hNZXNzYWdlSXNBdmFpbGFi bGUpOgorICAgICAgICAoV2ViUHVzaEQ6OkRhZW1vbjo6Z2V0UGVuZGluZ1B1c2hNZXNzYWdlcyk6 CisKIDIwMjItMDMtMzEgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlIHB1c2ggc3Vic2NyaXB0aW9ucyB3aGVuIHBlcm1pc3Npb25zIGFyZSByZXNldApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wdXNoLWFwaS9QdXNoTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3B1c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcAppbmRleCA4YzU4 N2Q3Zjg2MDQ4YmE4NTdiZmJlMGM5NWY4OGZhZTRjYzVmNWNhLi4xM2E4NjFmZGQ2ZTFhNmQxZGUy YzVlMTRiZTA2MGFjNjg2NmRkMjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3B1c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3B1 c2gtYXBpL1B1c2hNYW5hZ2VyLmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkV4Y2Vw dGlvbi5oIgogI2luY2x1ZGUgIkpTUHVzaFBlcm1pc3Npb25TdGF0ZS5oIgogI2luY2x1ZGUgIkpT UHVzaFN1YnNjcmlwdGlvbi5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJOb3Rp ZmljYXRpb25DbGllbnQuaCIKICNpbmNsdWRlICJQdXNoQ3J5cHRvLmgiCiAjaW5jbHVkZSAiU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5oIgpAQCAtMTM5LDcgKzE0MCwxMiBAQCB2b2lkIFB1c2hNYW5h Z2VyOjpzdWJzY3JpYmUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgc3RkOjpvcHRp b25hbDxQdXNoUwogCiAgICAgICAgICAgICBhdXRvKiB3aW5kb3cgPSBkb2N1bWVudC5mcmFtZSgp ID8gZG9jdW1lbnQuZnJhbWUoKS0+d2luZG93KCkgOiBudWxscHRyOwogICAgICAgICAgICAgaWYg KCF3aW5kb3cgfHwgIXdpbmRvdy0+Y29uc3VtZVRyYW5zaWVudEFjdGl2YXRpb24oKSkgewotICAg ICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IE5vdEFsbG93ZWRFcnJvciwg IlB1c2ggbm90aWZpY2F0aW9uIHByb21wdGluZyBjYW4gb25seSBiZSBkb25lIGZyb20gYSB1c2Vy IGdlc3R1cmUiX3MgfSk7CisgICAgICAgICAgICAgICAgU2Vjb25kcyBsYXN0QWN0aXZhdGlvbkR1 cmF0aW9uID0gd2luZG93ID8gTW9ub3RvbmljVGltZTo6bm93KCkgLSB3aW5kb3ctPmxhc3RBY3Rp dmF0aW9uVGltZXN0YW1wKCkgOiBTZWNvbmRzOjppbmZpbml0eSgpOworICAgICAgICAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJGYWlsaW5nIFB1c2hNYW5hZ2VyLnN1YnNjcmliZSBj YWxsIGR1ZSB0byBmYWlsZWQgdHJhbnNpZW50IGFjdGl2YXRpb24gY2hlY2s7IGxhc3QgYWN0aXZh dGVkICUuMmYgc2VjIGFnbyIsIGxhc3RBY3RpdmF0aW9uRHVyYXRpb24udmFsdWUoKSk7CisKKyAg ICAgICAgICAgICAgICBhdXRvIGVycm9yTWVzc2FnZSA9ICJQdXNoIG5vdGlmaWNhdGlvbiBwcm9t cHRpbmcgY2FuIG9ubHkgYmUgZG9uZSBmcm9tIGEgdXNlciBnZXN0dXJlLiJfczsKKyAgICAgICAg ICAgICAgICBkb2N1bWVudC5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0 eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdlKTsKKyAgICAgICAgICAgICAgICBw cm9taXNlLnJlamVjdChFeGNlcHRpb24geyBOb3RBbGxvd2VkRXJyb3IsIGVycm9yTWVzc2FnZSB9 KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKaW5kZXggYTMx ZjQ3YmQ1NzdmNmU2MmY2M2Q1OTQwMWM4MzhjNWQ1MWM2NWNjMS4uYzgwNzJiOTFkNDg0ZjliZjQw YzJiMGI1OTg5YzcyYmVhYzAxOGUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTEyODQsMTQgKzEyODQsMTQgQEAgdm9p ZCBTV1NlcnZlcjo6cHJvY2Vzc1B1c2hNZXNzYWdlKHN0ZDo6b3B0aW9uYWw8VmVjdG9yPHVpbnQ4 X3Q+PiYmIGRhdGEsIFVSTCYmIHIKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktl eSByZWdpc3RyYXRpb25LZXkgeyBXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUocmVnaXN0cmF0aW9u VVJMKSB9OwogICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IG1fc2NvcGVUb1JlZ2lzdHJhdGlv bk1hcC5nZXQocmVnaXN0cmF0aW9uS2V5KTsKICAgICAgICAgaWYgKCFyZWdpc3RyYXRpb24pIHsK LSAgICAgICAgICAgIExPRyhQdXNoLCAiQ2Fubm90IHByb2Nlc3MgcHVzaCBtZXNzYXNnZTogRmFp bGVkIHRvIGZpbmQgU1cgcmVnaXN0cmF0aW9uIGZvciByZWdpc3RyYXRpb24ga2V5ICVzIiwgcmVn aXN0cmF0aW9uS2V5LmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJDYW5ub3QgcHJvY2VzcyBwdXNoIG1lc3NhZ2U6IEZh aWxlZCB0byBmaW5kIFNXIHJlZ2lzdHJhdGlvbiBmb3Igc2NvcGUgJSIgUFJJVkFURV9MT0dfU1RS SU5HLCByZWdpc3RyYXRpb25LZXkuc2NvcGUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgICAgIGNhbGxiYWNrKHRydWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKICAgICAgICAgYXV0byogd29ya2VyID0gcmVnaXN0cmF0aW9uLT5hY3RpdmVXb3JrZXIoKTsK ICAgICAgICAgaWYgKCF3b3JrZXIpIHsKLSAgICAgICAgICAgIExPRyhQdXNoLCAiQ2Fubm90IHBy b2Nlc3MgcHVzaCBtZXNzYXNnZTogTm8gYWN0aXZlIHdvcmtlciBmb3IgcmVnaXN0cmF0aW9uIGtl eSAlcyIsIHJlZ2lzdHJhdGlvbktleS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Cisg ICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQdXNoLCAiQ2Fubm90IHByb2Nlc3MgcHVzaCBt ZXNzYWdlOiBObyBhY3RpdmUgd29ya2VyIGZvciBzY29wZSAlIiBQUklWQVRFX0xPR19TVFJJTkcs IHJlZ2lzdHJhdGlvbktleS5zY29wZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAg ICAgICAgY2FsbGJhY2sodHJ1ZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3Bw IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXgg NGFhNjNkYzBlMzg0YTlmNmIyOTVhMThkNjM5MWRhMmVlZTljODBmYi4uYzNiOTVhOTAzZjEwODBl NDIwNWFmMmNiNDE0ZjFlODIxODI2NmI5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIzMTksNyArMjMxOSw2IEBAIHZvaWQgTmV0 d29ya1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQs IFdlYlB1c2hNZXNzYWdlCiAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiUHVzaCBtZXNz YWdlIGZyb20gJSIgUFJJVkFURV9MT0dfU1RSSU5HICIgd29uJ3QgYmUgcHJvY2Vzc2VkIHNpbmNl IHBlcm1pc3Npb24gaXMgaW4gdGhlIHByb21wdCBzdGF0ZTsgcmVtb3ZpbmcgcHVzaCBzdWJzY3Jp cHRpb24iLCBvcmlnaW4udG9TdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIHNl c3Npb24tPm5vdGlmaWNhdGlvbk1hbmFnZXIoKS5yZW1vdmVQdXNoU3Vic2NyaXB0aW9uc0Zvck9y aWdpbihTZWN1cml0eU9yaWdpbkRhdGEgeyBvcmlnaW4gfSwgW2NhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldKGF1dG8mJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soZmFs c2UpOwotICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0pOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0yMzMyLDEwICsyMzMxLDEyIEBAIHZvaWQgTmV0d29y a1Byb2Nlc3M6OnByb2Nlc3NQdXNoTWVzc2FnZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFdl YlB1c2hNZXNzYWdlCiAgICAgICAgIH0KIAogICAgICAgICBBU1NFUlQocGVybWlzc2lvblN0YXRl ID09IFB1c2hQZXJtaXNzaW9uU3RhdGU6OkdyYW50ZWQpOwotICAgICAgICBzZXNzaW9uLT5lbnN1 cmVTV1NlcnZlcigpLnByb2Nlc3NQdXNoTWVzc2FnZShXVEZNb3ZlKHB1c2hNZXNzYWdlLnB1c2hE YXRhKSwgV1RGTW92ZShwdXNoTWVzc2FnZS5yZWdpc3RyYXRpb25VUkwpLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIHNlc3Npb25JRCwgb3JpZ2luID0gV1RGTW92ZShvcmln aW4pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShib29sIHJlc3VsdCkgbXV0YWJsZSB7 CisgICAgICAgIGF1dG8gc2NvcGUgPSBwdXNoTWVzc2FnZS5yZWdpc3RyYXRpb25VUkwuc3RyaW5n KCk7CisgICAgICAgIHNlc3Npb24tPmVuc3VyZVNXU2VydmVyKCkucHJvY2Vzc1B1c2hNZXNzYWdl KFdURk1vdmUocHVzaE1lc3NhZ2UucHVzaERhdGEpLCBXVEZNb3ZlKHB1c2hNZXNzYWdlLnJlZ2lz dHJhdGlvblVSTCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfSwgc2Vzc2lv bklELCBvcmlnaW4gPSBXVEZNb3ZlKG9yaWdpbiksIHNjb3BlID0gV1RGTW92ZShzY29wZSksIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGJvb2wgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAg ICAgICAgIE5ldHdvcmtTZXNzaW9uKiBzZXNzaW9uOwogICAgICAgICAgICAgaWYgKCFyZXN1bHQg JiYgKHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQpKSkgewotICAgICAgICAgICAg ICAgIHNlc3Npb24tPm5vdGlmaWNhdGlvbk1hbmFnZXIoKS5pbmNyZW1lbnRTaWxlbnRQdXNoQ291 bnQoV1RGTW92ZShvcmlnaW4pLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgcmVzdWx0 XSh1bnNpZ25lZCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgc2Vzc2lvbi0+bm90aWZpY2F0 aW9uTWFuYWdlcigpLmluY3JlbWVudFNpbGVudFB1c2hDb3VudChXVEZNb3ZlKG9yaWdpbiksIFtz Y29wZSA9IFdURk1vdmUoc2NvcGUpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCByZXN1 bHRdKHVuc2lnbmVkIG5ld1NpbGVudFB1c2hDb3VudCkgbXV0YWJsZSB7CisgICAgICAgICAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoIG1lc3NhZ2UgZm9yIHNjb3BlICUi IFBSSVZBVEVfTE9HX1NUUklORyAiIG5vdCBoYW5kbGVkIHByb3Blcmx5OyBuZXcgc2lsZW50IHB1 c2ggY291bnQ6ICV1Iiwgc2NvcGUudXRmOCgpLmRhdGEoKSwgbmV3U2lsZW50UHVzaENvdW50KTsK ICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2socmVzdWx0KTsKICAgICAgICAgICAgICAgICB9 KTsKICAgICAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCBkNzY3MTliYTFh ODY0YmI3N2VjM2JkODQxZjVkNDRlODdlYmFiYzBkLi41NmEwZTBkODM5OTI4ZGFlODEyZjA2Y2Iy ODI4YzIyMzY1YjY3Y2U5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAgLTc5OSw3ICs3OTksNyBAQCAtKGJv b2wpX2hhc1NlcnZpY2VXb3JrZXJCYWNrZ3JvdW5kQWN0aXZpdHlGb3JUZXN0aW5nCiAKIC0odm9p ZClfZ2V0UGVuZGluZ1B1c2hNZXNzYWdlczoodm9pZCheKShOU0FycmF5PE5TRGljdGlvbmFyeSAq PiAqKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIExPRyhQdXNoLCAiR2V0dGluZyBwZW5kaW5n IHB1c2ggbWVzc2FnZXMiKTsKKyAgICBSRUxFQVNFX0xPRyhQdXNoLCAiR2V0dGluZyBwZW5kaW5n IHB1c2ggbWVzc2FnZXMiKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKICAgICBfd2Vi c2l0ZURhdGFTdG9yZS0+bmV0d29ya1Byb2Nlc3MoKS5nZXRQZW5kaW5nUHVzaE1lc3NhZ2VzKF93 ZWJzaXRlRGF0YVN0b3JlLT5zZXNzaW9uSUQoKSwgW2NvbXBsZXRpb25IYW5kbGVyID0gbWFrZUJs b2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKGNvbnN0IFZlY3RvcjxXZWJLaXQ6OldlYlB1c2hN ZXNzYWdlPiYgbWVzc2FnZXMpIHsKQEAgLTgwNyw3ICs4MDcsNyBAQCAtKHZvaWQpX2dldFBlbmRp bmdQdXNoTWVzc2FnZXM6KHZvaWQoXikoTlNBcnJheTxOU0RpY3Rpb25hcnkgKj4gKikpY29tcGxl dGlvbkhhbgogICAgICAgICBmb3IgKGF1dG8mIG1lc3NhZ2UgOiBtZXNzYWdlcykKICAgICAgICAg ICAgIFtyZXN1bHQgYWRkT2JqZWN0Om1lc3NhZ2UudG9EaWN0aW9uYXJ5KCldOwogCi0gICAgICAg IExPRyhQdXNoLCAiR2l2aW5nIGFwcGxpY2F0aW9uICV1IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyIs IG1lc3NhZ2VzLnNpemUoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJHaXZpbmcgYXBw bGljYXRpb24gJXp1IHBlbmRpbmcgcHVzaCBtZXNzYWdlcyIsIG1lc3NhZ2VzLnNpemUoKSk7CiAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlc3VsdC5nZXQoKSk7CiAgICAgfSk7CiAjZW5kaWYK QEAgLTgxOCwxNCArODE4LDE0IEBAIC0odm9pZClfcHJvY2Vzc1B1c2hNZXNzYWdlOihOU0RpY3Rp b25hcnkgKilwdXNoTWVzc2FnZURpY3Rpb25hcnkgY29tcGxldGlvbkhhbmRsCiAjaWYgRU5BQkxF KFNFUlZJQ0VfV09SS0VSKQogICAgIGF1dG8gcHVzaE1lc3NhZ2UgPSBXZWJLaXQ6OldlYlB1c2hN ZXNzYWdlOjpmcm9tRGljdGlvbmFyeShwdXNoTWVzc2FnZURpY3Rpb25hcnkpOwogICAgIGlmICgh cHVzaE1lc3NhZ2UpIHsKLSAgICAgICAgTE9HKFB1c2gsICJBc2tlZCB0byBoYW5kbGUgYW4gaW52 YWxpZCBwdXNoIG1lc3NhZ2UiKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHVzaCwgIkFz a2VkIHRvIGhhbmRsZSBhbiBpbnZhbGlkIHB1c2ggbWVzc2FnZSIpOwogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihmYWxzZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBMT0coUHVz aCwgIlNlbmRpbmcgcHVzaCBtZXNzYWdlIHRvIG5ldHdvcmsgcHJvY2VzcyB0byBoYW5kbGUiKTsK KyAgICBSRUxFQVNFX0xPRyhQdXNoLCAiU2VuZGluZyBwdXNoIG1lc3NhZ2UgZm9yIHNjb3BlICUi IFBSSVZBVEVfTE9HX1NUUklORyAiIHRvIG5ldHdvcmsgcHJvY2VzcyB0byBoYW5kbGUiLCBwdXNo TWVzc2FnZS0+cmVnaXN0cmF0aW9uVVJMLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIF93 ZWJzaXRlRGF0YVN0b3JlLT5uZXR3b3JrUHJvY2VzcygpLnByb2Nlc3NQdXNoTWVzc2FnZShfd2Vi c2l0ZURhdGFTdG9yZS0+c2Vzc2lvbklEKCksICpwdXNoTWVzc2FnZSwgW2NvbXBsZXRpb25IYW5k bGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKGJvb2wgd2FzUHJvY2Vzc2Vk KSB7Ci0gICAgICAgIExPRyhQdXNoLCAiUHVzaCBtZXNzYWdlIHByb2Nlc3NpbmcgY29tcGxldGUu IENhbGxiYWNrIHJlc3VsdDogJWkiLCB3YXNQcm9jZXNzZWQpOworICAgICAgICBSRUxFQVNFX0xP RyhQdXNoLCAiUHVzaCBtZXNzYWdlIHByb2Nlc3NpbmcgY29tcGxldGUuIENhbGxiYWNrIHJlc3Vs dDogJWQiLCB3YXNQcm9jZXNzZWQpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih3YXNQcm9j ZXNzZWQpOwogICAgIH0pOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dlYnB1 c2hkL1B1c2hTZXJ2aWNlLm1tIGIvU291cmNlL1dlYktpdC93ZWJwdXNoZC9QdXNoU2VydmljZS5t bQppbmRleCBlZWNjYzEyYzFjY2JkMWE4NDdhMzIyZmQ2MGFjZDUwZWIzMTQ4ZWU4Li5lMjY4NDRk M2I2ODY4OTlmZTczMTdkOWRhNWE0N2U3Mzc4MmYwMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3dlYnB1c2hkL1B1c2hTZXJ2aWNlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQv UHVzaFNlcnZpY2UubW0KQEAgLTYzLDcgKzYzLDcgQEAgdm9pZCBQdXNoU2VydmljZTo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgaW5jb21pbmdQdXNoU2VydmljZU5hbWUsIGNvbnN0IFN0cmluZyYgZGEK IAogICAgIFB1c2hEYXRhYmFzZTo6Y3JlYXRlKGRhdGFiYXNlUGF0aCwgW3RyYW5zYWN0aW9uID0g V1RGTW92ZSh0cmFuc2FjdGlvbiksIGNvbm5lY3Rpb24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pLCBt ZXNzYWdlSGFuZGxlciA9IFdURk1vdmUobWVzc2FnZUhhbmRsZXIpLCBjcmVhdGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNyZWF0aW9uSGFuZGxlcildKGF1dG8mJiBkYXRhYmFzZVJlc3VsdCkgbXV0YWJs ZSB7CiAgICAgICAgIGlmICghZGF0YWJhc2VSZXN1bHQpIHsKLSAgICAgICAgICAgIFJFTEVBU0Vf TE9HKFB1c2gsICJQdXNoIHNlcnZpY2UgaW5pdGlhbGl6YXRpb24gZmFpbGVkIHdpdGggZGF0YWJh c2UgZXJyb3IiKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoIHNl cnZpY2UgaW5pdGlhbGl6YXRpb24gZmFpbGVkIHdpdGggZGF0YWJhc2UgZXJyb3IiKTsKICAgICAg ICAgICAgIGNyZWF0aW9uSGFuZGxlcihzdGQ6OnVuaXF1ZV9wdHI8UHVzaFNlcnZpY2U+KCkpOwog ICAgICAgICAgICAgdHJhbnNhY3Rpb24gPSBudWxscHRyOwogICAgICAgICAgICAgcmV0dXJuOwpA QCAtMTg0LDYgKzE4NCw4IEBAIHB1YmxpYzoKIAogICAgICAgICBTdHJpbmcgdHJhbnNhY3Rpb25E ZXNjcmlwdGlvbiA9IFN0cmluZygiY29tLmFwcGxlLndlYmtpdC53ZWJwdXNoZDoiX3MpICsgZGVz Y3JpcHRpb24oKSArICI6Il9zICsgbV9idW5kbGVJZGVudGlmaWVyICsgIjoiX3MgKyBtX3Njb3Bl OwogICAgICAgICBtX3RyYW5zYWN0aW9uID0gYWRvcHRPU09iamVjdChvc190cmFuc2FjdGlvbl9j cmVhdGUodHJhbnNhY3Rpb25EZXNjcmlwdGlvbi51dGY4KCkuZGF0YSgpKSk7CisKKyAgICAgICAg UkVMRUFTRV9MT0coUHVzaCwgIlN0YXJ0ZWQgcHVzaFNlcnZpY2VSZXF1ZXN0ICV7cHVibGljfXMg KCVwKSBmb3IgYnVuZGxlSUQgPSAle3B1YmxpY31zLCBzY29wZSA9ICV7cHJpdmF0ZX1zIiwgZGVz Y3JpcHRpb24oKS5jaGFyYWN0ZXJzKCksIHRoaXMsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCku ZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBzdGFydEludGVybmFsKCk7 CiAgICAgfQogCkBAIC0yMDEsMTIgKzIwMywxNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGZ1 bGZpbGwoUmVzdWx0VHlwZSByZXN1bHQpCiAgICAgeworICAgICAgICBSRUxFQVNFX0xPRyhQdXNo LCAiRmluaXNoZWQgcHVzaFNlcnZpY2VSZXF1ZXN0ICV7cHVibGljfXMgKCVwKSB3aXRoIHJlc3Vs dCBmb3IgYnVuZGxlSUQgPSAle3B1YmxpY31zLCBzY29wZSA9ICV7cHJpdmF0ZX1zIiwgZGVzY3Jp cHRpb24oKS5jaGFyYWN0ZXJzKCksIHRoaXMsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCkuZGF0 YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgICAgIG1fcmVzdWx0SGFuZGxlcihX VEZNb3ZlKHJlc3VsdCkpOwogICAgICAgICBmaW5pc2goKTsKICAgICB9CiAKICAgICB2b2lkIHJl amVjdChXZWJDb3JlOjpFeGNlcHRpb25EYXRhJiYgZGF0YSkKICAgICB7CisgICAgICAgIFJFTEVB U0VfTE9HKFB1c2gsICJGaW5pc2hlZCBwdXNoU2VydmljZVJlcXVlc3QgJXtwdWJsaWN9cyAoJXAp IHdpdGggZXhjZXB0aW9uIGZvciBidW5kbGVJRCA9ICV7cHVibGljfXMsIHNjb3BlID0gJXtwcml2 YXRlfXMiLCBkZXNjcmlwdGlvbigpLmNoYXJhY3RlcnMoKSwgdGhpcywgbV9idW5kbGVJZGVudGlm aWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CisKICAgICAgICAgbV9y ZXN1bHRIYW5kbGVyKG1ha2VVbmV4cGVjdGVkKFdURk1vdmUoZGF0YSkpKTsKICAgICAgICAgZmlu aXNoKCk7CiAgICAgfQpAQCAtMjkzLDcgKzI5OSw3IEBAIHZvaWQgU3Vic2NyaWJlUmVxdWVzdDo6 c3RhcnRJbXBsKElzUmV0cnkgaXNSZXRyeSkKICAgICAgICAgICAgICAgICB9CiAjZW5kaWYKIAot ICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUo YnVuZGxlSUQ6ICV7cHVibGljfXMsIHNjb3BlOiAle3NlbnNpdGl2ZX1zKSBmYWlsZWQgd2l0aCBk b21haW46ICV7cHVibGljfXMgY29kZTogJWxsZCkiLCBtX2J1bmRsZUlkZW50aWZpZXIudXRmOCgp LmRhdGEoKSwgbV9zY29wZS51dGY4KCkuZGF0YSgpLCBlcnJvci5kb21haW4uVVRGOFN0cmluZywg c3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29kZSkpOworICAgICAgICAgICAgICAgIFJFTEVB U0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUoYnVuZGxlSUQ6ICV7cHVi bGljfXMsIHNjb3BlOiAle3ByaXZhdGV9cykgZmFpbGVkIHdpdGggZG9tYWluOiAle3B1YmxpY31z IGNvZGU6ICVsbGQpIiwgbV9idW5kbGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCksIG1fc2NvcGUu dXRmOCgpLmRhdGEoKSwgZXJyb3IuZG9tYWluLlVURjhTdHJpbmcsIHN0YXRpY19jYXN0PGludDY0 X3Q+KGVycm9yLmNvZGUpKTsKICAgICAgICAgICAgICAgICByZWplY3QoV2ViQ29yZTo6RXhjZXB0 aW9uRGF0YSB7IFdlYkNvcmU6OkFib3J0RXJyb3IsICJGYWlsZWQgZHVlIHRvIGludGVybmFsIHNl cnZpY2UgZXJyb3IiX3MgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQpAQCAtMzEyLDcgKzMxOCw3IEBAIHZvaWQgU3Vic2NyaWJlUmVxdWVzdDo6c3RhcnRJbXBsKElz UmV0cnkgaXNSZXRyeSkKIAogICAgICAgICAgICAgbV9kYXRhYmFzZS5pbnNlcnRSZWNvcmQocmVj b3JkLCBbdGhpc10oYXV0byYmIHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYg KCFyZXN1bHQpIHsKLSAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIlB1c2hN YW5hZ2VyLnN1YnNjcmliZShidW5kbGVJRDogJXtwdWJsaWN9cywgc2NvcGU6ICV7c2Vuc2l0aXZl fXMpIGZhaWxlZCB3aXRoIGRhdGFiYXNlIGVycm9yIiwgbV9idW5kbGVJZGVudGlmaWVyLnV0Zjgo KS5kYXRhKCksIG1fc2NvcGUudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SKFB1c2gsICJQdXNoTWFuYWdlci5zdWJzY3JpYmUoYnVuZGxlSUQ6ICV7 cHVibGljfXMsIHNjb3BlOiAle3ByaXZhdGV9cykgZmFpbGVkIHdpdGggZGF0YWJhc2UgZXJyb3Ii LCBtX2J1bmRsZUlkZW50aWZpZXIudXRmOCgpLmRhdGEoKSwgbV9zY29wZS51dGY4KCkuZGF0YSgp KTsKICAgICAgICAgICAgICAgICAgICAgcmVqZWN0KFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGEgeyBX ZWJDb3JlOjpBYm9ydEVycm9yLCAiRmFpbGVkIGR1ZSB0byBpbnRlcm5hbCBkYXRhYmFzZSBlcnJv ciJfcyB9KTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0K QEAgLTM4OSw3ICszOTUsNyBAQCB2b2lkIFVuc3Vic2NyaWJlUmVxdWVzdDo6c3RhcnRJbnRlcm5h bCgpCiAKICAgICAgICAgICAgIGF1dG8gdG9waWMgPSBtYWtlUHVzaFRvcGljKG1fYnVuZGxlSWRl bnRpZmllciwgbV9zY29wZSk7CiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24udW5zdWJzY3JpYmUo dG9waWMsIHNlcnZlclZBUElEUHVibGljS2V5LCBbdGhpc10oYm9vbCB1bnN1YnNjcmliZWQsIE5T RXJyb3IgKmVycm9yKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJP Ul9JRighdW5zdWJzY3JpYmVkLCBQdXNoLCAiUHVzaFN1YnNjcmlwdGlvbi51bnN1YnNjcmliZShi dW5kbGVJRDogJXtwdWJsaWN9cywgc2NvcGU6ICV7c2Vuc2l0aXZlfXMpIGZhaWxlZCB3aXRoIGRv bWFpbjogJXtwdWJsaWN9cyBjb2RlOiAlbGxkKSIsIG1fYnVuZGxlSWRlbnRpZmllci51dGY4KCku ZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCksIGVycm9yLmRvbWFpbi5VVEY4U3RyaW5nID86 ICJub25lIiwgc3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29kZSkpOworICAgICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKCF1bnN1YnNjcmliZWQsIFB1c2gsICJQdXNoU3Vic2Ny aXB0aW9uLnVuc3Vic2NyaWJlKGJ1bmRsZUlEOiAle3B1YmxpY31zLCBzY29wZTogJXtwcml2YXRl fXMpIGZhaWxlZCB3aXRoIGRvbWFpbjogJXtwdWJsaWN9cyBjb2RlOiAlbGxkKSIsIG1fYnVuZGxl SWRlbnRpZmllci51dGY4KCkuZGF0YSgpLCBtX3Njb3BlLnV0ZjgoKS5kYXRhKCksIGVycm9yLmRv bWFpbi5VVEY4U3RyaW5nID86ICJub25lIiwgc3RhdGljX2Nhc3Q8aW50NjRfdD4oZXJyb3IuY29k ZSkpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtNDA2LDcgKzQx MiwxMCBAQCB2b2lkIFB1c2hTZXJ2aWNlOjplbnF1ZXVlUHVzaFNlcnZpY2VSZXF1ZXN0KFB1c2hT ZXJ2aWNlUmVxdWVzdE1hcCYgbWFwLCBzdGQ6OnVuaQogICAgIH0pOwogCiAgICAgYXV0byBhZGRl ZFJlcXVlc3QgPSByZXF1ZXN0LmdldCgpOwotICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUu YXBwZW5kKFdURk1vdmUocmVxdWVzdCkpOworICAgIGF1dG8mIHF1ZXVlID0gYWRkUmVzdWx0Lml0 ZXJhdG9yLT52YWx1ZTsKKworICAgIFJFTEVBU0VfTE9HKFB1c2gsICJFbnF1ZXVpbmcgUHVzaFNl cnZpY2VSZXF1ZXN0ICVwIChjdXJyZW50IHF1ZXVlIHNpemU6ICV6dSIsIHJlcXVlc3QuZ2V0KCks IHF1ZXVlLnNpemUoKSk7CisgICAgcXVldWUuYXBwZW5kKFdURk1vdmUocmVxdWVzdCkpOwogCiAg ICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQogICAgICAgICBhZGRlZFJlcXVlc3QtPnN0YXJ0 KCk7CkBAIC00OTgsNyArNTA3LDcgQEAgdm9pZCBQdXNoU2VydmljZTo6aW5jcmVtZW50U2lsZW50 UHVzaENvdW50KGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllciwgY29uc3QKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJSZW1v dmluZyBhbGwgc3Vic2NyaXB0aW9ucyBhc3NvY2lhdGVkIHdpdGggJXtwdWJsaWN9cyAle3NlbnNp dGl2ZX1zIHNpbmNlIGl0IHByb2Nlc3NlZCAldSBzaWxlbnQgcHVzaGVzIiwgYnVuZGxlSWRlbnRp Zmllci51dGY4KCkuZGF0YSgpLCBzZWN1cml0eU9yaWdpbi51dGY4KCkuZGF0YSgpLCBzaWxlbnRQ dXNoQ291bnQpOworICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiUmVtb3ZpbmcgYWxsIHN1YnNj cmlwdGlvbnMgYXNzb2NpYXRlZCB3aXRoICV7cHVibGljfXMgJXtwcml2YXRlfXMgc2luY2UgaXQg cHJvY2Vzc2VkICV1IHNpbGVudCBwdXNoZXMiLCBidW5kbGVJZGVudGlmaWVyLnV0ZjgoKS5kYXRh KCksIHNlY3VyaXR5T3JpZ2luLnV0ZjgoKS5kYXRhKCksIHNpbGVudFB1c2hDb3VudCk7CiAKICAg ICAgICAgcmVtb3ZlUmVjb3Jkc0ltcGwoYnVuZGxlSWRlbnRpZmllciwgc2VjdXJpdHlPcmlnaW4s IFtoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgc2lsZW50UHVzaENvdW50XShhdXRvJiYpIG11 dGFibGUgewogICAgICAgICAgICAgaGFuZGxlcihzaWxlbnRQdXNoQ291bnQpOwpAQCAtNTI3LDcg KzUzNiw3IEBAIHZvaWQgUHVzaFNlcnZpY2U6OnJlbW92ZVJlY29yZHNJbXBsKGNvbnN0IFN0cmlu ZyYgYnVuZGxlSWRlbnRpZmllciwgY29uc3Qgc3RkOjpvCiAgICAgYXV0byByZW1vdmVkUmVjb3Jk c0hhbmRsZXIgPSBbdGhpcywgYnVuZGxlSWRlbnRpZmllciwgc2VjdXJpdHlPcmlnaW4sIGhhbmRs ZXIgPSBXVEZNb3ZlKGhhbmRsZXIpXShWZWN0b3I8UmVtb3ZlZFB1c2hSZWNvcmQ+JiYgcmVtb3Zl ZFJlY29yZHMpIG11dGFibGUgewogICAgICAgICBmb3IgKGF1dG8mIHJlY29yZCA6IHJlbW92ZWRS ZWNvcmRzKSB7CiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24tPnVuc3Vic2NyaWJlKHJlY29yZC50 b3BpYywgcmVjb3JkLnNlcnZlclZBUElEUHVibGljS2V5LCBbdG9waWMgPSByZWNvcmQudG9waWNd KGJvb2wgdW5zdWJzY3JpYmVkLCBOU0Vycm9yKiBlcnJvcikgewotICAgICAgICAgICAgICAgIFJF TEVBU0VfTE9HX0VSUk9SX0lGKCF1bnN1YnNjcmliZWQsIFB1c2gsICJyZW1vdmVSZWNvcmRzSW1w bCBjb3VsZG4ndCByZW1vdmUgc3Vic2NyaXB0aW9uIGZvciB0b3BpYyAle3NlbnNpdGl2ZX1zOiAl e3B1YmxpY31zIGNvZGU6ICVsbGQpIiwgdG9waWMudXRmOCgpLmRhdGEoKSwgZXJyb3IuZG9tYWlu LlVURjhTdHJpbmcgPzogIm5vbmUiLCBzdGF0aWNfY2FzdDxpbnQ2NF90PihlcnJvci5jb2RlKSk7 CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUYoIXVuc3Vic2NyaWJlZCwgUHVz aCwgInJlbW92ZVJlY29yZHNJbXBsIGNvdWxkbid0IHJlbW92ZSBzdWJzY3JpcHRpb24gZm9yIHRv cGljICV7cHJpdmF0ZX1zOiAle3B1YmxpY31zIGNvZGU6ICVsbGQpIiwgdG9waWMudXRmOCgpLmRh dGEoKSwgZXJyb3IuZG9tYWluLlVURjhTdHJpbmcgPzogIm5vbmUiLCBzdGF0aWNfY2FzdDxpbnQ2 NF90PihlcnJvci5jb2RlKSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCkBAIC01ODMs MjcgKzU5MiwyNyBAQCBzdGF0aWMgc3RkOjpvcHRpb25hbDxSYXdQdXNoTWVzc2FnZT4gbWFrZVJh d1B1c2hNZXNzYWdlKE5TU3RyaW5nICp0b3BpYywgTlNEaWN0aQogICAgICAgICAgICAgTlNTdHJp bmcgKnNlcnZlclB1YmxpY0tleUJhc2U2NFVSTCA9IHVzZXJJbmZvW0AiYXNfcHVibGlja2V5Il07 CiAgICAgICAgICAgICBOU1N0cmluZyAqc2FsdEJhc2U2NFVSTCA9IHVzZXJJbmZvW0AiYXNfc2Fs dCJdOwogICAgICAgICAgICAgaWYgKCFzZXJ2ZXJQdWJsaWNLZXlCYXNlNjRVUkwgfHwgIXNhbHRC YXNlNjRVUkwpIHsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiRHJvcHBpbmcg YWVzZ2NtLWVuY3J5cHRlZCBwdXNoIHdpdGhvdXQgcmVxdWlyZWQgc2VydmVyIGtleSBhbmQgc2Fs dCIpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJEcm9wcGluZyBh ZXNnY20tZW5jcnlwdGVkIHB1c2ggd2l0aG91dCByZXF1aXJlZCBzZXJ2ZXIga2V5IGFuZCBzYWx0 Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgYXV0byBzZXJ2ZXJQdWJsaWNLZXkgPSBiYXNlNjRVUkxEZWNvZGUoc2Vy dmVyUHVibGljS2V5QmFzZTY0VVJMKTsKICAgICAgICAgICAgIGF1dG8gc2FsdCA9IGJhc2U2NFVS TERlY29kZShzYWx0QmFzZTY0VVJMKTsKICAgICAgICAgICAgIGlmICghc2VydmVyUHVibGljS2V5 IHx8ICFzYWx0KSB7Ci0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIkRyb3BwaW5n IGFlc2djbS1lbmNyeXB0ZWQgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBzZXJ2ZXIga2V5 IGFuZCBzYWx0Iik7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHVzaCwgIkRy b3BwaW5nIGFlc2djbS1lbmNyeXB0ZWQgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBzZXJ2 ZXIga2V5IGFuZCBzYWx0Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsK ICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbWVzc2FnZS5zZXJ2ZXJQdWJsaWNLZXkgPSBX VEZNb3ZlKCpzZXJ2ZXJQdWJsaWNLZXkpOwogICAgICAgICAgICAgbWVzc2FnZS5zYWx0ID0gV1RG TW92ZSgqc2FsdCk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQ dXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIHVua25vd24gY29udGVudCBlbmNvZGluZzogJXtwdWJs aWN9cyIsIGNvbnRlbnRFbmNvZGluZy5VVEY4U3RyaW5nKTsKKyAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKFB1c2gsICJEcm9wcGluZyBwdXNoIHdpdGggdW5rbm93biBjb250ZW50IGVuY29k aW5nOiAle3B1YmxpY31zIiwgY29udGVudEVuY29kaW5nLlVURjhTdHJpbmcpOwogICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gcGF5bG9h ZCA9IGJhc2U2NERlY29kZShwYXlsb2FkQmFzZTY0KTsKICAgICAgICAgaWYgKCFwYXlsb2FkKSB7 Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQdXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIGltcHJv cGVybHkgZW5jb2RlZCBwYXlsb2FkIik7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQ dXNoLCAiRHJvcHBpbmcgcHVzaCB3aXRoIGltcHJvcGVybHkgZW5jb2RlZCBwYXlsb2FkIik7CiAg ICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogICAgICAgICB9CiAgICAgICAgIG1lc3Nh Z2UuZW5jcnlwdGVkUGF5bG9hZCA9IFdURk1vdmUoKnBheWxvYWQpOwpAQCAtNjIwLDcgKzYyOSw3 IEBAIHZvaWQgUHVzaFNlcnZpY2U6OmRpZFJlY2VpdmVQdXNoTWVzc2FnZShOU1N0cmluZyogdG9w aWMsIE5TRGljdGlvbmFyeSogdXNlckluZm8sCiAKICAgICBtX2RhdGFiYXNlLT5nZXRSZWNvcmRC eVRvcGljKHRvcGljLCBbdGhpcywgbWVzc2FnZSA9IFdURk1vdmUoKm1lc3NhZ2VSZXN1bHQpLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShhdXRvJiYgcmVj b3JkUmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFyZWNvcmRSZXN1bHQpIHsKLSAgICAg ICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJEcm9wcGluZyBpbmNvbWluZyBwdXNoIHNlbnQgdG8g dW5rbm93biB0b3BpYzogJXtzZW5zaXRpdmV9cyIsIG1lc3NhZ2UudG9waWMudXRmOCgpLmRhdGEo KSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQdXNoLCAiRHJvcHBpbmcgaW5jb21p bmcgcHVzaCBzZW50IHRvIHVua25vd24gdG9waWM6ICV7cHJpdmF0ZX1zIiwgbWVzc2FnZS50b3Bp Yy51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTY0NCwxMSArNjUzLDEzIEBAIHZvaWQgUHVz aFNlcnZpY2U6OmRpZFJlY2VpdmVQdXNoTWVzc2FnZShOU1N0cmluZyogdG9waWMsIE5TRGljdGlv bmFyeSogdXNlckluZm8sCiAgICAgICAgICAgICBkZWNyeXB0ZWRQYXlsb2FkID0gZGVjcnlwdEFF U0dDTVBheWxvYWQoY2xpZW50S2V5cywgbWVzc2FnZS5zZXJ2ZXJQdWJsaWNLZXksIG1lc3NhZ2Uu c2FsdCwgbWVzc2FnZS5lbmNyeXB0ZWRQYXlsb2FkKTsKIAogICAgICAgICBpZiAoIWRlY3J5cHRl ZFBheWxvYWQpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFB1c2gsICJEcm9wcGluZyBpbmNv bWluZyBwdXNoIGR1ZSB0byBkZWNyeXB0aW9uIGVycm9yIGZvciB0b3BpYyAle3NlbnNpdGl2ZX1z IiwgbWVzc2FnZS50b3BpYy51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9H X0VSUk9SKFB1c2gsICJEcm9wcGluZyBpbmNvbWluZyBwdXNoIGR1ZSB0byBkZWNyeXB0aW9uIGVy cm9yIGZvciB0b3BpYyAle3ByaXZhdGV9cyIsIG1lc3NhZ2UudG9waWMudXRmOCgpLmRhdGEoKSk7 CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgUkVMRUFTRV9MT0coUHVzaCwgIkRlY29kZWQgaW5jb21pbmcg cHVzaCBtZXNzYWdlIGZvciAle3B1YmxpY31zICV7cHJpdmF0ZX1zIiwgcmVjb3JkLmJ1bmRsZUlE LnV0ZjgoKS5kYXRhKCksIHJlY29yZC5zY29wZS51dGY4KCkuZGF0YSgpKTsKKwogICAgICAgICBt X2luY29taW5nUHVzaE1lc3NhZ2VIYW5kbGVyKHJlY29yZC5idW5kbGVJRCwgV2ViS2l0OjpXZWJQ dXNoTWVzc2FnZSB7IFdURk1vdmUoKmRlY3J5cHRlZFBheWxvYWQpLCBVUkwgeyByZWNvcmQuc2Nv cGUgfSB9KTsKIAogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC93ZWJwdXNoZC9XZWJQdXNoRGFlbW9uLm1tIGIvU291cmNlL1dlYktpdC93ZWJw dXNoZC9XZWJQdXNoRGFlbW9uLm1tCmluZGV4IDZmOTZhZWI4YWVjNmEwZTE0ZDQ2N2U0ZmNiYmY2 MGNiOWUyOWNhYjkuLjNiNjYyY2YzMTI5MmZmMDlhZDk1Nzc0ZTAyMmZjNDk1N2I4M2ZlYTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvV2ViUHVzaERhZW1vbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0KQEAgLTU3Miw3ICs1NzIsNiBA QCB2b2lkIERhZW1vbjo6aW5qZWN0RW5jcnlwdGVkUHVzaE1lc3NhZ2VGb3JUZXN0aW5nKENsaWVu dENvbm5lY3Rpb24qIGNvbm5lY3Rpb24sCiAgICAgICAgICAgICByZXBseVNlbmRlcihmYWxzZSk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgTlNMb2coQCJnb3Qgb2Jq OiAlQCIsIG9iaik7CiAKICAgICAgICAgbV9wdXNoU2VydmljZS0+ZGlkUmVjZWl2ZVB1c2hNZXNz YWdlKG9ialtAInRvcGljIl0sIG9ialtAInVzZXJJbmZvIl0sIFtyZXBseVNlbmRlciA9IFdURk1v dmUocmVwbHlTZW5kZXIpXSgpIG11dGFibGUgewogICAgICAgICAgICAgcmVwbHlTZW5kZXIodHJ1 ZSk7CkBAIC01OTIsNiArNTkxLDggQEAgdm9pZCBEYWVtb246OmhhbmRsZUluY29taW5nUHVzaChj b25zdCBTdHJpbmcmIGJ1bmRsZUlkZW50aWZpZXIsIFdlYktpdDo6V2ViUHVzaE0KIAogdm9pZCBE YWVtb246Om5vdGlmeUNsaWVudFB1c2hNZXNzYWdlSXNBdmFpbGFibGUoY29uc3QgU3RyaW5nJiBj bGllbnRDb2RlU2lnbmluZ0lkZW50aWZpZXIpCiB7CisgICAgUkVMRUFTRV9MT0coUHVzaCwgIkxh dW5jaGluZyAle3B1YmxpY31zIGluIHJlc3BvbnNlIHRvIHB1c2giLCBjbGllbnRDb2RlU2lnbmlu Z0lkZW50aWZpZXIudXRmOCgpLmRhdGEoKSk7CisKICNpZiBQTEFURk9STShNQUMpCiAgICAgQ0ZB cnJheVJlZiB1cmxzID0gKF9fYnJpZGdlIENGQXJyYXlSZWYpQFsgW05TVVJMIFVSTFdpdGhTdHJp bmc6QCJ4LXdlYmtpdC1hcHAtbGF1bmNoOi8vMSJdIF07CiAgICAgQ0ZTdHJpbmdSZWYgaWRlbnRp ZmllciA9IChfX2JyaWRnZSBDRlN0cmluZ1JlZikoKE5TU3RyaW5nICopY2xpZW50Q29kZVNpZ25p bmdJZGVudGlmaWVyKTsKQEAgLTYwNCw3ICs2MDUsOSBAQCB2b2lkIERhZW1vbjo6bm90aWZ5Q2xp ZW50UHVzaE1lc3NhZ2VJc0F2YWlsYWJsZShjb25zdCBTdHJpbmcmIGNsaWVudENvZGVTaWduaW5n SQogICAgICAgICAoaWQpX2tMU09wZW5PcHRpb25IaWRlS2V5OiBAWUVTLAogICAgIH07CiAKLSAg ICBfTFNPcGVuVVJMc1VzaW5nQnVuZGxlSWRlbnRpZmllcldpdGhDb21wbGV0aW9uSGFuZGxlcih1 cmxzLCBpZGVudGlmaWVyLCBvcHRpb25zLCBeKExTQVNOUmVmIG5ld1Byb2Nlc3NTZXJpYWxOdW1i ZXIsIEJvb2xlYW4gcHJvY2Vzc1dhc0xhdW5jaGVkLCBDRkVycm9yUmVmIGNmRXJyb3IpIHsgfSk7 CisgICAgX0xTT3BlblVSTHNVc2luZ0J1bmRsZUlkZW50aWZpZXJXaXRoQ29tcGxldGlvbkhhbmRs ZXIodXJscywgaWRlbnRpZmllciwgb3B0aW9ucywgXihMU0FTTlJlZiwgQm9vbGVhbiwgQ0ZFcnJv clJlZiBjZkVycm9yKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGNmRXJyb3IsIFB1 c2gsICJGYWlsZWQgdG8gbGF1bmNoIHByb2Nlc3MgaW4gcmVzcG9uc2UgdG8gcHVzaDogJXtwdWJs aWN9QCIsIChfX2JyaWRnZSBOU0Vycm9yICopY2ZFcnJvcik7CisgICAgfSk7CiAjZWxzZQogICAg IC8vIEZJWE1FOiBGaWd1cmUgb3V0IGVxdWl2YWxlbnQgaU9TIGNvZGUgaGVyZQogICAgIFVOVVNF RF9QQVJBTShjbGllbnRDb2RlU2lnbmluZ0lkZW50aWZpZXIpOwpAQCAtNjMzLDYgKzYzNiw3IEBA IHZvaWQgRGFlbW9uOjpnZXRQZW5kaW5nUHVzaE1lc3NhZ2VzKENsaWVudENvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIENvbXBsZXRpb25IYW5kCiAgICAgICAgIG1fdGVzdGluZ1B1c2hNZXNzYWdlcy5y ZW1vdmUoaXRlcmF0b3IpOwogICAgIH0KIAorICAgIFJFTEVBU0VfTE9HKFB1c2gsICJGZXRjaGVk ICV6dSBwZW5kaW5nIHB1c2ggbWVzc2FnZXMgZm9yICV7cHVibGljfXMiLCByZXN1bHRNZXNzYWdl cy5zaXplKCksIGhvc3RBcHBDb2RlU2lnbmluZ0lkZW50aWZpZXIudXRmOCgpLmRhdGEoKSk7CiAg ICAgY29ubmVjdGlvbi0+YnJvYWRjYXN0RGVidWdNZXNzYWdlKG1ha2VTdHJpbmcoIkZldGNoaW5n ICIsIFN0cmluZzo6bnVtYmVyKHJlc3VsdE1lc3NhZ2VzLnNpemUoKSksICIgcGVuZGluZyBwdXNo IG1lc3NhZ2VzIikpOwogCiAgICAgcmVwbHlTZW5kZXIoV1RGTW92ZShyZXN1bHRNZXNzYWdlcykp OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IGM1Yzc2MTgzZDU2YmNjNmZiODg0MTdlMmI0YWViNmNhZDgwZTJhN2QuLjA2MTUy NmQzZGVmYmMwYzk2NTRjOTk4ZGM0NGQxYjllNjNiNzA5YjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAyMi0wMy0zMSAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQg bW9yZSBwdXNoLXJlbGF0ZWQgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM4NTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZh YmxldC4KKworICAgICAgICBNb2RpZnkgdGVzdCBjYXNlcyB0byBjaGVjayBmb3IgdXNlciBnZXN0 dXJlIGVycm9yIGNvbnNvbGUgbWVzc2FnZS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvcHVzaC1h cGkvc3Vic2NyaWJlLWRlZmF1bHQtcGVybWlzc2lvbnMtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGh0dHAvdGVzdHMvcHVzaC1hcGkvc3Vic2NyaWJlLWRlZmF1bHQtcGVybWlzc2lvbnMtaWZyYW1l LXNhbWUtb3JpZ2luLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3B1c2gtYXBp L3N1YnNjcmliZS1kZW55LXBlcm1pc3Npb25zLW9uLXByb21wdC1leHBlY3RlZC50eHQ6CisKIDIw MjItMDMtMzEgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHB1 c2ggc3Vic2NyaXB0aW9ucyB3aGVuIHBlcm1pc3Npb25zIGFyZSByZXNldApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wdXNoLWFwaS9zdWJzY3JpYmUtZGVmYXVsdC1wZXJtaXNz aW9ucy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3B1c2gtYXBpL3N1YnNj cmliZS1kZWZhdWx0LXBlcm1pc3Npb25zLWV4cGVjdGVkLnR4dAppbmRleCA3OThlNDFkZjRhZmQx OTc3ODJmYzNjMDk5NTUwMjBkZGMxYzdkMmJkLi4zMzAwMGUwMjA4NjQ1MjE3YzJiNGI4M2FhNDBl ZGQ4MGM0OTIwYzBmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3B1c2gtYXBp L3N1YnNjcmliZS1kZWZhdWx0LXBlcm1pc3Npb25zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3B1c2gtYXBpL3N1YnNjcmliZS1kZWZhdWx0LXBlcm1pc3Npb25zLWV4 cGVjdGVkLnR4dApAQCAtMSwzICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTogUHVzaCBub3RpZmlj YXRpb24gcHJvbXB0aW5nIGNhbiBvbmx5IGJlIGRvbmUgZnJvbSBhIHVzZXIgZ2VzdHVyZS4KIFBB U1M6IHNlcnZpY2Ugd29ya2VyIHBlcm1pc3Npb25TdGF0ZSB3YXMgcHJvbXB0CiBQQVNTOiBkb2N1 bWVudCBwZXJtaXNzaW9uU3RhdGUgd2FzIHByb21wdAogUEFTUzogc2VydmljZSB3b3JrZXIgc3Vi c2NyaWJlIHdhcyBlcnJvcjogTm90QWxsb3dlZEVycm9yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3B1c2gtYXBpL3N1YnNjcmliZS1kZWZhdWx0LXBlcm1pc3Npb25zLWlmcmFt ZS1zYW1lLW9yaWdpbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3B1c2gt YXBpL3N1YnNjcmliZS1kZWZhdWx0LXBlcm1pc3Npb25zLWlmcmFtZS1zYW1lLW9yaWdpbi1leHBl Y3RlZC50eHQKaW5kZXggMWUwNWNjNWVhMjg4ODE4YTEwOWFmMzY5YzcyM2E0NjBmNzk4NGNhMi4u YjkyNzEwYWQ1NWYyMDlkZWIyNjM1NTE5ZmU3NmQ4Y2QwMmEwZmJhMiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9wdXNoLWFwaS9zdWJzY3JpYmUtZGVmYXVsdC1wZXJtaXNzaW9u cy1pZnJhbWUtc2FtZS1vcmlnaW4tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvcHVzaC1hcGkvc3Vic2NyaWJlLWRlZmF1bHQtcGVybWlzc2lvbnMtaWZyYW1lLXNhbWUt b3JpZ2luLWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDQgQEAKK0NPTlNPTEUgTUVTU0FHRTogUHVz aCBub3RpZmljYXRpb24gcHJvbXB0aW5nIGNhbiBvbmx5IGJlIGRvbmUgZnJvbSBhIHVzZXIgZ2Vz dHVyZS4KIAogUEFTUzogc2VydmljZSB3b3JrZXIgcGVybWlzc2lvblN0YXRlIHdhcyBwcm9tcHQK IFBBU1M6IGRvY3VtZW50IHBlcm1pc3Npb25TdGF0ZSB3YXMgcHJvbXB0CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3B1c2gtYXBpL3N1YnNjcmliZS1kZW55LXBlcm1pc3Npb25z LW9uLXByb21wdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3B1c2gtYXBp L3N1YnNjcmliZS1kZW55LXBlcm1pc3Npb25zLW9uLXByb21wdC1leHBlY3RlZC50eHQKaW5kZXgg ZWYzYTc3NTc3MjgxNDc3NDdhNGFkOWI0NWMxODQxOGUxZWI0ZDIxZS4uMmY3ZmI5OWZkNWIyZDEy NzhjOGUwNzk1ZmMxMDAyYWEwMGY1NzU0YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9wdXNoLWFwaS9zdWJzY3JpYmUtZGVueS1wZXJtaXNzaW9ucy1vbi1wcm9tcHQtZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcHVzaC1hcGkvc3Vic2NyaWJlLWRl bnktcGVybWlzc2lvbnMtb24tcHJvbXB0LWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDUgQEAKK0NP TlNPTEUgTUVTU0FHRTogUHVzaCBub3RpZmljYXRpb24gcHJvbXB0aW5nIGNhbiBvbmx5IGJlIGRv bmUgZnJvbSBhIHVzZXIgZ2VzdHVyZS4KK0NPTlNPTEUgTUVTU0FHRTogUHVzaCBub3RpZmljYXRp b24gcHJvbXB0aW5nIGNhbiBvbmx5IGJlIGRvbmUgZnJvbSBhIHVzZXIgZ2VzdHVyZS4KIFBBU1M6 IHNlcnZpY2Ugd29ya2VyIHBlcm1pc3Npb25TdGF0ZSB3YXMgcHJvbXB0CiBQQVNTOiBkb2N1bWVu dCBwZXJtaXNzaW9uU3RhdGUgd2FzIHByb21wdAogUEFTUzogc2VydmljZSB3b3JrZXIgc3Vic2Ny aWJlIHdhcyBlcnJvcjogTm90QWxsb3dlZEVycm9yCg==