236364 2022-02-09 07:14:47 -0800 [WebAuthn] Modify getAllLocalAuthenticatorCredentials according to internal needs 2022-02-15 09:05:14 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham webkit-bug-importer oldest_to_newest 1839129 0 pascoe 2022-02-09 07:14:47 -0800 ^ 1839130 1 pascoe 2022-02-09 07:14:58 -0800 rdar://88585418 1839133 2 451371 pascoe 2022-02-09 07:18:03 -0800 Created attachment 451371 Patch 1839394 3 451440 pascoe 2022-02-09 13:47:19 -0800 Created attachment 451440 Patch 1839453 4 451459 pascoe 2022-02-09 16:46:11 -0800 Created attachment 451459 Patch 1840448 5 451459 bfulgham 2022-02-11 10:48:26 -0800 Comment on attachment 451459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451459&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:348 > ++ (void)setUsernameForLocalCredentialWithGroup:(NSString *)group credential:(NSData *)credentialID username: (NSString *)username Nit: I think we would usually name this something like 'setUsernameForLocalCredentialWithGroupAndID:' > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:553 > ++ (NSData *)exportLocalAuthenticatorCredentialWithGroup:(NSString *)group credential:(NSData *)credentialID error:(NSError **)error Ditto: "WithGroupAndID" 1841293 6 451918 pascoe 2022-02-14 09:49:57 -0800 Created attachment 451918 Patch for landing 1841741 7 ews-feeder 2022-02-15 09:05:08 -0800 Committed r289817 (247278@main): <https://commits.webkit.org/247278@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451918. 451371 2022-02-09 07:18:03 -0800 2022-02-09 13:47:17 -0800 Patch bug-236364-20220209071803.patch text/plain 3855 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJjYmY3YTY1MWE2MjlkYmQ0 MDQzODMzYWE4OTkzMGNlODIzNDkxNGIuLjQwOTA1N2M2NjllNjI2ZTkxZDFhNjNlZTc2NjAyYzVk YmQ1MDRjODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMDkgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIE1vZGlmeSBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFscyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgcmVxdWlyZW1lbnRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYzNjQKKyAg ICAgICAgcmRhcjovLzg4NTg1NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyB0aGUgZ2V0QWxsTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbHMgU1BJIHRvIHJldHVybiBhZGRpdGlvbmFsCisgICAgICAgIGZpZWxk cyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgbmVlZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06CisgICAgICAgICh1cGRhdGVD cmVkZW50aWFsSWZOZXNzZXNhcnkpOgorICAgICAgICAoZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbHNJbXBsKToKKwogMjAyMi0wMi0wOCAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBs ZS5jb20+CiAKICAgICAgICAgW1dlYkF1dGhuXSBVc2UgQXV0aGVudGljYXRpb25TZXJ2aWNlc0Fn ZW50IGZvciBXZWJBdXRobiBjYWxscyBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5oCmlu ZGV4IGI2ODlkYWMyZDg3YjA4YTcwMmNmOWJhNmFmYWFhNjNlOWRkNTc1YzIuLjZjMTk5MmE1Yzll Mzc4MDc4MWRjZjNmZWM0Y2I2OGE0ZWJiMjc1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwu aApAQCAtOTIsNiArOTIsOCBAQCBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dL TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0 cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJ REtleTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXk7CiBXS19FWFBPUlQgZXh0ZXJu IE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbENyZWF0aW9u RGF0ZUtleTsKK1dLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFsR3JvdXBLZXk7CitXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICog Y29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFN5bmNocm9uaXphYmxlS2V5Owog CiBAcHJvdG9jb2wgX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbERlbGVnYXRlIDxOU09iamVjdD4K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1 dGhlbnRpY2F0aW9uUGFuZWwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQppbmRleCBjOGJiMWVjZDY3YWJmZWE3N2JhYjY5 M2RhMWFjZGVhYTk4ZmZkODllLi4zNmEwMGVkOTg4NDZhMzg1NTE1MTAwYzU0YmY5YmFmNDRkM2Vi ODYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpAQCAtNzEsNiArNzEsOSBAQAogc3Rh dGljIHZvaWQgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShOU011dGFibGVEaWN0aW9uYXJ5ICopCiB7 CiB9CitzdGF0aWMgaW5saW5lIHZvaWQgdXBkYXRlQ3JlZGVudGlhbElmTmVzc2VzYXJ5KE5TTXV0 YWJsZURpY3Rpb25hcnkgKmNyZWRlbnRpYWwsIE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcykKK3sK K30KICNlbmRpZgogCiBzdGF0aWMgUmV0YWluUHRyPE5TRGF0YT4gcHJvZHVjZUNsaWVudERhdGFK c29uKF9XS1dlYkF1dGhlbnRpY2F0aW9uVHlwZSB0eXBlLCBOU0RhdGEgKmNoYWxsZW5nZSwgTlNT dHJpbmcgKm9yaWdpbikKQEAgLTEwNSw2ICsxMDgsOCBAQCBOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9y QwogTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsUmVseWlu Z1BhcnR5SURLZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFy dHlJREtleSI7CiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRp YWxMYXN0TW9kaWZpY2F0aW9uRGF0ZUtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVu dGlhbExhc3RNb2RpZmljYXRpb25EYXRlS2V5IjsKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbENyZWF0aW9uRGF0ZUtleSA9IEAiX1dLTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbENyZWF0aW9uRGF0ZUtleSI7CitOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxHcm91cEtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNh dG9yQ3JlZGVudGlhbEdyb3VwS2V5IjsKK05TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbFN5bmNocm9uaXphYmxlS2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsU3luY2hyb25pemFibGVLZXkiOwogCiBAaW1wbGVtZW50YXRpb24gX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbCB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikKQEAgLTI3NCw2ICsy NzksNyBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRv ckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNjZQogICAgICAgICAgICAgYXR0cmlidXRlc1ti cmlkZ2VfY2FzdChrU2VjQXR0ckNyZWF0aW9uRGF0ZSldLCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5LAogICAgICAgICAgICAgbmlsCiAgICAgICAgIF0pOwor ICAgICAgICB1cGRhdGVDcmVkZW50aWFsSWZOZXNzZXNhcnkoY3JlZGVudGlhbC5nZXQoKSwgYXR0 cmlidXRlcyk7CiAKICAgICAgICAgaXQgPSByZXNwb25zZU1hcC5maW5kKGNib3I6OkNCT1JWYWx1 ZShmaWRvOjprRGlzcGxheU5hbWVNYXBLZXkpKTsKICAgICAgICAgaWYgKGl0ICE9IHJlc3BvbnNl TWFwLmVuZCgpICYmIGl0LT5zZWNvbmQuaXNTdHJpbmcoKSkK 451440 2022-02-09 13:47:19 -0800 2022-02-09 16:46:09 -0800 Patch bug-236364-20220209134718.patch text/plain 9798 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjJhYTE2NmJmNjczNGVhZTQxYzhhN2RlYTg3MTA1NDVl NWNiODcwODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMDkgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIE1vZGlmeSBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFscyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgcmVxdWlyZW1lbnRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYzNjQKKyAg ICAgICAgcmRhcjovLzg4NTg1NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyB0aGUgZ2V0QWxsTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbHMgU1BJIHRvIHJldHVybiBhZGRpdGlvbmFsCisgICAgICAgIGZpZWxk cyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgbmVlZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06CisgICAgICAgICh1cGRhdGVD cmVkZW50aWFsSWZOZXNzZXNhcnkpOgorICAgICAgICAoZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbHNJbXBsKToKKwogMjAyMi0wMi0wOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNA d2Via2l0Lm9yZz4KIAogICAgICAgICBbbW9kZWxdIGltcHJvdmUgc2l6aW5nIG9uIG1hY09TCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dl YkF1dGhlbnRpY2F0aW9uUGFuZWwuaAppbmRleCBkODU4ZTRjMjI3OTc4ZTQ5OWY5MmQ0MWZhMmNk Nzc5MTk5ZTU2OTRhLi5lNGFlMTJkNmE1ZTc4NmZmMjZiODNiNDM1MTg3NjM0ZGMzZmZmMDIyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKQEAgLTkyLDYgKzkyLDggQEAgV0tfRVhQT1JUIGV4 dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtl eTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsUmVseWluZ1BhcnR5SURLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5n ICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25E YXRlS2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVu dGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXk7CitXS19FWFBPUlQgZXh0ZXJuIE5TU3Ry aW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEdyb3VwS2V5OworV0tf RVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRl bnRpYWxTeW5jaHJvbml6YWJsZUtleTsKIAogQHByb3RvY29sIF9XS1dlYkF1dGhlbnRpY2F0aW9u UGFuZWxEZWxlZ2F0ZSA8TlNPYmplY3Q+CiAKQEAgLTExNCw4ICsxMTYsMTAgQEAgV0tfQ0xBU1Nf QVZBSUxBQkxFKG1hY29zKDEwLjE1LjQpLCBpb3MoMTMuNCkpCiAKICsgKE5TQXJyYXk8TlNEaWN0 aW9uYXJ5ICo+ICopZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHMgV0tfQVBJX0FW QUlMQUJMRShtYWNvcygxMi4wKSwgaW9zKDE1LjApKTsKICsgKHZvaWQpZGVsZXRlTG9jYWxBdXRo ZW50aWNhdG9yQ3JlZGVudGlhbFdpdGhJRDooTlNEYXRhICopY3JlZGVudGlhbElEIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CisrICh2b2lkKWRlbGV0ZUxvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxXaXRoR3JvdXA6KE5TU3RyaW5nICogX051bGxhYmxlKWdyb3Vw IGNyZWRlbnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBXS19BUElfQVZBSUxBQkxFKG1hY29z KDEyLjApLCBpb3MoMTUuMCkpOwogKyAodm9pZCljbGVhckFsbExvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CiArICh2 b2lkKXNldFVzZXJuYW1lRm9yTG9jYWxDcmVkZW50aWFsV2l0aElEOihOU0RhdGEgKiljcmVkZW50 aWFsSUQgdXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJuYW1lIFdLX0FQSV9BVkFJTEFCTEUobWFj b3MoMTIuMCksIGlvcygxNS4wKSk7CisrICh2b2lkKXNldFVzZXJuYW1lRm9yTG9jYWxDcmVkZW50 aWFsV2l0aEdyb3VwOihOU1N0cmluZyAqIF9OdWxsYWJsZSlncm91cCBjcmVkZW50aWFsOihOU0Rh dGEgKiljcmVkZW50aWFsSUQgdXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJuYW1lIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKICsgKE5TRGF0 YSAqKWV4cG9ydExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNy ZWRlbnRpYWxJRCBlcnJvcjooTlNFcnJvciAqKillcnJvciBXS19BUElfQVZBSUxBQkxFKG1hY29z KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogKyAoTlNEYXRhICopaW1wb3J0TG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbDooTlNEYXRhICopY3JlZGVudGlhbEJsb2IgZXJyb3I6KE5T RXJyb3IgKiopZXJyb3IgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdL X0lPU19UQkEpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KaW5kZXggNzZmN2YyZDE3OWE1 MGQ3M2M0OTJjMzdhOTllNzljYzcwZWUzZDQwMC4uMGM3ZDU3NTliM2M3NzZlZWUzODFlYmIyNGY3 ZjZlZmVkNGVmY2VlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KQEAgLTcxLDYgKzcx LDEyIEBACiBzdGF0aWMgdm9pZCB1cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KE5TTXV0YWJsZURpY3Rp b25hcnkgKikKIHsKIH0KK3N0YXRpYyBpbmxpbmUgdm9pZCB1cGRhdGVDcmVkZW50aWFsSWZOZXNz ZXNhcnkoTlNNdXRhYmxlRGljdGlvbmFyeSAqY3JlZGVudGlhbCwgTlNEaWN0aW9uYXJ5ICphdHRy aWJ1dGVzKQoreworfQorc3RhdGljIGlubGluZSB2b2lkIHVwZGF0ZVF1ZXJ5Rm9yR3JvdXBJZk5l Y2Vzc2FyeShOU011dGFibGVEaWN0aW9uYXJ5ICpkaWN0aW9uYXJ5LCBOU1N0cmluZyAqZ3JvdXAp Cit7Cit9CiAjZW5kaWYKIAogc3RhdGljIFJldGFpblB0cjxOU0RhdGE+IHByb2R1Y2VDbGllbnRE YXRhSnNvbihfV0tXZWJBdXRoZW50aWNhdGlvblR5cGUgdHlwZSwgTlNEYXRhICpjaGFsbGVuZ2Us IE5TU3RyaW5nICpvcmlnaW4pCkBAIC0xMDUsNiArMTExLDggQEAgTlNTdHJpbmcgKiBjb25zdCBf V0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsSURLZXkgPSBAIl9XS0xvY2FsQXV0aGVudGlj YXRvckMKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFJl bHlpbmdQYXJ0eUlES2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsUmVseWlu Z1BhcnR5SURLZXkiOwogTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVk ZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxMYXN0TW9kaWZpY2F0aW9uRGF0ZUtleSI7CiBOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXkgPSBAIl9XS0xvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXkiOworTlNTdHJpbmcgKiBjb25zdCBf V0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsR3JvdXBLZXkgPSBAIl9XS0xvY2FsQXV0aGVu dGljYXRvckNyZWRlbnRpYWxHcm91cEtleSI7CitOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxTeW5jaHJvbml6YWJsZUtleSA9IEAiX1dLTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbFN5bmNocm9uaXphYmxlS2V5IjsKIAogQGltcGxlbWVudGF0aW9uIF9X S1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgewogI2lmIEVOQUJMRShXRUJfQVVUSE4pCkBAIC0yMzQs MTkgKzI0MiwxOCBAQCBzdGF0aWMgZmlkbzo6QXV0aGVudGljYXRvclN1cHBvcnRlZE9wdGlvbnM6 OlVzZXJWZXJpZmljYXRpb25BdmFpbGFiaWxpdHkgY29yZVVzZQogI2lmIEVOQUJMRShXRUJfQVVU SE4pCiBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNjZXNzR3JvdXApCiB7Ci0gICAgYXV0byBxdWVyeSA9 IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7Ci0gICAgW3F1ZXJ5 IHNldERpY3Rpb25hcnk6QHsKKyAgICBhdXRvIHF1ZXJ5ID0gQHsKICAgICAgICAgKF9fYnJpZGdl IGlkKWtTZWNDbGFzczogYnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzS2V5KSwKICAgICAgICAgKF9f YnJpZGdlIGlkKWtTZWNBdHRyS2V5Q2xhc3M6IGJyaWRnZV9pZF9jYXN0KGtTZWNBdHRyS2V5Q2xh c3NQcml2YXRlKSwKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQWNjZXNzR3JvdXA6IGFj Y2Vzc0dyb3VwLAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1JldHVybkF0dHJpYnV0ZXM6IEBZ RVMsCiAgICAgICAgIChfX2JyaWRnZSBpZClrU2VjTWF0Y2hMaW1pdDogYnJpZGdlX2lkX2Nhc3Qo a1NlY01hdGNoTGltaXRBbGwpLAorICAgICAgICAoX19icmlkZ2UgaWQpa1NlY0F0dHJTeW5jaHJv bml6YWJsZTogKGlkKWtTZWNBdHRyU3luY2hyb25pemFibGVBbnksCiAgICAgICAgIChfX2JyaWRn ZSBpZClrU2VjVXNlRGF0YVByb3RlY3Rpb25LZXljaGFpbjogQFlFUwotICAgIH1dOwotICAgIHVw ZGF0ZVF1ZXJ5SWZOZWNlc3NhcnkocXVlcnkuZ2V0KCkpOworICAgIH07CiAKICAgICBDRlR5cGVS ZWYgYXR0cmlidXRlc0FycmF5UmVmID0gbnVsbHB0cjsKLSAgICBPU1N0YXR1cyBzdGF0dXMgPSBT ZWNJdGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVlcnkuZ2V0KCks ICZhdHRyaWJ1dGVzQXJyYXlSZWYpOworICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5 TWF0Y2hpbmcoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilxdWVyeSwgJmF0dHJpYnV0ZXNBcnJh eVJlZik7CiAgICAgaWYgKHN0YXR1cyAmJiBzdGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZvdW5kKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBhdXRvIHJldGFpbkF0dHJpYnV0ZXNBcnJheSA9 IGFkb3B0Q0YoYXR0cmlidXRlc0FycmF5UmVmKTsKQEAgLTI3NCw2ICsyODEsNyBAQCBzdGF0aWMg UmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1w bChOU1N0cmluZyAqYWNjZQogICAgICAgICAgICAgYXR0cmlidXRlc1ticmlkZ2VfY2FzdChrU2Vj QXR0ckNyZWF0aW9uRGF0ZSldLCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRp b25EYXRlS2V5LAogICAgICAgICAgICAgbmlsCiAgICAgICAgIF0pOworICAgICAgICB1cGRhdGVD cmVkZW50aWFsSWZOZXNzZXNhcnkoY3JlZGVudGlhbC5nZXQoKSwgYXR0cmlidXRlcyk7CiAKICAg ICAgICAgaXQgPSByZXNwb25zZU1hcC5maW5kKGNib3I6OkNCT1JWYWx1ZShmaWRvOjprRGlzcGxh eU5hbWVNYXBLZXkpKTsKICAgICAgICAgaWYgKGl0ICE9IHJlc3BvbnNlTWFwLmVuZCgpICYmIGl0 LT5zZWNvbmQuaXNTdHJpbmcoKSkKQEAgLTMwNSwxNSArMzEzLDIxIEBAIHN0YXRpYyBSZXRhaW5Q dHI8TlNBcnJheT4gZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHNJbXBsKE5TU3Ry aW5nICphY2NlCiB9CiAKICsgKHZvaWQpZGVsZXRlTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlh bFdpdGhJRDooTlNEYXRhICopY3JlZGVudGlhbElECit7CisgICAgW3NlbGYgZGVsZXRlTG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbFdpdGhHcm91cDpuaWwgY3JlZGVudGlhbDpjcmVkZW50aWFs SURdOworfQorCisrICh2b2lkKWRlbGV0ZUxvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxXaXRo R3JvdXA6KE5TU3RyaW5nICopZ3JvdXAgY3JlZGVudGlhbDooTlNEYXRhICopY3JlZGVudGlhbElE CiB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikKICAgICBhdXRvIGRlbGV0ZVF1ZXJ5ID0gYWRvcHRO UyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKICAgICBbZGVsZXRlUXVlcnkg c2V0RGljdGlvbmFyeTpAewogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY0NsYXNzOiBicmlkZ2Vf aWRfY2FzdChrU2VjQ2xhc3NLZXkpLAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY0F0dHJBcHBs aWNhdGlvbkxhYmVsOiBjcmVkZW50aWFsSUQsCi0gICAgICAgIChfX2JyaWRnZSBpZClrU2VjVXNl RGF0YVByb3RlY3Rpb25LZXljaGFpbjogQFlFUworICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1Vz ZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMsCisgICAgICAgIChfX2JyaWRnZSBpZClrU2Vj QXR0clN5bmNocm9uaXphYmxlOiAoaWQpa1NlY0F0dHJTeW5jaHJvbml6YWJsZUFueQogICAgIH1d OwotICAgIHVwZGF0ZVF1ZXJ5SWZOZWNlc3NhcnkoZGVsZXRlUXVlcnkuZ2V0KCkpOworICAgIHVw ZGF0ZVF1ZXJ5Rm9yR3JvdXBJZk5lY2Vzc2FyeShkZWxldGVRdWVyeS5nZXQoKSwgZ3JvdXApOwog CiAgICAgU2VjSXRlbURlbGV0ZSgoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKWRlbGV0ZVF1ZXJ5 LmdldCgpKTsKICNlbmRpZgpAQCAtMzI3LDYgKzM0MSwxMSBAQCBzdGF0aWMgUmV0YWluUHRyPE5T QXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAq YWNjZQogfQogCiArICh2b2lkKXNldFVzZXJuYW1lRm9yTG9jYWxDcmVkZW50aWFsV2l0aElEOihO U0RhdGEgKiljcmVkZW50aWFsSUQgdXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJuYW1lCit7Cisg ICAgW3NlbGYgc2V0VXNlcm5hbWVGb3JMb2NhbENyZWRlbnRpYWxXaXRoR3JvdXA6bmlsIGNyZWRl bnRpYWw6Y3JlZGVudGlhbElEIHVzZXJuYW1lOnVzZXJuYW1lXTsKK30KKworKyAodm9pZClzZXRV c2VybmFtZUZvckxvY2FsQ3JlZGVudGlhbFdpdGhHcm91cDooTlNTdHJpbmcgKilncm91cCBjcmVk ZW50aWFsOihOU0RhdGEgKiljcmVkZW50aWFsSUQgdXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJu YW1lCiB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikKICAgICBhdXRvIHF1ZXJ5ID0gYWRvcHROUyhb W05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKQEAgLTMzNSw5ICszNTQsMTAgQEAg c3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50 aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNSZXR1cm5B dHRyaWJ1dGVzOiBAWUVTLAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY0F0dHJBcHBsaWNhdGlv bkxhYmVsOiBjcmVkZW50aWFsSUQsCiAgICAgICAgIChfX2JyaWRnZSBpZClrU2VjUmV0dXJuUGVy c2lzdGVudFJlZiA6IGJyaWRnZV9pZF9jYXN0KGtDRkJvb2xlYW5UcnVlKSwKKyAgICAgICAgKF9f YnJpZGdlIGlkKWtTZWNBdHRyU3luY2hyb25pemFibGU6IChpZClrU2VjQXR0clN5bmNocm9uaXph YmxlQW55LAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hh aW46IEBZRVMKICAgICB9XTsKLSAgICB1cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KHF1ZXJ5LmdldCgp KTsKKyAgICB1cGRhdGVRdWVyeUZvckdyb3VwSWZOZWNlc3NhcnkocXVlcnkuZ2V0KCksIGdyb3Vw KTsKIAogICAgIENGVHlwZVJlZiBhdHRyaWJ1dGVzQXJyYXlSZWYgPSBudWxscHRyOwogICAgIE9T U3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5TWF0Y2hpbmcoKF9fYnJpZGdlIENGRGljdGlvbmFy eVJlZilxdWVyeS5nZXQoKSwgJmF0dHJpYnV0ZXNBcnJheVJlZik7CkBAIC0zNzcsOCArMzk3LDkg QEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVk ZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICBbcXVlcnkgc2V0RGljdGlvbmFyeTpAewog ICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1ZhbHVlUGVyc2lzdGVudFJlZjogW2F0dHJpYnV0ZXMg b2JqZWN0Rm9yS2V5OmJyaWRnZV9pZF9jYXN0KGtTZWNWYWx1ZVBlcnNpc3RlbnRSZWYpXSwKICAg ICAgICAgKF9fYnJpZGdlIGlkKWtTZWNDbGFzczogYnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzS2V5 KSwKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyU3luY2hyb25pemFibGU6IChpZClrU2Vj QXR0clN5bmNocm9uaXphYmxlQW55LAogICAgIH1dOwotICAgIHVwZGF0ZVF1ZXJ5SWZOZWNlc3Nh cnkocXVlcnkuZ2V0KCkpOworICAgIHVwZGF0ZVF1ZXJ5Rm9yR3JvdXBJZk5lY2Vzc2FyeShxdWVy eS5nZXQoKSwgZ3JvdXApOwogCiAgICAgc3RhdHVzID0gU2VjSXRlbVVwZGF0ZSgoX19icmlkZ2Ug Q0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5LmdldCgpLCAoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXVw ZGF0ZVBhcmFtcyk7CiAgICAgaWYgKHN0YXR1cyAmJiBzdGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZv dW5kKSB7CkBAIC01MzMsOSArNTU0LDEwIEBAIHN0YXRpYyB2b2lkIGNyZWF0ZU5TRXJyb3JGcm9t V0tFcnJvcklmTmVjZXNzYXJ5KE5TRXJyb3IgKiplcnJvciwgV0tFcnJvckNvZGUgZXJyCiAgICAg ICAgIChpZClrU2VjQXR0cktleUNsYXNzUHJpdmF0ZSwgKGlkKWtTZWNBdHRyS2V5Q2xhc3MsCiAg ICAgICAgIEBZRVMsIChpZClrU2VjUmV0dXJuUmVmLAogICAgICAgICBAWUVTLCAoaWQpa1NlY1Vz ZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW4sCisgICAgICAgIChpZClrU2VjQXR0clN5bmNocm9uaXph YmxlQW55LCAoaWQpa1NlY0F0dHJTeW5jaHJvbml6YWJsZSwKICAgICAgICAgbmlsCiAgICAgXSk7 Ci0gICAgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShxdWVyeS5nZXQoKSk7CisKICAgICBDRlR5cGVS ZWYgcHJpdmF0ZUtleVJlZiA9IG51bGxwdHI7CiAgICAgT1NTdGF0dXMgc3RhdHVzID0gU2VjSXRl bUNvcHlNYXRjaGluZyhicmlkZ2VfY2FzdChxdWVyeS5nZXQoKSksICZwcml2YXRlS2V5UmVmKTsK ICAgICBpZiAoc3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91bmQpIHsK 451459 2022-02-09 16:46:11 -0800 2022-02-14 09:49:55 -0800 Patch bug-236364-20220209164610.patch text/plain 10804 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjJhYTE2NmJmNjczNGVhZTQxYzhhN2RlYTg3MTA1NDVl NWNiODcwODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMDkgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIE1vZGlmeSBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFscyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgcmVxdWlyZW1lbnRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYzNjQKKyAg ICAgICAgcmRhcjovLzg4NTg1NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtb2RpZmllcyB0aGUgZ2V0QWxsTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbHMgU1BJIHRvIHJldHVybiBhZGRpdGlvbmFsCisgICAgICAgIGZpZWxk cyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgbmVlZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06CisgICAgICAgICh1cGRhdGVD cmVkZW50aWFsSWZOZXNzZXNhcnkpOgorICAgICAgICAoZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbHNJbXBsKToKKwogMjAyMi0wMi0wOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNA d2Via2l0Lm9yZz4KIAogICAgICAgICBbbW9kZWxdIGltcHJvdmUgc2l6aW5nIG9uIG1hY09TCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dl YkF1dGhlbnRpY2F0aW9uUGFuZWwuaAppbmRleCBkODU4ZTRjMjI3OTc4ZTQ5OWY5MmQ0MWZhMmNk Nzc5MTk5ZTU2OTRhLi43NmNiYjNjNmJjYzkxYzFjN2NlZGYxYjU5MTZjODU4OGNhMzgxOTNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKQEAgLTkyLDYgKzkyLDggQEAgV0tfRVhQT1JUIGV4 dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtl eTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsUmVseWluZ1BhcnR5SURLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5n ICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25E YXRlS2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVu dGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXk7CitXS19FWFBPUlQgZXh0ZXJuIE5TU3Ry aW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEdyb3VwS2V5OworV0tf RVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRl bnRpYWxTeW5jaHJvbml6YWJsZUtleTsKIAogQHByb3RvY29sIF9XS1dlYkF1dGhlbnRpY2F0aW9u UGFuZWxEZWxlZ2F0ZSA8TlNPYmplY3Q+CiAKQEAgLTExNCwxMCArMTE2LDEzIEBAIFdLX0NMQVNT X0FWQUlMQUJMRShtYWNvcygxMC4xNS40KSwgaW9zKDEzLjQpKQogCiArIChOU0FycmF5PE5TRGlj dGlvbmFyeSAqPiAqKWdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CiArICh2b2lkKWRlbGV0ZUxvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBXS19BUElf QVZBSUxBQkxFKG1hY29zKDEyLjApLCBpb3MoMTUuMCkpOworKyAodm9pZClkZWxldGVMb2NhbEF1 dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aEdyb3VwOihOU1N0cmluZyAqIF9OdWxsYWJsZSlncm91 cCBjcmVkZW50aWFsOihOU0RhdGEgKiljcmVkZW50aWFsSUQgV0tfQVBJX0FWQUlMQUJMRShtYWNv cygxMi4wKSwgaW9zKDE1LjApKTsKICsgKHZvaWQpY2xlYXJBbGxMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFscyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEyLjApLCBpb3MoMTUuMCkpOwogKyAo dm9pZClzZXRVc2VybmFtZUZvckxvY2FsQ3JlZGVudGlhbFdpdGhJRDooTlNEYXRhICopY3JlZGVu dGlhbElEIHVzZXJuYW1lOiAoTlNTdHJpbmcgKil1c2VybmFtZSBXS19BUElfQVZBSUxBQkxFKG1h Y29zKDEyLjApLCBpb3MoMTUuMCkpOworKyAodm9pZClzZXRVc2VybmFtZUZvckxvY2FsQ3JlZGVu dGlhbFdpdGhHcm91cDooTlNTdHJpbmcgKiBfTnVsbGFibGUpZ3JvdXAgY3JlZGVudGlhbDooTlNE YXRhICopY3JlZGVudGlhbElEIHVzZXJuYW1lOiAoTlNTdHJpbmcgKil1c2VybmFtZSBXS19BUElf QVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCiArIChOU0Rh dGEgKilleHBvcnRMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aElEOihOU0RhdGEgKilj cmVkZW50aWFsSUQgZXJyb3I6KE5TRXJyb3IgKiopZXJyb3IgV0tfQVBJX0FWQUlMQUJMRShtYWNv cyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKysgKE5TRGF0YSAqKWV4cG9ydExvY2Fs QXV0aGVudGljYXRvckNyZWRlbnRpYWxXaXRoR3JvdXA6KE5TU3RyaW5nICogX051bGxhYmxlKWdy b3VwIGNyZWRlbnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBlcnJvcjooTlNFcnJvciAqKill cnJvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkp OwogKyAoTlNEYXRhICopaW1wb3J0TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbDooTlNEYXRh ICopY3JlZGVudGlhbEJsb2IgZXJyb3I6KE5TRXJyb3IgKiopZXJyb3IgV0tfQVBJX0FWQUlMQUJM RShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKICsgKE5TRGF0YSAqKWltcG9y dExvY2FsQXV0aGVudGljYXRvcldpdGhBY2Nlc3NHcm91cDooTlNTdHJpbmcgKilhY2Nlc3NHcm91 cCBjcmVkZW50aWFsOihOU0RhdGEgKiljcmVkZW50aWFsQmxvYiBlcnJvcjooTlNFcnJvciAqKill cnJvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmluZGV4IDc2ZjdmMmQxNzlhNTBkNzNjNDky YzM3YTk5ZTc5Y2M3MGVlM2Q0MDAuLmMyYzQzNmNiOTIyYWQzODMxZDZkYzQ1ZjQ5MTZiNWViNDBh YjRmM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tX ZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC03MSw2ICs3MSwxMiBAQAog c3RhdGljIHZvaWQgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShOU011dGFibGVEaWN0aW9uYXJ5ICop CiB7CiB9CitzdGF0aWMgaW5saW5lIHZvaWQgdXBkYXRlQ3JlZGVudGlhbElmTmVjZXNzYXJ5KE5T TXV0YWJsZURpY3Rpb25hcnkgKmNyZWRlbnRpYWwsIE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcykK K3sKK30KK3N0YXRpYyBpbmxpbmUgdm9pZCB1cGRhdGVRdWVyeUZvckdyb3VwSWZOZWNlc3Nhcnko TlNNdXRhYmxlRGljdGlvbmFyeSAqZGljdGlvbmFyeSwgTlNTdHJpbmcgKmdyb3VwKQoreworfQog I2VuZGlmCiAKIHN0YXRpYyBSZXRhaW5QdHI8TlNEYXRhPiBwcm9kdWNlQ2xpZW50RGF0YUpzb24o X1dLV2ViQXV0aGVudGljYXRpb25UeXBlIHR5cGUsIE5TRGF0YSAqY2hhbGxlbmdlLCBOU1N0cmlu ZyAqb3JpZ2luKQpAQCAtMTA1LDYgKzExMSw4IEBAIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDCiBO U1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFy dHlJREtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFJlbHlpbmdQYXJ0eUlE S2V5IjsKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExh c3RNb2RpZmljYXRpb25EYXRlS2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFs TGFzdE1vZGlmaWNhdGlvbkRhdGVLZXkiOwogTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5IjsKK05TU3RyaW5nICogY29uc3QgX1dLTG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbEdyb3VwS2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFsR3JvdXBLZXkiOworTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsU3luY2hyb25pemFibGVLZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxTeW5jaHJvbml6YWJsZUtleSI7CiAKIEBpbXBsZW1lbnRhdGlvbiBfV0tXZWJBdXRo ZW50aWNhdGlvblBhbmVsIHsKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQpAQCAtMjM0LDE5ICsyNDIs MTggQEAgc3RhdGljIGZpZG86OkF1dGhlbnRpY2F0b3JTdXBwb3J0ZWRPcHRpb25zOjpVc2VyVmVy aWZpY2F0aW9uQXZhaWxhYmlsaXR5IGNvcmVVc2UKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQogc3Rh dGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFs c0ltcGwoTlNTdHJpbmcgKmFjY2Vzc0dyb3VwKQogewotICAgIGF1dG8gcXVlcnkgPSBhZG9wdE5T KFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOwotICAgIFtxdWVyeSBzZXREaWN0 aW9uYXJ5OkB7CisgICAgYXV0byBxdWVyeSA9IEB7CiAgICAgICAgIChfX2JyaWRnZSBpZClrU2Vj Q2xhc3M6IGJyaWRnZV9pZF9jYXN0KGtTZWNDbGFzc0tleSksCiAgICAgICAgIChfX2JyaWRnZSBp ZClrU2VjQXR0cktleUNsYXNzOiBicmlkZ2VfaWRfY2FzdChrU2VjQXR0cktleUNsYXNzUHJpdmF0 ZSksCiAgICAgICAgIChfX2JyaWRnZSBpZClrU2VjQXR0ckFjY2Vzc0dyb3VwOiBhY2Nlc3NHcm91 cCwKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNSZXR1cm5BdHRyaWJ1dGVzOiBAWUVTLAogICAg ICAgICAoX19icmlkZ2UgaWQpa1NlY01hdGNoTGltaXQ6IGJyaWRnZV9pZF9jYXN0KGtTZWNNYXRj aExpbWl0QWxsKSwKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyU3luY2hyb25pemFibGU6 IChpZClrU2VjQXR0clN5bmNocm9uaXphYmxlQW55LAogICAgICAgICAoX19icmlkZ2UgaWQpa1Nl Y1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMKLSAgICB9XTsKLSAgICB1cGRhdGVRdWVy eUlmTmVjZXNzYXJ5KHF1ZXJ5LmdldCgpKTsKKyAgICB9OwogCiAgICAgQ0ZUeXBlUmVmIGF0dHJp YnV0ZXNBcnJheVJlZiA9IG51bGxwdHI7Ci0gICAgT1NTdGF0dXMgc3RhdHVzID0gU2VjSXRlbUNv cHlNYXRjaGluZygoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5LmdldCgpLCAmYXR0cmli dXRlc0FycmF5UmVmKTsKKyAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5n KChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVlcnksICZhdHRyaWJ1dGVzQXJyYXlSZWYpOwog ICAgIGlmIChzdGF0dXMgJiYgc3RhdHVzICE9IGVyclNlY0l0ZW1Ob3RGb3VuZCkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAgICAgYXV0byByZXRhaW5BdHRyaWJ1dGVzQXJyYXkgPSBhZG9wdENG KGF0dHJpYnV0ZXNBcnJheVJlZik7CkBAIC0yNzQsNiArMjgxLDcgQEAgc3RhdGljIFJldGFpblB0 cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJp bmcgKmFjY2UKICAgICAgICAgICAgIGF0dHJpYnV0ZXNbYnJpZGdlX2Nhc3Qoa1NlY0F0dHJDcmVh dGlvbkRhdGUpXSwgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbENyZWF0aW9uRGF0ZUtl eSwKICAgICAgICAgICAgIG5pbAogICAgICAgICBdKTsKKyAgICAgICAgdXBkYXRlQ3JlZGVudGlh bElmTmVjZXNzYXJ5KGNyZWRlbnRpYWwuZ2V0KCksIGF0dHJpYnV0ZXMpOwogCiAgICAgICAgIGl0 ID0gcmVzcG9uc2VNYXAuZmluZChjYm9yOjpDQk9SVmFsdWUoZmlkbzo6a0Rpc3BsYXlOYW1lTWFw S2V5KSk7CiAgICAgICAgIGlmIChpdCAhPSByZXNwb25zZU1hcC5lbmQoKSAmJiBpdC0+c2Vjb25k LmlzU3RyaW5nKCkpCkBAIC0zMDUsMTUgKzMxMywyMSBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJy YXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNj ZQogfQogCiArICh2b2lkKWRlbGV0ZUxvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxXaXRoSUQ6 KE5TRGF0YSAqKWNyZWRlbnRpYWxJRAoreworICAgIFtzZWxmIGRlbGV0ZUxvY2FsQXV0aGVudGlj YXRvckNyZWRlbnRpYWxXaXRoR3JvdXA6bmlsIGNyZWRlbnRpYWw6Y3JlZGVudGlhbElEXTsKK30K KworKyAodm9pZClkZWxldGVMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aEdyb3VwOihO U1N0cmluZyAqKWdyb3VwIGNyZWRlbnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRAogewogI2lm IEVOQUJMRShXRUJfQVVUSE4pCiAgICAgYXV0byBkZWxldGVRdWVyeSA9IGFkb3B0TlMoW1tOU011 dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CiAgICAgW2RlbGV0ZVF1ZXJ5IHNldERpY3Rp b25hcnk6QHsKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNDbGFzczogYnJpZGdlX2lkX2Nhc3Qo a1NlY0NsYXNzS2V5KSwKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQXBwbGljYXRpb25M YWJlbDogY3JlZGVudGlhbElELAotICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1VzZURhdGFQcm90 ZWN0aW9uS2V5Y2hhaW46IEBZRVMKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNVc2VEYXRhUHJv dGVjdGlvbktleWNoYWluOiBAWUVTLAorICAgICAgICAoX19icmlkZ2UgaWQpa1NlY0F0dHJTeW5j aHJvbml6YWJsZTogKGlkKWtTZWNBdHRyU3luY2hyb25pemFibGVBbnkKICAgICB9XTsKLSAgICB1 cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KGRlbGV0ZVF1ZXJ5LmdldCgpKTsKKyAgICB1cGRhdGVRdWVy eUZvckdyb3VwSWZOZWNlc3NhcnkoZGVsZXRlUXVlcnkuZ2V0KCksIGdyb3VwKTsKIAogICAgIFNl Y0l0ZW1EZWxldGUoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilkZWxldGVRdWVyeS5nZXQoKSk7 CiAjZW5kaWYKQEAgLTMyNyw2ICszNDEsMTEgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBn ZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKIH0K IAogKyAodm9pZClzZXRVc2VybmFtZUZvckxvY2FsQ3JlZGVudGlhbFdpdGhJRDooTlNEYXRhICop Y3JlZGVudGlhbElEIHVzZXJuYW1lOiAoTlNTdHJpbmcgKil1c2VybmFtZQoreworICAgIFtzZWxm IHNldFVzZXJuYW1lRm9yTG9jYWxDcmVkZW50aWFsV2l0aEdyb3VwOm5pbCBjcmVkZW50aWFsOmNy ZWRlbnRpYWxJRCB1c2VybmFtZTp1c2VybmFtZV07Cit9CisKKysgKHZvaWQpc2V0VXNlcm5hbWVG b3JMb2NhbENyZWRlbnRpYWxXaXRoR3JvdXA6KE5TU3RyaW5nICopZ3JvdXAgY3JlZGVudGlhbDoo TlNEYXRhICopY3JlZGVudGlhbElEIHVzZXJuYW1lOiAoTlNTdHJpbmcgKil1c2VybmFtZQogewog I2lmIEVOQUJMRShXRUJfQVVUSE4pCiAgICAgYXV0byBxdWVyeSA9IGFkb3B0TlMoW1tOU011dGFi bGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CkBAIC0zMzUsOSArMzU0LDEwIEBAIHN0YXRpYyBS ZXRhaW5QdHI8TlNBcnJheT4gZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHNJbXBs KE5TU3RyaW5nICphY2NlCiAgICAgICAgIChfX2JyaWRnZSBpZClrU2VjUmV0dXJuQXR0cmlidXRl czogQFlFUywKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQXBwbGljYXRpb25MYWJlbDog Y3JlZGVudGlhbElELAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1JldHVyblBlcnNpc3RlbnRS ZWYgOiBicmlkZ2VfaWRfY2FzdChrQ0ZCb29sZWFuVHJ1ZSksCisgICAgICAgIChfX2JyaWRnZSBp ZClrU2VjQXR0clN5bmNocm9uaXphYmxlOiAoaWQpa1NlY0F0dHJTeW5jaHJvbml6YWJsZUFueSwK ICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNVc2VEYXRhUHJvdGVjdGlvbktleWNoYWluOiBAWUVT CiAgICAgfV07Ci0gICAgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShxdWVyeS5nZXQoKSk7CisgICAg dXBkYXRlUXVlcnlGb3JHcm91cElmTmVjZXNzYXJ5KHF1ZXJ5LmdldCgpLCBncm91cCk7CiAKICAg ICBDRlR5cGVSZWYgYXR0cmlidXRlc0FycmF5UmVmID0gbnVsbHB0cjsKICAgICBPU1N0YXR1cyBz dGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVl cnkuZ2V0KCksICZhdHRyaWJ1dGVzQXJyYXlSZWYpOwpAQCAtMzc3LDggKzM5Nyw5IEBAIHN0YXRp YyBSZXRhaW5QdHI8TlNBcnJheT4gZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHNJ bXBsKE5TU3RyaW5nICphY2NlCiAgICAgW3F1ZXJ5IHNldERpY3Rpb25hcnk6QHsKICAgICAgICAg KF9fYnJpZGdlIGlkKWtTZWNWYWx1ZVBlcnNpc3RlbnRSZWY6IFthdHRyaWJ1dGVzIG9iamVjdEZv cktleTpicmlkZ2VfaWRfY2FzdChrU2VjVmFsdWVQZXJzaXN0ZW50UmVmKV0sCiAgICAgICAgIChf X2JyaWRnZSBpZClrU2VjQ2xhc3M6IGJyaWRnZV9pZF9jYXN0KGtTZWNDbGFzc0tleSksCisgICAg ICAgIChfX2JyaWRnZSBpZClrU2VjQXR0clN5bmNocm9uaXphYmxlOiAoaWQpa1NlY0F0dHJTeW5j aHJvbml6YWJsZUFueSwKICAgICB9XTsKLSAgICB1cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KHF1ZXJ5 LmdldCgpKTsKKyAgICB1cGRhdGVRdWVyeUZvckdyb3VwSWZOZWNlc3NhcnkocXVlcnkuZ2V0KCks IGdyb3VwKTsKIAogICAgIHN0YXR1cyA9IFNlY0l0ZW1VcGRhdGUoKF9fYnJpZGdlIENGRGljdGlv bmFyeVJlZilxdWVyeS5nZXQoKSwgKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZil1cGRhdGVQYXJh bXMpOwogICAgIGlmIChzdGF0dXMgJiYgc3RhdHVzICE9IGVyclNlY0l0ZW1Ob3RGb3VuZCkgewpA QCAtNTI1LDYgKzU0NiwxMSBAQCBzdGF0aWMgdm9pZCBjcmVhdGVOU0Vycm9yRnJvbVdLRXJyb3JJ Zk5lY2Vzc2FyeShOU0Vycm9yICoqZXJyb3IsIFdLRXJyb3JDb2RlIGVycgogfQogCiArIChOU0Rh dGEgKilleHBvcnRMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aElEOihOU0RhdGEgKilj cmVkZW50aWFsSUQgZXJyb3I6KE5TRXJyb3IgKiopZXJyb3IKK3sKKyAgICByZXR1cm4gW3NlbGYg ZXhwb3J0TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFdpdGhHcm91cDpuaWwgY3JlZGVudGlh bDpjcmVkZW50aWFsSUQgZXJyb3I6ZXJyb3JdOworfQorCisrIChOU0RhdGEgKilleHBvcnRMb2Nh bEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aEdyb3VwOihOU1N0cmluZyAqKWdyb3VwIGNyZWRl bnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBlcnJvcjooTlNFcnJvciAqKillcnJvcgogewog I2lmIEVOQUJMRShXRUJfQVVUSE4pCiAgICAgYXV0byBxdWVyeSA9IGFkb3B0TlMoW1tOU011dGFi bGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0V2l0aE9iamVjdHNBbmRLZXlzOgpAQCAtNTMzLDkgKzU1 OSwxMSBAQCBzdGF0aWMgdm9pZCBjcmVhdGVOU0Vycm9yRnJvbVdLRXJyb3JJZk5lY2Vzc2FyeShO U0Vycm9yICoqZXJyb3IsIFdLRXJyb3JDb2RlIGVycgogICAgICAgICAoaWQpa1NlY0F0dHJLZXlD bGFzc1ByaXZhdGUsIChpZClrU2VjQXR0cktleUNsYXNzLAogICAgICAgICBAWUVTLCAoaWQpa1Nl Y1JldHVyblJlZiwKICAgICAgICAgQFlFUywgKGlkKWtTZWNVc2VEYXRhUHJvdGVjdGlvbktleWNo YWluLAorICAgICAgICAoaWQpa1NlY0F0dHJTeW5jaHJvbml6YWJsZUFueSwgKGlkKWtTZWNBdHRy U3luY2hyb25pemFibGUsCiAgICAgICAgIG5pbAogICAgIF0pOwotICAgIHVwZGF0ZVF1ZXJ5SWZO ZWNlc3NhcnkocXVlcnkuZ2V0KCkpOworICAgIHVwZGF0ZVF1ZXJ5Rm9yR3JvdXBJZk5lY2Vzc2Fy eShxdWVyeS5nZXQoKSwgZ3JvdXApOworCiAgICAgQ0ZUeXBlUmVmIHByaXZhdGVLZXlSZWYgPSBu dWxscHRyOwogICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5TWF0Y2hpbmcoYnJpZGdl X2Nhc3QocXVlcnkuZ2V0KCkpLCAmcHJpdmF0ZUtleVJlZik7CiAgICAgaWYgKHN0YXR1cyAmJiBz dGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZvdW5kKSB7Cg== 451918 2022-02-14 09:49:57 -0800 2022-02-15 09:05:11 -0800 Patch for landing bug-236364-20220214094956.patch text/plain 10849 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM1NmQ3NjE4OWI0ZThlN2E4 YjE5NmQ3M2JjMTZmZjk0ZTlmMGEyMzMuLjk3YTMyMDAwZjBhNjE0MDI1MmIzYWZiZDZhNWZkOTAy ZDM5NzVkZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMTQgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIE1vZGlmeSBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFscyBhY2NvcmRpbmcgdG8gaW50ZXJuYWwgcmVxdWlyZW1lbnRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYzNjQKKyAg ICAgICAgcmRhcjovLzg4NTg1NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hh bS4KKworICAgICAgICBUaGlzIHBhdGNoIG1vZGlmaWVzIHRoZSBnZXRBbGxMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFscyBTUEkgdG8gcmV0dXJuIGFkZGl0aW9uYWwKKyAgICAgICAgZmllbGRz IGFjY29yZGluZyB0byBpbnRlcm5hbCBuZWVkcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAgICAgKHVwZGF0ZUNy ZWRlbnRpYWxJZk5lc3Nlc2FyeSk6CisgICAgICAgIChnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFsc0ltcGwpOgorCiAyMDIyLTAyLTEzICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dl YkF1dGhlbnRpY2F0aW9uUGFuZWwuaAppbmRleCBkODU4ZTRjMjI3OTc4ZTQ5OWY5MmQ0MWZhMmNk Nzc5MTk5ZTU2OTRhLi4wNzVlZWE4ZDJlNDliMGJlZTFhZGEyYzY5NDE5YmUzOGZmZWUwZGRmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKQEAgLTkyLDYgKzkyLDggQEAgV0tfRVhQT1JUIGV4 dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtl eTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsUmVseWluZ1BhcnR5SURLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5n ICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25E YXRlS2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVu dGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXk7CitXS19FWFBPUlQgZXh0ZXJuIE5TU3Ry aW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEdyb3VwS2V5OworV0tf RVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRl bnRpYWxTeW5jaHJvbml6YWJsZUtleTsKIAogQHByb3RvY29sIF9XS1dlYkF1dGhlbnRpY2F0aW9u UGFuZWxEZWxlZ2F0ZSA8TlNPYmplY3Q+CiAKQEAgLTExNCwxMCArMTE2LDEzIEBAIFdLX0NMQVNT X0FWQUlMQUJMRShtYWNvcygxMC4xNS40KSwgaW9zKDEzLjQpKQogCiArIChOU0FycmF5PE5TRGlj dGlvbmFyeSAqPiAqKWdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CiArICh2b2lkKWRlbGV0ZUxvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBXS19BUElf QVZBSUxBQkxFKG1hY29zKDEyLjApLCBpb3MoMTUuMCkpOworKyAodm9pZClkZWxldGVMb2NhbEF1 dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aEdyb3VwQW5kSUQ6KE5TU3RyaW5nICogX051bGxhYmxl KWdyb3VwIGNyZWRlbnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBXS19BUElfQVZBSUxBQkxF KG1hY29zKDEyLjApLCBpb3MoMTUuMCkpOwogKyAodm9pZCljbGVhckFsbExvY2FsQXV0aGVudGlj YXRvckNyZWRlbnRpYWxzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7 CiArICh2b2lkKXNldFVzZXJuYW1lRm9yTG9jYWxDcmVkZW50aWFsV2l0aElEOihOU0RhdGEgKilj cmVkZW50aWFsSUQgdXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJuYW1lIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoMTIuMCksIGlvcygxNS4wKSk7CisrICh2b2lkKXNldFVzZXJuYW1lRm9yTG9jYWxD cmVkZW50aWFsV2l0aEdyb3VwQW5kSUQ6KE5TU3RyaW5nICogX051bGxhYmxlKWdyb3VwIGNyZWRl bnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCB1c2VybmFtZTogKE5TU3RyaW5nICopdXNlcm5h bWUgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsK IAogKyAoTlNEYXRhICopZXhwb3J0TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFdpdGhJRDoo TlNEYXRhICopY3JlZGVudGlhbElEIGVycm9yOihOU0Vycm9yICoqKWVycm9yIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisrIChOU0RhdGEgKill eHBvcnRMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsV2l0aEdyb3VwQW5kSUQ6KE5TU3RyaW5n ICogX051bGxhYmxlKWdyb3VwIGNyZWRlbnRpYWw6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBlcnJv cjooTlNFcnJvciAqKillcnJvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBp b3MoV0tfSU9TX1RCQSkpOwogKyAoTlNEYXRhICopaW1wb3J0TG9jYWxBdXRoZW50aWNhdG9yQ3Jl ZGVudGlhbDooTlNEYXRhICopY3JlZGVudGlhbEJsb2IgZXJyb3I6KE5TRXJyb3IgKiopZXJyb3Ig V0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKICsg KE5TRGF0YSAqKWltcG9ydExvY2FsQXV0aGVudGljYXRvcldpdGhBY2Nlc3NHcm91cDooTlNTdHJp bmcgKilhY2Nlc3NHcm91cCBjcmVkZW50aWFsOihOU0RhdGEgKiljcmVkZW50aWFsQmxvYiBlcnJv cjooTlNFcnJvciAqKillcnJvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBp b3MoV0tfSU9TX1RCQSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmluZGV4IDc2Zjdm MmQxNzlhNTBkNzNjNDkyYzM3YTk5ZTc5Y2M3MGVlM2Q0MDAuLjNjNzllMDVmNTc3ZmFlY2VkMTc2 NGFkMDQyMmQ2M2Y4ZmQ3MGYzMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC03 MSw2ICs3MSwxMiBAQAogc3RhdGljIHZvaWQgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShOU011dGFi bGVEaWN0aW9uYXJ5ICopCiB7CiB9CitzdGF0aWMgaW5saW5lIHZvaWQgdXBkYXRlQ3JlZGVudGlh bElmTmVjZXNzYXJ5KE5TTXV0YWJsZURpY3Rpb25hcnkgKmNyZWRlbnRpYWwsIE5TRGljdGlvbmFy eSAqYXR0cmlidXRlcykKK3sKK30KK3N0YXRpYyBpbmxpbmUgdm9pZCB1cGRhdGVRdWVyeUZvckdy b3VwSWZOZWNlc3NhcnkoTlNNdXRhYmxlRGljdGlvbmFyeSAqZGljdGlvbmFyeSwgTlNTdHJpbmcg Kmdyb3VwKQoreworfQogI2VuZGlmCiAKIHN0YXRpYyBSZXRhaW5QdHI8TlNEYXRhPiBwcm9kdWNl Q2xpZW50RGF0YUpzb24oX1dLV2ViQXV0aGVudGljYXRpb25UeXBlIHR5cGUsIE5TRGF0YSAqY2hh bGxlbmdlLCBOU1N0cmluZyAqb3JpZ2luKQpAQCAtMTA1LDYgKzExMSw4IEBAIE5TU3RyaW5nICog Y29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5ID0gQCJfV0tMb2NhbEF1 dGhlbnRpY2F0b3JDCiBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRl bnRpYWxSZWx5aW5nUGFydHlJREtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlh bFJlbHlpbmdQYXJ0eUlES2V5IjsKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNh dG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25EYXRlS2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXkiOwogTlNTdHJpbmcgKiBjb25z dCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5ID0gQCJfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5IjsKK05TU3RyaW5nICog Y29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEdyb3VwS2V5ID0gQCJfV0tMb2Nh bEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsR3JvdXBLZXkiOworTlNTdHJpbmcgKiBjb25zdCBfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsU3luY2hyb25pemFibGVLZXkgPSBAIl9XS0xvY2Fs QXV0aGVudGljYXRvckNyZWRlbnRpYWxTeW5jaHJvbml6YWJsZUtleSI7CiAKIEBpbXBsZW1lbnRh dGlvbiBfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIHsKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQpA QCAtMjM0LDE5ICsyNDIsMTggQEAgc3RhdGljIGZpZG86OkF1dGhlbnRpY2F0b3JTdXBwb3J0ZWRP cHRpb25zOjpVc2VyVmVyaWZpY2F0aW9uQXZhaWxhYmlsaXR5IGNvcmVVc2UKICNpZiBFTkFCTEUo V0VCX0FVVEhOKQogc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2Vzc0dyb3VwKQogewotICAgIGF1dG8g cXVlcnkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOwotICAg IFtxdWVyeSBzZXREaWN0aW9uYXJ5OkB7CisgICAgYXV0byBxdWVyeSA9IEB7CiAgICAgICAgIChf X2JyaWRnZSBpZClrU2VjQ2xhc3M6IGJyaWRnZV9pZF9jYXN0KGtTZWNDbGFzc0tleSksCiAgICAg ICAgIChfX2JyaWRnZSBpZClrU2VjQXR0cktleUNsYXNzOiBicmlkZ2VfaWRfY2FzdChrU2VjQXR0 cktleUNsYXNzUHJpdmF0ZSksCiAgICAgICAgIChfX2JyaWRnZSBpZClrU2VjQXR0ckFjY2Vzc0dy b3VwOiBhY2Nlc3NHcm91cCwKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNSZXR1cm5BdHRyaWJ1 dGVzOiBAWUVTLAogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY01hdGNoTGltaXQ6IGJyaWRnZV9p ZF9jYXN0KGtTZWNNYXRjaExpbWl0QWxsKSwKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRy U3luY2hyb25pemFibGU6IChpZClrU2VjQXR0clN5bmNocm9uaXphYmxlQW55LAogICAgICAgICAo X19icmlkZ2UgaWQpa1NlY1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMKLSAgICB9XTsK LSAgICB1cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KHF1ZXJ5LmdldCgpKTsKKyAgICB9OwogCiAgICAg Q0ZUeXBlUmVmIGF0dHJpYnV0ZXNBcnJheVJlZiA9IG51bGxwdHI7Ci0gICAgT1NTdGF0dXMgc3Rh dHVzID0gU2VjSXRlbUNvcHlNYXRjaGluZygoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5 LmdldCgpLCAmYXR0cmlidXRlc0FycmF5UmVmKTsKKyAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJ dGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVlcnksICZhdHRyaWJ1 dGVzQXJyYXlSZWYpOwogICAgIGlmIChzdGF0dXMgJiYgc3RhdHVzICE9IGVyclNlY0l0ZW1Ob3RG b3VuZCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgYXV0byByZXRhaW5BdHRyaWJ1dGVz QXJyYXkgPSBhZG9wdENGKGF0dHJpYnV0ZXNBcnJheVJlZik7CkBAIC0yNzQsNiArMjgxLDcgQEAg c3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50 aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICAgICAgICAgIGF0dHJpYnV0ZXNbYnJpZGdlX2Nh c3Qoa1NlY0F0dHJDcmVhdGlvbkRhdGUpXSwgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlh bENyZWF0aW9uRGF0ZUtleSwKICAgICAgICAgICAgIG5pbAogICAgICAgICBdKTsKKyAgICAgICAg dXBkYXRlQ3JlZGVudGlhbElmTmVjZXNzYXJ5KGNyZWRlbnRpYWwuZ2V0KCksIGF0dHJpYnV0ZXMp OwogCiAgICAgICAgIGl0ID0gcmVzcG9uc2VNYXAuZmluZChjYm9yOjpDQk9SVmFsdWUoZmlkbzo6 a0Rpc3BsYXlOYW1lTWFwS2V5KSk7CiAgICAgICAgIGlmIChpdCAhPSByZXNwb25zZU1hcC5lbmQo KSAmJiBpdC0+c2Vjb25kLmlzU3RyaW5nKCkpCkBAIC0zMDUsMTUgKzMxMywyMSBAQCBzdGF0aWMg UmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1w bChOU1N0cmluZyAqYWNjZQogfQogCiArICh2b2lkKWRlbGV0ZUxvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRAoreworICAgIFtzZWxmIGRlbGV0 ZUxvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxXaXRoR3JvdXBBbmRJRDpuaWwgY3JlZGVudGlh bDpjcmVkZW50aWFsSURdOworfQorCisrICh2b2lkKWRlbGV0ZUxvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxXaXRoR3JvdXBBbmRJRDooTlNTdHJpbmcgKilncm91cCBjcmVkZW50aWFsOihOU0Rh dGEgKiljcmVkZW50aWFsSUQKIHsKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQogICAgIGF1dG8gZGVs ZXRlUXVlcnkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOwog ICAgIFtkZWxldGVRdWVyeSBzZXREaWN0aW9uYXJ5OkB7CiAgICAgICAgIChfX2JyaWRnZSBpZClr U2VjQ2xhc3M6IGJyaWRnZV9pZF9jYXN0KGtTZWNDbGFzc0tleSksCiAgICAgICAgIChfX2JyaWRn ZSBpZClrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWw6IGNyZWRlbnRpYWxJRCwKLSAgICAgICAgKF9f YnJpZGdlIGlkKWtTZWNVc2VEYXRhUHJvdGVjdGlvbktleWNoYWluOiBAWUVTCisgICAgICAgIChf X2JyaWRnZSBpZClrU2VjVXNlRGF0YVByb3RlY3Rpb25LZXljaGFpbjogQFlFUywKKyAgICAgICAg KF9fYnJpZGdlIGlkKWtTZWNBdHRyU3luY2hyb25pemFibGU6IChpZClrU2VjQXR0clN5bmNocm9u aXphYmxlQW55CiAgICAgfV07Ci0gICAgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShkZWxldGVRdWVy eS5nZXQoKSk7CisgICAgdXBkYXRlUXVlcnlGb3JHcm91cElmTmVjZXNzYXJ5KGRlbGV0ZVF1ZXJ5 LmdldCgpLCBncm91cCk7CiAKICAgICBTZWNJdGVtRGVsZXRlKChfX2JyaWRnZSBDRkRpY3Rpb25h cnlSZWYpZGVsZXRlUXVlcnkuZ2V0KCkpOwogI2VuZGlmCkBAIC0zMjcsNiArMzQxLDExIEBAIHN0 YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlh bHNJbXBsKE5TU3RyaW5nICphY2NlCiB9CiAKICsgKHZvaWQpc2V0VXNlcm5hbWVGb3JMb2NhbENy ZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCB1c2VybmFtZTogKE5TU3RyaW5n ICopdXNlcm5hbWUKK3sKKyAgICBbc2VsZiBzZXRVc2VybmFtZUZvckxvY2FsQ3JlZGVudGlhbFdp dGhHcm91cEFuZElEOm5pbCBjcmVkZW50aWFsOmNyZWRlbnRpYWxJRCB1c2VybmFtZTp1c2VybmFt ZV07Cit9CisKKysgKHZvaWQpc2V0VXNlcm5hbWVGb3JMb2NhbENyZWRlbnRpYWxXaXRoR3JvdXBB bmRJRDooTlNTdHJpbmcgKilncm91cCBjcmVkZW50aWFsOihOU0RhdGEgKiljcmVkZW50aWFsSUQg dXNlcm5hbWU6IChOU1N0cmluZyAqKXVzZXJuYW1lCiB7CiAjaWYgRU5BQkxFKFdFQl9BVVRITikK ICAgICBhdXRvIHF1ZXJ5ID0gYWRvcHROUyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGlu aXRdKTsKQEAgLTMzNSw5ICszNTQsMTAgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRB bGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICAg ICAgKF9fYnJpZGdlIGlkKWtTZWNSZXR1cm5BdHRyaWJ1dGVzOiBAWUVTLAogICAgICAgICAoX19i cmlkZ2UgaWQpa1NlY0F0dHJBcHBsaWNhdGlvbkxhYmVsOiBjcmVkZW50aWFsSUQsCiAgICAgICAg IChfX2JyaWRnZSBpZClrU2VjUmV0dXJuUGVyc2lzdGVudFJlZiA6IGJyaWRnZV9pZF9jYXN0KGtD RkJvb2xlYW5UcnVlKSwKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyU3luY2hyb25pemFi bGU6IChpZClrU2VjQXR0clN5bmNocm9uaXphYmxlQW55LAogICAgICAgICAoX19icmlkZ2UgaWQp a1NlY1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMKICAgICB9XTsKLSAgICB1cGRhdGVR dWVyeUlmTmVjZXNzYXJ5KHF1ZXJ5LmdldCgpKTsKKyAgICB1cGRhdGVRdWVyeUZvckdyb3VwSWZO ZWNlc3NhcnkocXVlcnkuZ2V0KCksIGdyb3VwKTsKIAogICAgIENGVHlwZVJlZiBhdHRyaWJ1dGVz QXJyYXlSZWYgPSBudWxscHRyOwogICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5TWF0 Y2hpbmcoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilxdWVyeS5nZXQoKSwgJmF0dHJpYnV0ZXNB cnJheVJlZik7CkBAIC0zNzcsOCArMzk3LDkgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBn ZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAg ICBbcXVlcnkgc2V0RGljdGlvbmFyeTpAewogICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1ZhbHVl UGVyc2lzdGVudFJlZjogW2F0dHJpYnV0ZXMgb2JqZWN0Rm9yS2V5OmJyaWRnZV9pZF9jYXN0KGtT ZWNWYWx1ZVBlcnNpc3RlbnRSZWYpXSwKICAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNDbGFzczog YnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzS2V5KSwKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNB dHRyU3luY2hyb25pemFibGU6IChpZClrU2VjQXR0clN5bmNocm9uaXphYmxlQW55LAogICAgIH1d OwotICAgIHVwZGF0ZVF1ZXJ5SWZOZWNlc3NhcnkocXVlcnkuZ2V0KCkpOworICAgIHVwZGF0ZVF1 ZXJ5Rm9yR3JvdXBJZk5lY2Vzc2FyeShxdWVyeS5nZXQoKSwgZ3JvdXApOwogCiAgICAgc3RhdHVz ID0gU2VjSXRlbVVwZGF0ZSgoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5LmdldCgpLCAo X19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXVwZGF0ZVBhcmFtcyk7CiAgICAgaWYgKHN0YXR1cyAm JiBzdGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZvdW5kKSB7CkBAIC01MjUsNiArNTQ2LDExIEBAIHN0 YXRpYyB2b2lkIGNyZWF0ZU5TRXJyb3JGcm9tV0tFcnJvcklmTmVjZXNzYXJ5KE5TRXJyb3IgKipl cnJvciwgV0tFcnJvckNvZGUgZXJyCiB9CiAKICsgKE5TRGF0YSAqKWV4cG9ydExvY2FsQXV0aGVu dGljYXRvckNyZWRlbnRpYWxXaXRoSUQ6KE5TRGF0YSAqKWNyZWRlbnRpYWxJRCBlcnJvcjooTlNF cnJvciAqKillcnJvcgoreworICAgIHJldHVybiBbc2VsZiBleHBvcnRMb2NhbEF1dGhlbnRpY2F0 b3JDcmVkZW50aWFsV2l0aEdyb3VwQW5kSUQ6bmlsIGNyZWRlbnRpYWw6Y3JlZGVudGlhbElEIGVy cm9yOmVycm9yXTsKK30KKworKyAoTlNEYXRhICopZXhwb3J0TG9jYWxBdXRoZW50aWNhdG9yQ3Jl ZGVudGlhbFdpdGhHcm91cEFuZElEOihOU1N0cmluZyAqKWdyb3VwIGNyZWRlbnRpYWw6KE5TRGF0 YSAqKWNyZWRlbnRpYWxJRCBlcnJvcjooTlNFcnJvciAqKillcnJvcgogewogI2lmIEVOQUJMRShX RUJfQVVUSE4pCiAgICAgYXV0byBxdWVyeSA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5 IGFsbG9jXSBpbml0V2l0aE9iamVjdHNBbmRLZXlzOgpAQCAtNTMzLDkgKzU1OSwxMSBAQCBzdGF0 aWMgdm9pZCBjcmVhdGVOU0Vycm9yRnJvbVdLRXJyb3JJZk5lY2Vzc2FyeShOU0Vycm9yICoqZXJy b3IsIFdLRXJyb3JDb2RlIGVycgogICAgICAgICAoaWQpa1NlY0F0dHJLZXlDbGFzc1ByaXZhdGUs IChpZClrU2VjQXR0cktleUNsYXNzLAogICAgICAgICBAWUVTLCAoaWQpa1NlY1JldHVyblJlZiwK ICAgICAgICAgQFlFUywgKGlkKWtTZWNVc2VEYXRhUHJvdGVjdGlvbktleWNoYWluLAorICAgICAg ICAoaWQpa1NlY0F0dHJTeW5jaHJvbml6YWJsZUFueSwgKGlkKWtTZWNBdHRyU3luY2hyb25pemFi bGUsCiAgICAgICAgIG5pbAogICAgIF0pOwotICAgIHVwZGF0ZVF1ZXJ5SWZOZWNlc3NhcnkocXVl cnkuZ2V0KCkpOworICAgIHVwZGF0ZVF1ZXJ5Rm9yR3JvdXBJZk5lY2Vzc2FyeShxdWVyeS5nZXQo KSwgZ3JvdXApOworCiAgICAgQ0ZUeXBlUmVmIHByaXZhdGVLZXlSZWYgPSBudWxscHRyOwogICAg IE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5TWF0Y2hpbmcoYnJpZGdlX2Nhc3QocXVlcnku Z2V0KCkpLCAmcHJpdmF0ZUtleVJlZik7CiAgICAgaWYgKHN0YXR1cyAmJiBzdGF0dXMgIT0gZXJy U2VjSXRlbU5vdEZvdW5kKSB7Cg==