232890 2021-11-09 09:57:37 -0800 [Monterey] TestWebKitAPI.PrivateClickMeasurement.Daemon* tests timing out: Failed to connect to mach service org.webkit.pcmtestdaemon.service 2021-12-18 19:39:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ryanhaddad achristensen achristensen beidson cdumez webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1813200 0 ryanhaddad 2021-11-09 09:57:37 -0800 The following two tests are timing out on Monterey bots with the message: "Failed to connect to mach service org.webkit.pcmtestdaemon.service, reason: failed at lookup with error 3 - No such process". This has been happening since the Monterey queues were brought up. TestWebKitAPI.PrivateClickMeasurement.DaemonBasicFunctionality TestWebKitAPI.PrivateClickMeasurement.DaemonDebugMode https://build.webkit.org/#/builders/365/builds/35/steps/17/logs/stdio https://results.webkit.org/?suite=api-tests&suite=api-tests&test=TestWebKitAPI.PrivateClickMeasurement.DaemonBasicFunctionality&test=TestWebKitAPI.PrivateClickMeasurement.DaemonDebugMode 1813201 1 webkit-bug-importer 2021-11-09 09:58:30 -0800 <rdar://problem/85207672> 1816165 2 ryanhaddad 2021-11-17 15:46:29 -0800 Disabled tests in r285962 1816582 3 achristensen 2021-11-18 13:01:48 -0800 OSLaunchdJob.submit is returning this error: Error Domain=OSLaunchdErrorDomain Code=144 "Requestor lacks required entitlement" UserInfo={NSLocalizedFailureReason=Requestor lacks required entitlement} Relevant, from building: Code Signing Warning: "TestWebKitAPI" isn't code signed but requires entitlements. It is not possible to add entitlements to a binary without signing it. 1825386 4 achristensen 2021-12-18 15:08:58 -0800 *** Bug 234482 has been marked as a duplicate of this bug. *** 1825387 5 447533 achristensen 2021-12-18 15:25:10 -0800 Created attachment 447533 Patch 1825398 6 447533 beidson 2021-12-18 17:21:51 -0800 Comment on attachment 447533 Patch You made the changes to both adattributiond and webpushd tests, but left the webpush tests disabled. Could you enable them and go through another EWS pass? R+ with that. 1825403 7 447533 achristensen 2021-12-18 18:55:56 -0800 Comment on attachment 447533 Patch They seem to need some more work to get them working, though I'm confident this was a step in the right direction. 1825405 8 ews-feeder 2021-12-18 19:39:18 -0800 Committed r287234 (245394@main): <https://commits.webkit.org/245394@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447533. 447533 2021-12-18 15:25:10 -0800 2021-12-18 19:39:19 -0800 Patch bug-232890-20211218152509.patch text/plain 18055 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWI0Mzg4Y2M3ZTdjNDYzZDE5NGNjZjViYzk2YzUxYTM0 YWY3YWFlZC4uY2U3MjVlMjc0Y2RiZmZmMjEzZjBjNTcyMjI3MmQ0ZTFlZTE1NmQ5NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIxLTEyLTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgW01vbnRlcmV5XSBUZXN0V2ViS2l0QVBJLlByaXZhdGVDbGlja01lYXN1 cmVtZW50LkRhZW1vbiogdGVzdHMgdGltaW5nIG91dDogRmFpbGVkIHRvIGNvbm5lY3QgdG8gbWFj aCBzZXJ2aWNlIG9yZy53ZWJraXQucGNtdGVzdGRhZW1vbi5zZXJ2aWNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI4OTAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBPU0xhdW5jaGRKb2Igb24g bWFjT1Mgd29ya3MsIGJ1dCBpdCByZXF1aXJlcyBhIHByaXZhdGUgZW50aXRsZW1lbnQgd2hpY2gg dGhlIHB1YmxpYyBTREsgY2FuJ3Qgc2lnbiB3aXRoLgorICAgICAgICBKdXN0IGNvbnRpbnVlIHVz aW5nIGxhdW5jaGN0bCBpbnN0ZWFkLiAgQWxzbywgZG8gdGhlIE5TRGljdGlvbmFyeSAtPiB4cGMg ZGljdGlvbmFyeSBjb252ZXJzaW9uIGF0IHJ1bnRpbWUgdG8gcmVkdWNlIGR1cGxpY2F0ZSBjb2Rl LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9UZXN0V2ViS2l0QVBJ LW1hY09TLWludGVybmFsLmVudGl0bGVtZW50czoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0Nv bmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEktbWFjT1MuZW50aXRsZW1lbnRzOgorICAgICAgICAq IFRlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvVGVzdFdlYktpdEFQSS54Y2NvbmZpZzoKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24u bW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjp0ZXN0RGFlbW9uUExpc3QpOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XZWJQdXNoRGFlbW9uLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6dGVzdFdl YlB1c2hEYWVtb25QTGlzdCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpzZXRVcFRlc3RXZWJQ dXNoRCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9EYWVtb25UZXN0VXRpbGl0aWVz Lmg6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9EYWVtb25UZXN0VXRpbGl0aWVzLm1t OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6Y29udmVydEFycmF5VG9YUEMpOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6Y29udmVydERpY3Rpb25hcnlUb1hQQyk6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpyZWdpc3RlclBsaXN0V2l0aExhdW5jaEQpOgorCiAyMDIxLTEyLTE3ICBZdXN1a2Ug U3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gRml4IHJ1bnNjcmlw dCdzIHN0YW5kYWxvbmUgYWJpbGl0eSB0byBydW4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvQ29uZmlndXJhdGlvbnMvVGVzdFdlYktpdEFQSS1tYWNPUy1pbnRlcm5hbC5lbnRpdGxl bWVudHMgYi9Ub29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEkt bWFjT1MtaW50ZXJuYWwuZW50aXRsZW1lbnRzCmluZGV4IDZmYzI0YzRhMDQ1NjU0YWJmODNhNWY5 ZDRiNTc2ODIxMTExMGRiMzAuLjdkNDJiOTUwODZlNjg1NDU3OWZiNmQ5MmM1ZTY3MmQxYWI3ZTRi MDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvVGVzdFdl YktpdEFQSS1tYWNPUy1pbnRlcm5hbC5lbnRpdGxlbWVudHMKKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9Db25maWd1cmF0aW9ucy9UZXN0V2ViS2l0QVBJLW1hY09TLWludGVybmFsLmVudGl0bGVt ZW50cwpAQCAtMiw4ICsyLDYgQEAKIDwhRE9DVFlQRSBwbGlzdCBQVUJMSUMgIi0vL0FwcGxlLy9E VEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cuYXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0 LTEuMC5kdGQiPgogPHBsaXN0IHZlcnNpb249IjEuMCI+CiA8ZGljdD4KLQk8a2V5PmNvbS5hcHBs ZS5wcml2YXRlLnhwYy5sYXVuY2hkLmpvYi1tYW5hZ2VyPC9rZXk+Ci0JPHN0cmluZz5UZXN0V2Vi S2l0QVBJPC9zdHJpbmc+CiAJPGtleT5jb20uYXBwbGUucHJpdmF0ZS53ZWJraXQud2VicHVzaDwv a2V5PgogCTx0cnVlLz4KIAk8a2V5PmNvbS5hcHBsZS5wcml2YXRlLndlYmtpdC53ZWJwdXNoLmlu amVjdDwva2V5PgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9u cy9UZXN0V2ViS2l0QVBJLW1hY09TLmVudGl0bGVtZW50cyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Q29uZmlndXJhdGlvbnMvVGVzdFdlYktpdEFQSS1tYWNPUy5lbnRpdGxlbWVudHMKaW5kZXggY2M5 NjIxMDRhMzQ5NzllNjIwNGQ0MjVkNGZiMjJmNDcwZjkzMWQ0ZC4uMzAyZmQzZTYyZTEzN2UwNDMw NTllZDk1NjkyOTc1NTZlMzNlNzc3NyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9D b25maWd1cmF0aW9ucy9UZXN0V2ViS2l0QVBJLW1hY09TLmVudGl0bGVtZW50cworKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEktbWFjT1MuZW50aXRs ZW1lbnRzCkBAIC0yLDggKzIsNiBAQAogPCFET0NUWVBFIHBsaXN0IFBVQkxJQyAiLS8vQXBwbGUv L0RURCBQTElTVCAxLjAvL0VOIiAiaHR0cDovL3d3dy5hcHBsZS5jb20vRFREcy9Qcm9wZXJ0eUxp c3QtMS4wLmR0ZCI+CiA8cGxpc3QgdmVyc2lvbj0iMS4wIj4KIDxkaWN0PgotCTxrZXk+Y29tLmFw cGxlLnByaXZhdGUueHBjLmxhdW5jaGQuam9iLW1hbmFnZXI8L2tleT4KLQk8c3RyaW5nPlRlc3RX ZWJLaXRBUEk8L3N0cmluZz4KIAk8a2V5PmtleWNoYWluLWFjY2Vzcy1ncm91cHM8L2tleT4KIAk8 YXJyYXk+CiAJCTxzdHJpbmc+Y29tLmFwcGxlLlRlc3RXZWJLaXRBUEk8L3N0cmluZz4KZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvVGVzdFdlYktpdEFQSS54 Y2NvbmZpZyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvVGVzdFdlYktpdEFQ SS54Y2NvbmZpZwppbmRleCA3YzkyYWIzNWFjZjQzOGI1NjJkOTM4NzAzODMxNzhmMjE1MTJlM2Vl Li5jZWIxYWI5OTAzYjBlNmRhNzc2NzY0NmJmMTYwZmE1YTEwYjYwYzFmIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL1Rlc3RXZWJLaXRBUEkueGNjb25maWcK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9UZXN0V2ViS2l0QVBJLnhj Y29uZmlnCkBAIC00MywxMiArNDMsNyBAQCBGUkFNRVdPUktfU0VBUkNIX1BBVEhTID0gJChGUkFN RVdPUktfU0VBUkNIX1BBVEhTXyQoV0tfQ09DT0FfVE9VQ0gpKTsKIEZSQU1FV09SS19TRUFSQ0hf UEFUSFNfID0gJChpbmhlcml0ZWQpICQoV0tfUFJJVkFURV9GUkFNRVdPUktTX0RJUikgJChTWVNU RU1fTElCUkFSWV9ESVIpL1ByaXZhdGVGcmFtZXdvcmtzICQoU1lTVEVNX0xJQlJBUllfRElSKS9G cmFtZXdvcmtzL1dlYktpdC5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzOwogRlJBTUVX T1JLX1NFQVJDSF9QQVRIU19jb2NvYXRvdWNoID0gJChpbmhlcml0ZWQpICQoV0tfUFJJVkFURV9G UkFNRVdPUktTX0RJUik7CiAKLVdLX0FQUFNFUlZFUlNVUFBPUlRfTERGTEFHUyA9ICQoV0tfQVBQ U0VSVkVSU1VQUE9SVF9MREZMQUdTXyQoV0tfUExBVEZPUk1fTkFNRSkpOwotV0tfQVBQU0VSVkVS U1VQUE9SVF9MREZMQUdTX21hY29zeCA9ICQoV0tfQVBQU0VSVkVSU1VQUE9SVF9MREZMQUdTJChX S19NQUNPU18xMjAwKSk7Ci1XS19BUFBTRVJWRVJTVVBQT1JUX0xERkxBR1NfTUFDT1NfU0lOQ0Vf MTIwMCA9IC1mcmFtZXdvcmsgQXBwU2VydmVyU3VwcG9ydAotV0tfQVBQU0VSVkVSU1VQUE9SVF9M REZMQUdTX2lwaG9uZW9zID0gJChXS19BUFBTRVJWRVJTVVBQT1JUX0xERkxBR1MkKFdLX0lPU18x NSkpOwotV0tfQVBQU0VSVkVSU1VQUE9SVF9MREZMQUdTX2lwaG9uZXNpbXVsYXRvciA9ICQoV0tf QVBQU0VSVkVSU1VQUE9SVF9MREZMQUdTJChXS19JT1NfMTUpKTsKLVdLX0FQUFNFUlZFUlNVUFBP UlRfTERGTEFHU19JT1NfU0lOQ0VfMTUgPSAtZnJhbWV3b3JrIEFwcFNlcnZlclN1cHBvcnQKK1dL X0FQUFNFUlZFUlNVUFBPUlRfTERGTEFHU1tzZGs9aXBob25lKl0gPSAtZnJhbWV3b3JrIEFwcFNl cnZlclN1cHBvcnQKIAogV0tfQVVUSEtJVF9MREZMQUdTID0gJChXS19BVVRIS0lUX0xERkxBR1Nf JChXS19QTEFURk9STV9OQU1FKSk7CiBXS19BVVRIS0lUX0xERkxBR1NfaXBob25lb3MgPSAkKFdL X0FVVEhLSVRfTERGTEFHUyQoV0tfSU9TXzEzKSk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0KaW5kZXggNDUx Zjk0YmVmNDk0MTM2NzA0MTU3ZDYwMzc0N2FhN2QyYmFlMmMwMi4uNTI4MDllZGVmN2YzYjY1NmRh MWVkMGFjMDAyYjRjZWNjY2IwZDZjNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbQpAQCAtNDQ4LDQzICs0 NDgsNyBAQCBzdGF0aWMgUmV0YWluUHRyPE5TVVJMPiB0ZXN0UENNRGFlbW9uTG9jYXRpb24oKQog ICAgIHJldHVybiBbY3VycmVudEV4ZWN1dGFibGVEaXJlY3RvcnkoKSBVUkxCeUFwcGVuZGluZ1Bh dGhDb21wb25lbnQ6QCJhZGF0dHJpYnV0aW9uZCIgaXNEaXJlY3Rvcnk6Tk9dOwogfQogCi0jaWYg SEFWRShPU19MQVVOQ0hEX0pPQikKLQotc3RhdGljIFJldGFpblB0cjx4cGNfb2JqZWN0X3Q+IHRl c3REYWVtb25QTGlzdChOU1VSTCAqc3RvcmFnZUxvY2F0aW9uKQotewotICAgIGF1dG8gcGxpc3Qg PSBhZG9wdE5TKHhwY19kaWN0aW9uYXJ5X2NyZWF0ZShudWxscHRyLCBudWxscHRyLCAwKSk7Ci0g ICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhwbGlzdC5nZXQoKSwgIl9NYW5hZ2VkQnkiLCAi VGVzdFdlYktpdEFQSSIpOwotICAgIHhwY19kaWN0aW9uYXJ5X3NldF9zdHJpbmcocGxpc3QuZ2V0 KCksICJMYWJlbCIsICJvcmcud2Via2l0LnBjbXRlc3RkYWVtb24iKTsKLSAgICB4cGNfZGljdGlv bmFyeV9zZXRfYm9vbChwbGlzdC5nZXQoKSwgIlJvb3RlZFNpbXVsYXRvclBhdGgiLCB0cnVlKTsK LSAgICB4cGNfZGljdGlvbmFyeV9zZXRfYm9vbChwbGlzdC5nZXQoKSwgIkxhdW5jaE9ubHlPbmNl IiwgdHJ1ZSk7Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhwbGlzdC5nZXQoKSwgIlN0 YW5kYXJkRXJyb3JQYXRoIiwgW3N0b3JhZ2VMb2NhdGlvbiBVUkxCeUFwcGVuZGluZ1BhdGhDb21w b25lbnQ6QCJkYWVtb25fc3RkZXJyIl0ucGF0aC5maWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOwot Ci0gICAgewotICAgICAgICBhdXRvIGVudmlyb25tZW50VmFyaWFibGVzID0gYWRvcHROUyh4cGNf ZGljdGlvbmFyeV9jcmVhdGUobnVsbHB0ciwgbnVsbHB0ciwgMCkpOwotICAgICAgICB4cGNfZGlj dGlvbmFyeV9zZXRfc3RyaW5nKGVudmlyb25tZW50VmFyaWFibGVzLmdldCgpLCAiRFlMRF9GUkFN RVdPUktfUEFUSCIsIGN1cnJlbnRFeGVjdXRhYmxlRGlyZWN0b3J5KCkuZ2V0KCkuZmlsZVN5c3Rl bVJlcHJlc2VudGF0aW9uKTsKLSAgICAgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKHBsaXN0 LmdldCgpLCAiRW52aXJvbm1lbnRWYXJpYWJsZXMiLCBlbnZpcm9ubWVudFZhcmlhYmxlcy5nZXQo KSk7Ci0gICAgfQotICAgIHsKLSAgICAgICAgYXV0byBtYWNoU2VydmljZXMgPSBhZG9wdE5TKHhw Y19kaWN0aW9uYXJ5X2NyZWF0ZShudWxscHRyLCBudWxscHRyLCAwKSk7Ci0gICAgICAgIHhwY19k aWN0aW9uYXJ5X3NldF9ib29sKG1hY2hTZXJ2aWNlcy5nZXQoKSwgIm9yZy53ZWJraXQucGNtdGVz dGRhZW1vbi5zZXJ2aWNlIiwgdHJ1ZSk7Ci0gICAgICAgIHhwY19kaWN0aW9uYXJ5X3NldF92YWx1 ZShwbGlzdC5nZXQoKSwgIk1hY2hTZXJ2aWNlcyIsIG1hY2hTZXJ2aWNlcy5nZXQoKSk7Ci0gICAg fQotICAgIHsKLSAgICAgICAgYXV0byBwcm9ncmFtQXJndW1lbnRzID0gYWRvcHROUyh4cGNfYXJy YXlfY3JlYXRlKG51bGxwdHIsIDApKTsKLSAgICAgICAgYXV0byBleGVjdXRhYmxlTG9jYXRpb24g PSB0ZXN0UENNRGFlbW9uTG9jYXRpb24oKTsKLSAgICAgICAgeHBjX2FycmF5X3NldF9zdHJpbmco cHJvZ3JhbUFyZ3VtZW50cy5nZXQoKSwgWFBDX0FSUkFZX0FQUEVORCwgZXhlY3V0YWJsZUxvY2F0 aW9uLmdldCgpLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbik7Ci0gICAgICAgIHhwY19hcnJheV9z ZXRfc3RyaW5nKHByb2dyYW1Bcmd1bWVudHMuZ2V0KCksIFhQQ19BUlJBWV9BUFBFTkQsICItLW1h Y2hTZXJ2aWNlTmFtZSIpOwotICAgICAgICB4cGNfYXJyYXlfc2V0X3N0cmluZyhwcm9ncmFtQXJn dW1lbnRzLmdldCgpLCBYUENfQVJSQVlfQVBQRU5ELCAib3JnLndlYmtpdC5wY210ZXN0ZGFlbW9u LnNlcnZpY2UiKTsKLSAgICAgICAgeHBjX2FycmF5X3NldF9zdHJpbmcocHJvZ3JhbUFyZ3VtZW50 cy5nZXQoKSwgWFBDX0FSUkFZX0FQUEVORCwgIi0tc3RvcmFnZUxvY2F0aW9uIik7Ci0gICAgICAg IHhwY19hcnJheV9zZXRfc3RyaW5nKHByb2dyYW1Bcmd1bWVudHMuZ2V0KCksIFhQQ19BUlJBWV9B UFBFTkQsIHN0b3JhZ2VMb2NhdGlvbi5maWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOwotICAgICAg ICB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUocGxpc3QuZ2V0KCksICJQcm9ncmFtQXJndW1lbnRz IiwgcHJvZ3JhbUFyZ3VtZW50cy5nZXQoKSk7Ci0gICAgfQotICAgIHJldHVybiBwbGlzdDsKLX0K LQotI2Vsc2UgLy8gSEFWRShPU19MQVVOQ0hEX0pPQikKLQotc3RhdGljIFJldGFpblB0cjxOU0Rp Y3Rpb25hcnk+IHRlc3REYWVtb25QTGlzdChOU1VSTCAqc3RvcmFnZUxvY2F0aW9uKQorc3RhdGlj IE5TRGljdGlvbmFyeTxOU1N0cmluZyAqLCBpZD4gKnRlc3REYWVtb25QTGlzdChOU1VSTCAqc3Rv cmFnZUxvY2F0aW9uKQogewogICAgIHJldHVybiBAewogICAgICAgICBAIkxhYmVsIiA6IEAib3Jn LndlYmtpdC5wY210ZXN0ZGFlbW9uIiwKQEAgLTUwMiw4ICs0NjYsNiBAQCBzdGF0aWMgUmV0YWlu UHRyPE5TRGljdGlvbmFyeT4gdGVzdERhZW1vblBMaXN0KE5TVVJMICpzdG9yYWdlTG9jYXRpb24p CiAgICAgfTsKIH0KIAotI2VuZGlmIC8vIEhBVkUoT1NfTEFVTkNIRF9KT0IpCi0KIHN0YXRpYyBz dGQ6OnBhaXI8TlNVUkwgKiwgV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqPiBzZXRVcERhZW1vbihX S1dlYlZpZXdDb25maWd1cmF0aW9uICp2aWV3Q29uZmlndXJhdGlvbikKIHsKICAgICBOU0ZpbGVN YW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKQEAg LTUxNSwxMiArNDc3LDggQEAgc3RhdGljIHN0ZDo6cGFpcjxOU1VSTCAqLCBXS1dlYlZpZXdDb25m aWd1cmF0aW9uICo+IHNldFVwRGFlbW9uKFdLV2ViVmlld0NvbmZpZ3UKIAogICAgIGtpbGxGaXJz dEluc3RhbmNlT2ZEYWVtb24oQCJhZGF0dHJpYnV0aW9uZCIpOwogCi0gICAgYXV0byBwbGlzdCA9 IHRlc3REYWVtb25QTGlzdCh0ZW1wRGlyKTsKLSNpZiBIQVZFKE9TX0xBVU5DSERfSk9CKQotICAg IHJlZ2lzdGVyUGxpc3RXaXRoTGF1bmNoRChXVEZNb3ZlKHBsaXN0KSk7Ci0jZWxzZQotICAgIHJl Z2lzdGVyUGxpc3RXaXRoTGF1bmNoRChXVEZNb3ZlKHBsaXN0KSwgdGVtcERpcik7Ci0jZW5kaWYK KyAgICByZWdpc3RlclBsaXN0V2l0aExhdW5jaEQodGVzdERhZW1vblBMaXN0KHRlbXBEaXIpLCB0 ZW1wRGlyKTsKKwogICAgIGF1dG8gZGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW19X S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIG5ld10pOwogICAgIGRhdGFTdG9yZUNvbmZp Z3VyYXRpb24uZ2V0KCkucGNtTWFjaFNlcnZpY2VOYW1lID0gQCJvcmcud2Via2l0LnBjbXRlc3Rk YWVtb24uc2VydmljZSI7CiAgICAgdmlld0NvbmZpZ3VyYXRpb24ud2Vic2l0ZURhdGFTdG9yZSA9 IGFkb3B0TlMoW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRp b246ZGF0YVN0b3JlQ29uZmlndXJhdGlvbi5nZXQoKV0pLmdldCgpOwpAQCAtNTU0LDEyICs1MTIs NyBAQCBzdGF0aWMgdm9pZCBhdHRlbXB0Q29ubmVjdGlvbkluUHJvY2Vzc1dpdGhvdXRFbnRpdGxl bWVudCgpCiAjZW5kaWYKIH0KIAotLy8gRklYTUU6IFJlLWVuYWJsZSB0aGlzIHRlc3QgZm9yIE1v bnRlcmV5KyBvbmNlIHdlYmtpdC5vcmcvMjMyODkwIGlzIHJlc29sdmVkLgotI2lmIF9fTUFDX09T X1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTIwMDAwCi1URVNUKFByaXZhdGVDbGlja01lYXN1 cmVtZW50LCBESVNBQkxFRF9EYWVtb25CYXNpY0Z1bmN0aW9uYWxpdHkpCi0jZWxzZQogVEVTVChQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgRGFlbW9uQmFzaWNGdW5jdGlvbmFsaXR5KQotI2VuZGlm CiB7CiAgICAgYXV0byBbdGVtcERpciwgY29uZmlndXJhdGlvbl0gPSBzZXRVcERhZW1vbihjb25m aWd1cmF0aW9uV2l0aG91dFVzaW5nRGFlbW9uKCkuYXV0b3JlbGVhc2UoKSk7CiAgICAgYXR0ZW1w dENvbm5lY3Rpb25JblByb2Nlc3NXaXRob3V0RW50aXRsZW1lbnQoKTsKQEAgLTU5NCwxMiArNTQ3 LDcgQEAgc3RhdGljIFJldGFpblB0cjxUZXN0V0tXZWJWaWV3PiB3ZWJWaWV3V2l0aE9wZW5JbnNw ZWN0b3IoV0tXZWJWaWV3Q29uZmlndXJhdGlvbgogICAgIHJldHVybiB3ZWJWaWV3OwogfQogCi0v LyBGSVhNRTogUmUtZW5hYmxlIHRoaXMgdGVzdCBmb3IgTW9udGVyZXkrIG9uY2Ugd2Via2l0Lm9y Zy8yMzI4OTAgaXMgcmVzb2x2ZWQuCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMjAwMDAKLVRFU1QoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsIERJU0FCTEVEX0RhZW1v bkRlYnVnTW9kZSkKLSNlbHNlCiBURVNUKFByaXZhdGVDbGlja01lYXN1cmVtZW50LCBEYWVtb25E ZWJ1Z01vZGUpCi0jZW5kaWYKIHsKICAgICBhdXRvIFt0ZW1wRGlyLCBjb25maWd1cmF0aW9uXSA9 IHNldFVwRGFlbW9uKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF90ZXN0X2NvbmZpZ3VyYXRpb25X aXRoVGVzdFBsdWdJbkNsYXNzTmFtZTpAIkJ1bmRsZVBhZ2VDb25zb2xlTWVzc2FnZSJdKTsKICAg ICBWZWN0b3I8U3RyaW5nPiBjb25zb2xlTWVzc2FnZXM7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYlB1c2hEYWVtb24ubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYlB1c2hEYWVtb24ubW0KaW5kZXggYTAxZmI2 MDkwYzgyZTA2OWYwZWQ3ZjM5NWJkY2QzN2VlZTI1N2JiNy4uY2NlMjkzNGE4ZmM2NmNmMDg1NDhi ODNlNGIyYzQ3ZDFkNjFmMTRiZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XZWJQdXNoRGFlbW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV2ViUHVzaERhZW1vbi5tbQpAQCAtNjcsNTAgKzY3LDEwIEBAIHN0 YXRpYyBSZXRhaW5QdHI8TlNVUkw+IHRlc3RXZWJQdXNoRGFlbW9uTG9jYXRpb24oKQogICAgIHJl dHVybiBbY3VycmVudEV4ZWN1dGFibGVEaXJlY3RvcnkoKSBVUkxCeUFwcGVuZGluZ1BhdGhDb21w b25lbnQ6QCJ3ZWJwdXNoZCIgaXNEaXJlY3Rvcnk6Tk9dOwogfQogCi0jaWYgSEFWRShPU19MQVVO Q0hEX0pPQikKLQotc3RhdGljIFJldGFpblB0cjx4cGNfb2JqZWN0X3Q+IHRlc3RXZWJQdXNoRGFl bW9uUExpc3QoTlNVUkwgKnN0b3JhZ2VMb2NhdGlvbikKLXsKLSAgICBhdXRvIGN1cnJlbnREaXJl Y3RvcnkgPSBjdXJyZW50RXhlY3V0YWJsZURpcmVjdG9yeSgpOwotCi0gICAgYXV0byBwbGlzdCA9 IGFkb3B0TlMoeHBjX2RpY3Rpb25hcnlfY3JlYXRlKG51bGxwdHIsIG51bGxwdHIsIDApKTsKLSAg ICB4cGNfZGljdGlvbmFyeV9zZXRfc3RyaW5nKHBsaXN0LmdldCgpLCAiX01hbmFnZWRCeSIsICJU ZXN0V2ViS2l0QVBJIik7Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhwbGlzdC5nZXQo KSwgIkxhYmVsIiwgIm9yZy53ZWJraXQud2VicHVzaHRlc3RkYWVtb24iKTsKLSAgICB4cGNfZGlj dGlvbmFyeV9zZXRfYm9vbChwbGlzdC5nZXQoKSwgIkxhdW5jaE9ubHlPbmNlIiwgdHJ1ZSk7Ci0g ICAgeHBjX2RpY3Rpb25hcnlfc2V0X2Jvb2wocGxpc3QuZ2V0KCksICJSb290ZWRTaW11bGF0b3JQ YXRoIiwgdHJ1ZSk7Ci0gICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhwbGlzdC5nZXQoKSwg IlN0YW5kYXJkRXJyb3JQYXRoIiwgW3N0b3JhZ2VMb2NhdGlvbiBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJkYWVtb25fc3RkZXJyIl0ucGF0aC5maWxlU3lzdGVtUmVwcmVzZW50YXRpb24p OwotCi0gICAgewotICAgICAgICBhdXRvIGVudmlyb25tZW50VmFyaWFibGVzID0gYWRvcHROUyh4 cGNfZGljdGlvbmFyeV9jcmVhdGUobnVsbHB0ciwgbnVsbHB0ciwgMCkpOwotICAgICAgICB4cGNf ZGljdGlvbmFyeV9zZXRfc3RyaW5nKGVudmlyb25tZW50VmFyaWFibGVzLmdldCgpLCAiRFlMRF9G UkFNRVdPUktfUEFUSCIsIGN1cnJlbnREaXJlY3RvcnkuZ2V0KCkuZmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKTsKLSAgICAgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKHBsaXN0LmdldCgpLCAi RW52aXJvbm1lbnRWYXJpYWJsZXMiLCBlbnZpcm9ubWVudFZhcmlhYmxlcy5nZXQoKSk7Ci0gICAg fQotICAgIHsKLSAgICAgICAgYXV0byBtYWNoU2VydmljZXMgPSBhZG9wdE5TKHhwY19kaWN0aW9u YXJ5X2NyZWF0ZShudWxscHRyLCBudWxscHRyLCAwKSk7Ci0gICAgICAgIHhwY19kaWN0aW9uYXJ5 X3NldF9ib29sKG1hY2hTZXJ2aWNlcy5nZXQoKSwgIm9yZy53ZWJraXQud2VicHVzaHRlc3RkYWVt b24uc2VydmljZSIsIHRydWUpOwotICAgICAgICB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUocGxp c3QuZ2V0KCksICJNYWNoU2VydmljZXMiLCBtYWNoU2VydmljZXMuZ2V0KCkpOwotICAgIH0KLSAg ICB7Ci0gICAgICAgIGF1dG8gcHJvZ3JhbUFyZ3VtZW50cyA9IGFkb3B0TlMoeHBjX2FycmF5X2Ny ZWF0ZShudWxscHRyLCAwKSk7Ci0gICAgICAgIGF1dG8gZXhlY3V0YWJsZUxvY2F0aW9uID0gdGVz dFdlYlB1c2hEYWVtb25Mb2NhdGlvbigpOwotI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgeHBj X2FycmF5X3NldF9zdHJpbmcocHJvZ3JhbUFyZ3VtZW50cy5nZXQoKSwgWFBDX0FSUkFZX0FQUEVO RCwgZXhlY3V0YWJsZUxvY2F0aW9uLmdldCgpLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbik7Ci0j ZWxzZQotICAgICAgICB4cGNfYXJyYXlfc2V0X3N0cmluZyhwcm9ncmFtQXJndW1lbnRzLmdldCgp LCBYUENfQVJSQVlfQVBQRU5ELCBbY3VycmVudERpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJ3ZWJwdXNoZCJdLnBhdGguZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKTsKLSNl bmRpZgotICAgICAgICB4cGNfYXJyYXlfc2V0X3N0cmluZyhwcm9ncmFtQXJndW1lbnRzLmdldCgp LCBYUENfQVJSQVlfQVBQRU5ELCAiLS1tYWNoU2VydmljZU5hbWUiKTsKLSAgICAgICAgeHBjX2Fy cmF5X3NldF9zdHJpbmcocHJvZ3JhbUFyZ3VtZW50cy5nZXQoKSwgWFBDX0FSUkFZX0FQUEVORCwg Im9yZy53ZWJraXQud2VicHVzaHRlc3RkYWVtb24uc2VydmljZSIpOwotICAgICAgICB4cGNfZGlj dGlvbmFyeV9zZXRfdmFsdWUocGxpc3QuZ2V0KCksICJQcm9ncmFtQXJndW1lbnRzIiwgcHJvZ3Jh bUFyZ3VtZW50cy5nZXQoKSk7Ci0gICAgfQotICAgIHJldHVybiBwbGlzdDsKLX0KLQotI2Vsc2Ug Ly8gSEFWRShPU19MQVVOQ0hEX0pPQikKLQotc3RhdGljIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+ IHRlc3RXZWJQdXNoRGFlbW9uUExpc3QoTlNVUkwgKnN0b3JhZ2VMb2NhdGlvbikKK3N0YXRpYyBO U0RpY3Rpb25hcnk8TlNTdHJpbmcgKiwgaWQ+ICp0ZXN0V2ViUHVzaERhZW1vblBMaXN0KE5TVVJM ICpzdG9yYWdlTG9jYXRpb24pCiB7CiAgICAgcmV0dXJuIEB7Ci0gICAgICAgIEAiTGFiZWwiIDog QCJvcmcud2Via2l0LnBjbXRlc3RkYWVtb24iLAorICAgICAgICBAIkxhYmVsIiA6IEAib3JnLndl YmtpdC53ZWJwdXNodGVzdGRhZW1vbiIsCiAgICAgICAgIEAiTGF1bmNoT25seU9uY2UiIDogQFlF UywKICAgICAgICAgQCJTdGFuZGFyZEVycm9yUGF0aCIgOiBbc3RvcmFnZUxvY2F0aW9uIFVSTEJ5 QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAImRhZW1vbl9zdGRlcnIiXS5wYXRoLAogICAgICAgICBA IkVudmlyb25tZW50VmFyaWFibGVzIiA6IEB7IEAiRFlMRF9GUkFNRVdPUktfUEFUSCIgOiBjdXJy ZW50RXhlY3V0YWJsZURpcmVjdG9yeSgpLmdldCgpLnBhdGggfSwKQEAgLTEyMyw4ICs4Myw2IEBA IHN0YXRpYyBSZXRhaW5QdHI8TlNEaWN0aW9uYXJ5PiB0ZXN0V2ViUHVzaERhZW1vblBMaXN0KE5T VVJMICpzdG9yYWdlTG9jYXRpb24pCiAgICAgfTsKIH0KIAotI2VuZGlmIC8vIEhBVkUoT1NfTEFV TkNIRF9KT0IpCi0KIHN0YXRpYyBib29sIHNob3VsZFNldHVwV2ViUHVzaEQoKQogewogICAgIHN0 YXRpYyBib29sIHNob3VsZFNldHVwID0gdHJ1ZTsKQEAgLTE1MiwxMiArMTEwLDcgQEAgc3RhdGlj IE5TVVJMICpzZXRVcFRlc3RXZWJQdXNoRCgpCiAKICAgICBraWxsRmlyc3RJbnN0YW5jZU9mRGFl bW9uKEAid2VicHVzaGQiKTsKIAotICAgIGF1dG8gcGxpc3QgPSB0ZXN0V2ViUHVzaERhZW1vblBM aXN0KHRlbXBEaXIpOwotI2lmIEhBVkUoT1NfTEFVTkNIRF9KT0IpCi0gICAgcmVnaXN0ZXJQbGlz dFdpdGhMYXVuY2hEKFdURk1vdmUocGxpc3QpKTsKLSNlbHNlCi0gICAgcmVnaXN0ZXJQbGlzdFdp dGhMYXVuY2hEKFdURk1vdmUocGxpc3QpLCB0ZW1wRGlyKTsKLSNlbmRpZgorICAgIHJlZ2lzdGVy UGxpc3RXaXRoTGF1bmNoRCh0ZXN0V2ViUHVzaERhZW1vblBMaXN0KHRlbXBEaXIpLCB0ZW1wRGly KTsKIAogICAgIHJldHVybiB0ZW1wRGlyOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9jb2NvYS9EYWVtb25UZXN0VXRpbGl0aWVzLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2Nv Y29hL0RhZW1vblRlc3RVdGlsaXRpZXMuaAppbmRleCBjMWI0MmM1MDA1YjIyODJhZmZkMGY2ZDIy ZjdkZjJkOWRhNDJhZmJlLi41ZDJiYWM4ZjBiYjJmMGE3NDc0YmE2ZjlmZTc1NDM2NWRmMmU5Zjdl IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0RhZW1vblRlc3RVdGlsaXRp ZXMuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0RhZW1vblRlc3RVdGlsaXRpZXMu aApAQCAtMzksMTEgKzM5LDcgQEAgUmV0YWluUHRyPE5TVVJMPiBjdXJyZW50RXhlY3V0YWJsZURp cmVjdG9yeSgpOwogCiB2b2lkIGtpbGxGaXJzdEluc3RhbmNlT2ZEYWVtb24oTlNTdHJpbmcgKmRh ZW1vbkV4ZWN1dGFibGVOYW1lKTsKIAotI2lmIEhBVkUoT1NfTEFVTkNIRF9KT0IpCi12b2lkIHJl Z2lzdGVyUGxpc3RXaXRoTGF1bmNoRChSZXRhaW5QdHI8eHBjX29iamVjdF90PiYmKTsKLSNlbHNl Ci12b2lkIHJlZ2lzdGVyUGxpc3RXaXRoTGF1bmNoRChSZXRhaW5QdHI8TlNEaWN0aW9uYXJ5PiYm LCBOU1VSTCAqdGVtcERpcik7Ci0jZW5kaWYKK3ZvaWQgcmVnaXN0ZXJQbGlzdFdpdGhMYXVuY2hE KE5TRGljdGlvbmFyeTxOU1N0cmluZyAqLCBpZD4gKnBsaXN0LCBOU1VSTCAqdGVtcERpcik7CiAK IH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdl YktpdEFQSS9jb2NvYS9EYWVtb25UZXN0VXRpbGl0aWVzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9jb2NvYS9EYWVtb25UZXN0VXRpbGl0aWVzLm1tCmluZGV4IGRhYzIwMjhkYzIxYTJhYTI2ODA1 YzU2MmQ4NWU3Njc2ODA1ZmU2OTkuLmZjYjhlNmE0NWFlOGI5OTdjMjBhNjlhZGI2MmEzZGU3N2I1 M2NjYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvRGFlbW9uVGVzdFV0 aWxpdGllcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0RhZW1vblRlc3RVdGls aXRpZXMubW0KQEAgLTY1LDI3ICs2NSw1NyBAQCBSZXRhaW5QdHI8TlNVUkw+IGN1cnJlbnRFeGVj dXRhYmxlRGlyZWN0b3J5KCkKICAgICByZXR1cm4gW2N1cnJlbnRFeGVjdXRhYmxlTG9jYXRpb24o KSBVUkxCeURlbGV0aW5nTGFzdFBhdGhDb21wb25lbnRdOwogfQogCi0jaWYgSEFWRShPU19MQVVO Q0hEX0pPQikKLQotdm9pZCByZWdpc3RlclBsaXN0V2l0aExhdW5jaEQoUmV0YWluUHRyPHhwY19v YmplY3RfdD4mJiBwbGlzdCkKKyNpZiBQTEFURk9STShJT1MpCitzdGF0aWMgUmV0YWluUHRyPHhw Y19vYmplY3RfdD4gY29udmVydEFycmF5VG9YUEMoTlNBcnJheSAqYXJyYXkpCiB7Ci0gICAgTlNF cnJvciAqZXJyb3IgPSBuaWw7Ci0gICAgYXV0byBsYXVuY2hESm9iID0gYWRvcHROUyhbW09TTGF1 bmNoZEpvYiBhbGxvY10gaW5pdFdpdGhQbGlzdDpwbGlzdC5nZXQoKV0pOwotICAgIFtsYXVuY2hE Sm9iIHN1Ym1pdDomZXJyb3JdOwotCi0gICAgLy8gSW4gdGhlIGlPUyBTaW11bGF0b3Igd2Ugb2Z0 ZW4gc2VlIHRoZSBmb2xsb3dpbmcgZXJyb3IgaGVyZToKLSAgICAvLyBFcnJvciBEb21haW49T1NM YXVuY2hkRXJyb3JEb21haW4gQ29kZT0xNyAiRmlsZSBleGlzdHMiCi0gICAgLy8gVGVzdHMgc3Rp bGwgYmVoYXZlIGFzIGV4cGVjdGVkLgotI2lmIFBMQVRGT1JNKE1BQykKLSAgICBFWFBFQ1RfRkFM U0UoZXJyb3IpOwotI2VuZGlmCisgICAgYXV0byB4cGMgPSBhZG9wdE5TKHhwY19hcnJheV9jcmVh dGUobnVsbHB0ciwgMCkpOworICAgIGZvciAoaWQgdmFsdWUgaW4gYXJyYXkpIHsKKyAgICAgICAg aWYgKFt2YWx1ZSBpc0tpbmRPZkNsYXNzOk5TU3RyaW5nLmNsYXNzXSkKKyAgICAgICAgICAgIHhw Y19hcnJheV9zZXRfc3RyaW5nKHhwYy5nZXQoKSwgWFBDX0FSUkFZX0FQUEVORCwgW3ZhbHVlIFVU RjhTdHJpbmddKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgfQorICAgIHJldHVybiB4cGM7CiB9CiAKLSNlbHNlIC8vIEhBVkUoT1NfTEFVTkNI RF9KT0IpCitzdGF0aWMgUmV0YWluUHRyPHhwY19vYmplY3RfdD4gY29udmVydERpY3Rpb25hcnlU b1hQQyhOU0RpY3Rpb25hcnk8TlNTdHJpbmcgKiwgaWQ+ICpkaWN0aW9uYXJ5KQoreworICAgIGF1 dG8geHBjID0gYWRvcHROUyh4cGNfZGljdGlvbmFyeV9jcmVhdGUobnVsbHB0ciwgbnVsbHB0ciwg MCkpOworICAgIGZvciAoTlNTdHJpbmcgKmtleSBpbiBkaWN0aW9uYXJ5KSB7CisgICAgICAgIEFT U0VSVChba2V5IGlzS2luZE9mQ2xhc3M6TlNTdHJpbmcuY2xhc3NdKTsKKyAgICAgICAgY29uc3Qg Y2hhcioga2V5VVRGOCA9IGtleS5VVEY4U3RyaW5nOworICAgICAgICBpZCB2YWx1ZSA9IGRpY3Rp b25hcnlba2V5XTsKKyAgICAgICAgaWYgKFt2YWx1ZSBpc0tpbmRPZkNsYXNzOk5TU3RyaW5nLmNs YXNzXSkKKyAgICAgICAgICAgIHhwY19kaWN0aW9uYXJ5X3NldF9zdHJpbmcoeHBjLmdldCgpLCBr ZXlVVEY4LCBbdmFsdWUgVVRGOFN0cmluZ10pOworICAgICAgICBlbHNlIGlmIChbdmFsdWUgaXNL aW5kT2ZDbGFzczpOU051bWJlci5jbGFzc10pIHsKKyAgICAgICAgICAgIHVpbnQ2NF90IHVpbnQ2 NFZhbHVlID0gW3ZhbHVlIHVuc2lnbmVkTG9uZ0xvbmdWYWx1ZV07CisgICAgICAgICAgICBpZiAo dWludDY0VmFsdWUgPT0gMSkKKyAgICAgICAgICAgICAgICB4cGNfZGljdGlvbmFyeV9zZXRfYm9v bCh4cGMuZ2V0KCksIGtleVVURjgsIHVpbnQ2NFZhbHVlKTsKKyAgICAgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgICAgIEFTU0VSVChbdmFsdWUgZG91YmxlVmFsdWVdID09IHVpbnQ2NFZhbHVl KTsKKyAgICAgICAgICAgICAgICB4cGNfZGljdGlvbmFyeV9zZXRfdWludDY0KHhwYy5nZXQoKSwg a2V5VVRGOCwgdWludDY0VmFsdWUpOworICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYg KFt2YWx1ZSBpc0tpbmRPZkNsYXNzOk5TQXJyYXkuY2xhc3NdKQorICAgICAgICAgICAgeHBjX2Rp Y3Rpb25hcnlfc2V0X3ZhbHVlKHhwYy5nZXQoKSwga2V5VVRGOCwgY29udmVydEFycmF5VG9YUEMo dmFsdWUpLmdldCgpKTsKKyAgICAgICAgZWxzZSBpZiAoW3ZhbHVlIGlzS2luZE9mQ2xhc3M6TlNE aWN0aW9uYXJ5LmNsYXNzXSkKKyAgICAgICAgICAgIHhwY19kaWN0aW9uYXJ5X3NldF92YWx1ZSh4 cGMuZ2V0KCksIGtleVVURjgsIGNvbnZlcnREaWN0aW9uYXJ5VG9YUEModmFsdWUpLmdldCgpKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQor ICAgIHJldHVybiB4cGM7Cit9CisjZW5kaWYKIAotdm9pZCByZWdpc3RlclBsaXN0V2l0aExhdW5j aEQoUmV0YWluUHRyPE5TRGljdGlvbmFyeT4mJiBwbGlzdCwgTlNVUkwgKnRlbXBEaXIpCit2b2lk IHJlZ2lzdGVyUGxpc3RXaXRoTGF1bmNoRChOU0RpY3Rpb25hcnk8TlNTdHJpbmcgKiwgaWQ+ICpw bGlzdCwgTlNVUkwgKnRlbXBEaXIpCiB7CiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7CisjaWYg UExBVEZPUk0oSU9TKQorICAgIGF1dG8geHBjUGxpc3QgPSBjb252ZXJ0RGljdGlvbmFyeVRvWFBD KHBsaXN0KTsKKyAgICB4cGNfZGljdGlvbmFyeV9zZXRfc3RyaW5nKHhwY1BsaXN0LmdldCgpLCAi X01hbmFnZWRCeSIsICJUZXN0V2ViS2l0QVBJIik7CisgICAgeHBjX2RpY3Rpb25hcnlfc2V0X2Jv b2woeHBjUGxpc3QuZ2V0KCksICJSb290ZWRTaW11bGF0b3JQYXRoIiwgdHJ1ZSk7CisgICAgYXV0 byBsYXVuY2hESm9iID0gYWRvcHROUyhbW09TTGF1bmNoZEpvYiBhbGxvY10gaW5pdFdpdGhQbGlz dDp4cGNQbGlzdC5nZXQoKV0pOworICAgIFtsYXVuY2hESm9iIHN1Ym1pdDomZXJyb3JdOworI2Vs c2UKICAgICBOU1VSTCAqcGxpc3RMb2NhdGlvbiA9IFt0ZW1wRGlyIFVSTEJ5QXBwZW5kaW5nUGF0 aENvbXBvbmVudDpAIkRhZW1vbkluZm8ucGxpc3QiXTsKICAgICBCT09MIHN1Y2Nlc3MgPSBbW05T RmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNyZWF0ZURpcmVjdG9yeUF0VVJMOnRlbXBEaXIg d2l0aEludGVybWVkaWF0ZURpcmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjomZXJy b3JdOwogICAgIEVYUEVDVF9UUlVFKHN1Y2Nlc3MpOwpAQCAtOTUsMTAgKzEyNSw5IEBAIHZvaWQg cmVnaXN0ZXJQbGlzdFdpdGhMYXVuY2hEKFJldGFpblB0cjxOU0RpY3Rpb25hcnk+JiYgcGxpc3Qs IE5TVVJMICp0ZW1wRGlyKQogICAgIHN5c3RlbShbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpA ImxhdW5jaGN0bCB1bmxvYWQgJUAgMj4gL2Rldi9udWxsIiwgcGxpc3RMb2NhdGlvbi5wYXRoXS5m aWxlU3lzdGVtUmVwcmVzZW50YXRpb24pOwogICAgIHN5c3RlbShbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAImxhdW5jaGN0bCBsb2FkICVAIiwgcGxpc3RMb2NhdGlvbi5wYXRoXS5maWxlU3lz dGVtUmVwcmVzZW50YXRpb24pOwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CisjZW5kaWYKIH0K IAotI2VuZGlmIC8vIEhBVkUoT1NfTEFVTkNIRF9KT0IpCi0KIHN0YXRpYyBpbnQgcGlkT2ZGaXJz dERhZW1vbkluc3RhbmNlKE5TU3RyaW5nICpkYWVtb25FeGVjdXRhYmxlTmFtZSkKIHsKICAgICBh dXRvIHRhc2sgPSBhZG9wdE5TKFtbTlNUYXNrIGFsbG9jXSBpbml0XSk7Cg==