233389 2021-11-19 16:28:39 -0800 [WebAuthn] Consider support for the displayName for FIDO authenticator 2021-12-08 15:50:36 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham ews-watchlist jiewen_tan webkit-bug-importer oldest_to_newest 1817039 0 pascoe 2021-11-19 16:28:39 -0800 Vendors have requested that we support displayName for platform authenticator. Adding icon while at it. 1817040 1 pascoe 2021-11-19 16:28:44 -0800 rdar://84938707 1817042 2 444868 pascoe 2021-11-19 16:32:34 -0800 Created attachment 444868 Patch 1820657 3 446049 pascoe 2021-12-06 10:30:51 -0800 Created attachment 446049 Patch 1821233 4 446049 bfulgham 2021-12-07 15:01:59 -0800 Comment on attachment 446049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446049&action=review > Source/WebKit/ChangeLog:9 > + Start storing the displayName and icon fields with the platform authenticator Are these part of the WebAuthn spec? If so, could you add comments in the code indicating the relevant spec step to make it easy to find/validate this later? > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:271 > + [credential setDictionary:@{ Could also be done with 'initWithObjectsAndKeys: ', but I doubt there's any real performance benefit to doing so. 1821609 5 446381 pascoe 2021-12-08 10:15:30 -0800 Created attachment 446381 Patch 1821610 6 pascoe 2021-12-08 10:16:57 -0800 Thank you for the review. Addressed comments and removed icon from the change, as it is a field that was removed from the webauthn spec in: https://github.com/w3c/webauthn/pull/1337 1821612 7 446381 bfulgham 2021-12-08 10:21:26 -0800 Comment on attachment 446381 Patch r=me. Nice! 1821824 8 ews-feeder 2021-12-08 15:50:32 -0800 Committed r286746 (244991@main): <https://commits.webkit.org/244991@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446381. 444868 2021-11-19 16:32:34 -0800 2021-12-01 09:07:48 -0800 Patch bug-233389-20211119163233.patch text/plain 9129 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmZjE3NjNmNGY5MGJmMTQz M2RkMGY5ZWJiOWIzOGJjMWY3NDczMmQuLmI1NzM1MDFjNWU2NTczZjA5ZDJhMTIwNmNkMjcwOTRl MmJiMGQyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTEtMTkgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQ29uc2lkZXIgc3Vw cG9ydCBmb3IgdGhlIGRpc3BsYXlOYW1lIGZvciBGSURPIGF1dGhlbnRpY2F0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzM4OQorICAgICAgICBy ZGFyOi8vODQ5Mzg3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTdGFydCBzdG9yaW5nIHRoZSBkaXNwbGF5TmFtZSBhbmQgaWNvbiBmaWVsZHMgd2l0 aCB0aGUgcGxhdGZvcm0gYXV0aGVudGljYXRvcgorICAgICAgICBhbmQgYWRkIHRoZW0gdG8gdGhl IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzIFNQSS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAg ICAgKGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbToK KyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZU1ha2VDcmVkZW50 aWFsQWZ0ZXJVc2VyVmVyaWZpY2F0aW9uKToKKwogMjAyMS0xMS0xOSAgQW50b2luZSBRdWludCAg PGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbTW9kZWxdIFVzZSBSZWZQdHIgYWNyb3Nz IEFSS2l0SW5saW5lUHJldmlld01vZGVsUGxheWVyIHdoZW4gY3JlYXRpbmcgc3Ryb25nIHBvaW50 ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaAppbmRleCA5ZTNjY2MzNzVmYTVmMGY2ZWQ0ZjI1 ZjRhMWQxZjZjOGNkNTg3ZDQ4Li5hNjJjYjMxNWU1ZTYxNTM4YmNmZDhjNWNhZGMxZDgwMjJiMGVl YjU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKQEAgLTg3LDYgKzg3LDggQEAgdHlwZWRl ZiBOU19FTlVNKE5TSW50ZWdlciwgX1dLV2ViQXV0aGVudGljYXRpb25Vc2VyVmVyaWZpY2F0aW9u QXZhaWxhYmlsaXR5KSB7CiB9IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBKSk7CiAKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTmFtZUtleTsKK1dLX0VYUE9SVCBleHRlcm4gTlNT dHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVL ZXk7CitXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNh dG9yQ3JlZGVudGlhbEljb25VUkxLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29u c3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5OwogV0tfRVhQT1JUIGV4dGVy biBOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5n UGFydHlJREtleTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1 dGhlbnRpY2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25Q YW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50 aWNhdGlvblBhbmVsLm1tCmluZGV4IGY4NDFlYzg0MjMyY2Y5MDZlZDdkMmM2OGY5YjcyNjRjNGIw ZDUxNWYuLjZjYmYxMWUwYTNhN2I0NmI1MmY2MDE1OWIyYzc3YjA3YmY1OGZiNDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlv blBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJB dXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC0xMDAsNiArMTAwLDggQEAgc3RhdGljIFZlY3Rvcjx1 aW50OF90PiBwcm9kdWNlQ2xpZW50RGF0YUpzb25IYXNoKE5TRGF0YSAqY2xpZW50RGF0YUpzb24p CiAjZW5kaWYKIAogTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50 aWFsTmFtZUtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXkiOwor TlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5h bWVLZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxEaXNwbGF5TmFtZUtleSI7 CitOU1N0cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJY29uVVJM S2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsSWNvblVSTEtleSI7CiBOU1N0 cmluZyAqIGNvbnN0IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleSA9IEAiX1dL TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5IjsKIE5TU3RyaW5nICogY29uc3QgX1dL TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFJlbHlpbmdQYXJ0eUlES2V5ID0gQCJfV0tMb2Nh bEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsUmVseWluZ1BhcnR5SURLZXkiOwogTlNTdHJpbmcgKiBj b25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVL ZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxMYXN0TW9kaWZpY2F0aW9uRGF0 ZUtleSI7CkBAIC0yNjUsMTQgKzI2NywyNCBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGdl dEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNjZQogICAg ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KICAgICAgICAgYXV0byYgdXNlcm5h bWUgPSBpdC0+c2Vjb25kLmdldFN0cmluZygpOwotCi0gICAgICAgIFtyZXN1bHQgYWRkT2JqZWN0 OkB7CisgICAgICAgIGF1dG8gY3JlZGVudGlhbCA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9u YXJ5IGFsbG9jXSBpbml0XSk7CisgICAgICAgIFtjcmVkZW50aWFsIHNldERpY3Rpb25hcnk6QHsK ICAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxOYW1lS2V5OiB1c2Vy bmFtZSwKICAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleTog YXR0cmlidXRlc1ticmlkZ2VfY2FzdChrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWwpXSwKICAgICAg ICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJREtleTog YXR0cmlidXRlc1ticmlkZ2VfY2FzdChrU2VjQXR0ckxhYmVsKV0sCiAgICAgICAgICAgICBfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXk6IGF0dHJp YnV0ZXNbYnJpZGdlX2Nhc3Qoa1NlY0F0dHJNb2RpZmljYXRpb25EYXRlKV0sCiAgICAgICAgICAg ICBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5OiBhdHRyaWJ1 dGVzW2JyaWRnZV9jYXN0KGtTZWNBdHRyQ3JlYXRpb25EYXRlKV0KICAgICAgICAgfV07CisKKyAg ICAgICAgaXQgPSByZXNwb25zZU1hcC5maW5kKGNib3I6OkNCT1JWYWx1ZShmaWRvOjprRGlzcGxh eU5hbWVNYXBLZXkpKTsKKyAgICAgICAgaWYgKGl0ICE9IHJlc3BvbnNlTWFwLmVuZCgpICYmIGl0 LT5zZWNvbmQuaXNTdHJpbmcoKSkKKyAgICAgICAgICAgIFtjcmVkZW50aWFsIHNldE9iamVjdDpp dC0+c2Vjb25kLmdldFN0cmluZygpIGZvcktleTpfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50 aWFsRGlzcGxheU5hbWVLZXldOworCisgICAgICAgIGl0ID0gcmVzcG9uc2VNYXAuZmluZChjYm9y OjpDQk9SVmFsdWUoZmlkbzo6a0ljb25VcmxNYXBLZXkpKTsKKyAgICAgICAgaWYgKGl0ICE9IHJl c3BvbnNlTWFwLmVuZCgpICYmIGl0LT5zZWNvbmQuaXNTdHJpbmcoKSkKKyAgICAgICAgICAgIFtj cmVkZW50aWFsIHNldE9iamVjdDppdC0+c2Vjb25kLmdldFN0cmluZygpIGZvcktleTpfV0tMb2Nh bEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsSWNvblVSTEtleV07CisKKyAgICAgICAgW3Jlc3VsdCBh ZGRPYmplY3Q6Y3JlZGVudGlhbC5nZXQoKV07CiAgICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0Nv Y29hL0xvY2FsQXV0aGVudGljYXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1 dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQppbmRleCAwYjAxMDg5OTdm YzUyYTQzODA2YTRjZTk5NGZhZTgxZWE4ZTczMTBjLi4zNzExZDQzMWVlNzE5NTBhM2FiYjk4ZjEy MDkwM2FiZWNkYjMxYWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9y Lm1tCkBAIC0zNDcsNyArMzQ3LDcgQEAgdm9pZCBMb2NhbEF1dGhlbnRpY2F0b3I6OmNvbnRpbnVl TWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24oU2VjQWNjZXNzQ28KICAgICAvLyBI ZXJlIGlzIHRoZSBrZXljaGFpbiBzY2hlbWEuCiAgICAgLy8ga1NlY0F0dHJMYWJlbDogUlAgSUQK ICAgICAvLyBrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWw6IENyZWRlbnRpYWwgSUQgKGF1dG8tZ2Vu IGJ5IEtleWNoYWluKQotICAgIC8vIGtTZWNBdHRyQXBwbGljYXRpb25UYWc6IHsgImlkIjogVXNl ckVudGl0eS5pZCwgIm5hbWUiOiBVc2VyRW50aXR5Lm5hbWUgfSAoQ0JPUiBlbmNvZGVkKQorICAg IC8vIGtTZWNBdHRyQXBwbGljYXRpb25UYWc6IHsgImlkIjogVXNlckVudGl0eS5pZCwgIm5hbWUi OiBVc2VyRW50aXR5Lm5hbWUsICJkaXNwbGF5TmFtZSI6IFVzZXJFbnRpdHkubmFtZSwgImljb24i OiBVc2VyRW50aXR5Lmljb259IChDQk9SIGVuY29kZWQpCiAgICAgLy8gTm90ZWQsIHRoZSB2YWxl IG9mIGtTZWNBdHRyQXBwbGljYXRpb25MYWJlbCBpcyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBi eSB0aGUgS2V5Y2hhaW4sIHdoaWNoIGlzIGEgU0hBLTEgaGFzaCBvZgogICAgIC8vIHRoZSBwdWJs aWMga2V5LgogICAgIGNvbnN0IGF1dG8mIHNlY0F0dHJMYWJlbCA9IGNyZWF0aW9uT3B0aW9ucy5y cC5pZDsKQEAgLTM1NSw2ICszNTUsOSBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29udGlu dWVNYWtlQ3JlZGVudGlhbEFmdGVyVXNlclZlcmlmaWNhdGlvbihTZWNBY2Nlc3NDbwogICAgIGNi b3I6OkNCT1JWYWx1ZTo6TWFwVmFsdWUgdXNlckVudGl0eU1hcDsKICAgICB1c2VyRW50aXR5TWFw W2Nib3I6OkNCT1JWYWx1ZShmaWRvOjprRW50aXR5SWRNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1 ZShjcmVhdGlvbk9wdGlvbnMudXNlci5pZCk7CiAgICAgdXNlckVudGl0eU1hcFtjYm9yOjpDQk9S VmFsdWUoZmlkbzo6a0VudGl0eU5hbWVNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlv bk9wdGlvbnMudXNlci5uYW1lKTsKKyAgICB1c2VyRW50aXR5TWFwW2Nib3I6OkNCT1JWYWx1ZShm aWRvOjprRGlzcGxheU5hbWVNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlv bnMudXNlci5kaXNwbGF5TmFtZSk7CisgICAgaWYgKCFjcmVhdGlvbk9wdGlvbnMudXNlci5pY29u LmlzRW1wdHkoKSkKKyAgICAgICAgdXNlckVudGl0eU1hcFtjYm9yOjpDQk9SVmFsdWUoa0ljb25V cmxNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlvbnMudXNlci5pY29uKTsK ICAgICBhdXRvIHVzZXJFbnRpdHkgPSBjYm9yOjpDQk9SV3JpdGVyOjp3cml0ZShjYm9yOjpDQk9S VmFsdWUoV1RGTW92ZSh1c2VyRW50aXR5TWFwKSkpOwogICAgIEFTU0VSVCh1c2VyRW50aXR5KTsK ICAgICBhdXRvIHNlY0F0dHJBcHBsaWNhdGlvblRhZyA9IHRvTlNEYXRhKCp1c2VyRW50aXR5KTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NTk4 ZDc0NmE4MDM3MTg5MGM3ZjdmMzZlMjJmNTA3YTEzMTgzNjIyLi5lYmZjYzY3NWEwODE0MjM1NWM1 NjkxZDk4MjUwMzBiZTIzN2RlOTNhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTkgIEogUGFzY29lICA8 al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQ29uc2lkZXIgc3VwcG9y dCBmb3IgdGhlIGRpc3BsYXlOYW1lIGZvciBGSURPIGF1dGhlbnRpY2F0b3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzM4OQorICAgICAgICByZGFy Oi8vODQ5Mzg3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgdGVzdCBmb3IgbmV3IGZpZWxkcyBzdG9yZWQgd2l0aCBwbGF0Zm9ybSBhdXRoZW50 aWNhdG9yOiBkaXNwbGF5TmFtZSBhbmQgaWNvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAgICAg KFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIxLTExLTE5ICBKIFBhc2NvZSAgPGpfcGFzY29l QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIEFkZCBoZWFkZXJzIGZvciBbX1dLV2Vi QXV0aGVudGljYXRpb25QYW5lbCBtYWtlQ3JlZGVudGlhbFdpdGhDbGllbnREYXRhSGFzaF0gYW5k IFtfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIGdldEFzc2VydGlvbldpdGhDbGllbnREYXRhSGFz aF0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dL V2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQppbmRleCAzZTY2YmU0ZDFhMDJi NDU0MjJiYzBjMWNjMzRiNzJiNDQ4NDcwNzA2Li45M2MwZmNmNDE3MWVjNjQ3YTUyZWI5NGRhMTcy MWE1MTk5NzE0ZDczIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC0y MTkzLDYgKzIxOTMsMjYgQEAgVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBHZXRBbGxDcmVk ZW50aWFsKQogICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5jb20iKTsKIH0KIAorVEVTVChX ZWJBdXRoZW50aWNhdGlvblBhbmVsLCBHZXRBbGxDcmVkZW50aWFsV2l0aERpc3BsYXlOYW1lQW5k SWNvbikKK3sKKyAgICByZXNldCgpOworCisgICAgLy8geyJpZCI6IGgnMDAwMTAyMDMwNDA1MDYw NzA4MDknLCAibmFtZSI6ICJKb2huIiwgImRpc3BsYXlOYW1lIjogIkpvaG5ueSIsICJpY29uIjog Imh0dHBzOi8vZXhhbXBsZS5jb20vaWNvbi5wbmcifQorICAgIEFTU0VSVF9UUlVFKGFkZEtleVRv S2V5Y2hhaW4odGVzdEVTMjU2UHJpdmF0ZUtleUJhc2U2NCwgImV4YW1wbGUuY29tIiwgInBHSnBa RW9BQVFJREJBVUdCd2dKWkc1aGJXVmtTbTlvYm10a2FYTndiR0Y1VG1GdFpXWktiMmh1Ym5sa2FX TnZibmdjYUhSMGNITTZMeTlsZUdGdGNHeGxMbU52YlM5cFkyOXVMbkJ1Wnc9PSIpKTsKKworICAg IGF1dG8gYWZ0ZXIgPSBhZG9wdE5TKFtbTlNEYXRlIGFsbG9jXSBpbml0XSk7CisKKyAgICBhdXRv ICpjcmVkZW50aWFscyA9IFtfV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsIGdldEFsbExvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxzV2l0aEFjY2Vzc0dyb3VwOkAiY29tLmFwcGxlLlRlc3RXZWJL aXRBUEkiXTsKKyAgICBFWFBFQ1RfTk9UX05VTEwoY3JlZGVudGlhbHMpOworICAgIEVYUEVDVF9F UShbY3JlZGVudGlhbHMgY291bnRdLCAxbHUpOworCisgICAgRVhQRUNUX05PVF9OVUxMKFtjcmVk ZW50aWFscyBmaXJzdE9iamVjdF0pOworICAgIEVYUEVDVF9XS19TVFJFUShbY3JlZGVudGlhbHMg Zmlyc3RPYmplY3RdW19XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxOYW1lS2V5XSwgIkpv aG4iKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW2NyZWRlbnRpYWxzIGZpcnN0T2JqZWN0XVtfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVLZXldLCAiSm9obm55Iik7Cisg ICAgRVhQRUNUX1dLX1NUUkVRKFtjcmVkZW50aWFscyBmaXJzdE9iamVjdF1bX1dLTG9jYWxBdXRo ZW50aWNhdG9yQ3JlZGVudGlhbEljb25VUkxLZXldLCAiaHR0cHM6Ly9leGFtcGxlLmNvbS9pY29u LnBuZyIpOworICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5jb20iKTsKK30KKwogVEVTVChX ZWJBdXRoZW50aWNhdGlvblBhbmVsLCBVcGRhdGVDcmVkZW50aWFsVXNlcm5hbWUpCiB7CiAgICAg cmVzZXQoKTsK 446049 2021-12-06 10:30:51 -0800 2021-12-08 10:15:28 -0800 Patch bug-233389-20211206103051.patch text/plain 9033 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcxNzk0NzVmN2RmZDA4ZjE0 OGQwMjU4N2U0MGNmZDU5YjAxYWE4ZGEuLmNmODEyNWI4MWEyYTk3NGMxODAxZTJiYTI0ZDc0MWNk OTRiNjA0NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTItMDYgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQ29uc2lkZXIgc3Vw cG9ydCBmb3IgdGhlIGRpc3BsYXlOYW1lIGZvciBGSURPIGF1dGhlbnRpY2F0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzM4OQorICAgICAgICBy ZGFyOi8vODQ5Mzg3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTdGFydCBzdG9yaW5nIHRoZSBkaXNwbGF5TmFtZSBhbmQgaWNvbiBmaWVsZHMgd2l0 aCB0aGUgcGxhdGZvcm0gYXV0aGVudGljYXRvcgorICAgICAgICBhbmQgYWRkIHRoZW0gdG8gdGhl IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzIFNQSS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAg ICAgKGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbCk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbToK KyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZU1ha2VDcmVkZW50 aWFsQWZ0ZXJVc2VyVmVyaWZpY2F0aW9uKToKKwogMjAyMS0xMi0wNSAgU2FpZCBBYm91LUhhbGxh d2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIEFkZCB0aGUgZW5j b2RpbmcvZGVjb2RpbmcgZm9yIEZpbHRlciBhbmQgRmlsdGVyRWZmZWN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5l bC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0 aW9uUGFuZWwuaAppbmRleCA5ZTNjY2MzNzVmYTVmMGY2ZWQ0ZjI1ZjRhMWQxZjZjOGNkNTg3ZDQ4 Li5hNjJjYjMxNWU1ZTYxNTM4YmNmZDhjNWNhZGMxZDgwMjJiMGVlYjU0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5l bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50 aWNhdGlvblBhbmVsLmgKQEAgLTg3LDYgKzg3LDggQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdl ciwgX1dLV2ViQXV0aGVudGljYXRpb25Vc2VyVmVyaWZpY2F0aW9uQXZhaWxhYmlsaXR5KSB7CiB9 IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAK IFdLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFsTmFtZUtleTsKK1dLX0VYUE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tM b2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVLZXk7CitXS19FWFBPUlQgZXh0 ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEljb25V UkxLZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50 aWNhdG9yQ3JlZGVudGlhbElES2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0 IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJREtleTsKIFdLX0VY UE9SVCBleHRlcm4gTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50 aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmlu ZGV4IGY4NDFlYzg0MjMyY2Y5MDZlZDdkMmM2OGY5YjcyNjRjNGIwZDUxNWYuLjZjYmYxMWUwYTNh N2I0NmI1MmY2MDE1OWIyYzc3YjA3YmY1OGZiNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVs Lm1tCkBAIC0xMDAsNiArMTAwLDggQEAgc3RhdGljIFZlY3Rvcjx1aW50OF90PiBwcm9kdWNlQ2xp ZW50RGF0YUpzb25IYXNoKE5TRGF0YSAqY2xpZW50RGF0YUpzb24pCiAjZW5kaWYKIAogTlNTdHJp bmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTmFtZUtleSA9IEAiX1dL TG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXkiOworTlNTdHJpbmcgKiBjb25zdCBf V0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVLZXkgPSBAIl9XS0xvY2Fs QXV0aGVudGljYXRvckNyZWRlbnRpYWxEaXNwbGF5TmFtZUtleSI7CitOU1N0cmluZyAqIGNvbnN0 IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJY29uVVJMS2V5ID0gQCJfV0tMb2NhbEF1 dGhlbnRpY2F0b3JDcmVkZW50aWFsSWNvblVSTEtleSI7CiBOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleSA9IEAiX1dLTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbElES2V5IjsKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbFJlbHlpbmdQYXJ0eUlES2V5ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVk ZW50aWFsUmVseWluZ1BhcnR5SURLZXkiOwogTlNTdHJpbmcgKiBjb25zdCBfV0tMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXkgPSBAIl9XS0xvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxMYXN0TW9kaWZpY2F0aW9uRGF0ZUtleSI7CkBAIC0yNjUsMTQg KzI2NywyNCBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGlj YXRvckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNjZQogICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAgICAgICAgIH0KICAgICAgICAgYXV0byYgdXNlcm5hbWUgPSBpdC0+c2Vjb25kLmdl dFN0cmluZygpOwotCi0gICAgICAgIFtyZXN1bHQgYWRkT2JqZWN0OkB7CisgICAgICAgIGF1dG8g Y3JlZGVudGlhbCA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7 CisgICAgICAgIFtjcmVkZW50aWFsIHNldERpY3Rpb25hcnk6QHsKICAgICAgICAgICAgIF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxOYW1lS2V5OiB1c2VybmFtZSwKICAgICAgICAgICAg IF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleTogYXR0cmlidXRlc1ticmlkZ2Vf Y2FzdChrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWwpXSwKICAgICAgICAgICAgIF9XS0xvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJREtleTogYXR0cmlidXRlc1ticmlkZ2Vf Y2FzdChrU2VjQXR0ckxhYmVsKV0sCiAgICAgICAgICAgICBfV0tMb2NhbEF1dGhlbnRpY2F0b3JD cmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVLZXk6IGF0dHJpYnV0ZXNbYnJpZGdlX2Nhc3Qo a1NlY0F0dHJNb2RpZmljYXRpb25EYXRlKV0sCiAgICAgICAgICAgICBfV0tMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsQ3JlYXRpb25EYXRlS2V5OiBhdHRyaWJ1dGVzW2JyaWRnZV9jYXN0KGtT ZWNBdHRyQ3JlYXRpb25EYXRlKV0KICAgICAgICAgfV07CisKKyAgICAgICAgaXQgPSByZXNwb25z ZU1hcC5maW5kKGNib3I6OkNCT1JWYWx1ZShmaWRvOjprRGlzcGxheU5hbWVNYXBLZXkpKTsKKyAg ICAgICAgaWYgKGl0ICE9IHJlc3BvbnNlTWFwLmVuZCgpICYmIGl0LT5zZWNvbmQuaXNTdHJpbmco KSkKKyAgICAgICAgICAgIFtjcmVkZW50aWFsIHNldE9iamVjdDppdC0+c2Vjb25kLmdldFN0cmlu ZygpIGZvcktleTpfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVLZXld OworCisgICAgICAgIGl0ID0gcmVzcG9uc2VNYXAuZmluZChjYm9yOjpDQk9SVmFsdWUoZmlkbzo6 a0ljb25VcmxNYXBLZXkpKTsKKyAgICAgICAgaWYgKGl0ICE9IHJlc3BvbnNlTWFwLmVuZCgpICYm IGl0LT5zZWNvbmQuaXNTdHJpbmcoKSkKKyAgICAgICAgICAgIFtjcmVkZW50aWFsIHNldE9iamVj dDppdC0+c2Vjb25kLmdldFN0cmluZygpIGZvcktleTpfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVk ZW50aWFsSWNvblVSTEtleV07CisKKyAgICAgICAgW3Jlc3VsdCBhZGRPYmplY3Q6Y3JlZGVudGlh bC5nZXQoKV07CiAgICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGlj YXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29h L0xvY2FsQXV0aGVudGljYXRvci5tbQppbmRleCAwYjAxMDg5OTdmYzUyYTQzODA2YTRjZTk5NGZh ZTgxZWE4ZTczMTBjLi4zNzExZDQzMWVlNzE5NTBhM2FiYjk4ZjEyMDkwM2FiZWNkYjMxYWIyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2Nv YS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCkBAIC0zNDcsNyArMzQ3 LDcgQEAgdm9pZCBMb2NhbEF1dGhlbnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRl clVzZXJWZXJpZmljYXRpb24oU2VjQWNjZXNzQ28KICAgICAvLyBIZXJlIGlzIHRoZSBrZXljaGFp biBzY2hlbWEuCiAgICAgLy8ga1NlY0F0dHJMYWJlbDogUlAgSUQKICAgICAvLyBrU2VjQXR0ckFw cGxpY2F0aW9uTGFiZWw6IENyZWRlbnRpYWwgSUQgKGF1dG8tZ2VuIGJ5IEtleWNoYWluKQotICAg IC8vIGtTZWNBdHRyQXBwbGljYXRpb25UYWc6IHsgImlkIjogVXNlckVudGl0eS5pZCwgIm5hbWUi OiBVc2VyRW50aXR5Lm5hbWUgfSAoQ0JPUiBlbmNvZGVkKQorICAgIC8vIGtTZWNBdHRyQXBwbGlj YXRpb25UYWc6IHsgImlkIjogVXNlckVudGl0eS5pZCwgIm5hbWUiOiBVc2VyRW50aXR5Lm5hbWUs ICJkaXNwbGF5TmFtZSI6IFVzZXJFbnRpdHkubmFtZSwgImljb24iOiBVc2VyRW50aXR5Lmljb259 IChDQk9SIGVuY29kZWQpCiAgICAgLy8gTm90ZWQsIHRoZSB2YWxlIG9mIGtTZWNBdHRyQXBwbGlj YXRpb25MYWJlbCBpcyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBieSB0aGUgS2V5Y2hhaW4sIHdo aWNoIGlzIGEgU0hBLTEgaGFzaCBvZgogICAgIC8vIHRoZSBwdWJsaWMga2V5LgogICAgIGNvbnN0 IGF1dG8mIHNlY0F0dHJMYWJlbCA9IGNyZWF0aW9uT3B0aW9ucy5ycC5pZDsKQEAgLTM1NSw2ICsz NTUsOSBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVNYWtlQ3JlZGVudGlhbEFm dGVyVXNlclZlcmlmaWNhdGlvbihTZWNBY2Nlc3NDbwogICAgIGNib3I6OkNCT1JWYWx1ZTo6TWFw VmFsdWUgdXNlckVudGl0eU1hcDsKICAgICB1c2VyRW50aXR5TWFwW2Nib3I6OkNCT1JWYWx1ZShm aWRvOjprRW50aXR5SWRNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlvbnMu dXNlci5pZCk7CiAgICAgdXNlckVudGl0eU1hcFtjYm9yOjpDQk9SVmFsdWUoZmlkbzo6a0VudGl0 eU5hbWVNYXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlvbnMudXNlci5uYW1l KTsKKyAgICB1c2VyRW50aXR5TWFwW2Nib3I6OkNCT1JWYWx1ZShmaWRvOjprRGlzcGxheU5hbWVN YXBLZXkpXSA9IGNib3I6OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlvbnMudXNlci5kaXNwbGF5TmFt ZSk7CisgICAgaWYgKCFjcmVhdGlvbk9wdGlvbnMudXNlci5pY29uLmlzRW1wdHkoKSkKKyAgICAg ICAgdXNlckVudGl0eU1hcFtjYm9yOjpDQk9SVmFsdWUoa0ljb25VcmxNYXBLZXkpXSA9IGNib3I6 OkNCT1JWYWx1ZShjcmVhdGlvbk9wdGlvbnMudXNlci5pY29uKTsKICAgICBhdXRvIHVzZXJFbnRp dHkgPSBjYm9yOjpDQk9SV3JpdGVyOjp3cml0ZShjYm9yOjpDQk9SVmFsdWUoV1RGTW92ZSh1c2Vy RW50aXR5TWFwKSkpOwogICAgIEFTU0VSVCh1c2VyRW50aXR5KTsKICAgICBhdXRvIHNlY0F0dHJB cHBsaWNhdGlvblRhZyA9IHRvTlNEYXRhKCp1c2VyRW50aXR5KTsKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTQ4YWYxOTg3YmZlNWE3YzJmNzQx YmJhNjBjMzllYTAyNWNkZTgxLi4zOTQ3ZDY3NTc4MzM2ZmIzY2Q4NTJlNGYzNTZiZmY0MmRmYjI5 YzNjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMjEtMTItMDYgIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29t PgorCisgICAgICAgIFtXZWJBdXRobl0gQ29uc2lkZXIgc3VwcG9ydCBmb3IgdGhlIGRpc3BsYXlO YW1lIGZvciBGSURPIGF1dGhlbnRpY2F0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMzM4OQorICAgICAgICByZGFyOi8vODQ5Mzg3MDcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBmb3Ig bmV3IGZpZWxkcyBzdG9yZWQgd2l0aCBwbGF0Zm9ybSBhdXRoZW50aWNhdG9yOiBkaXNwbGF5TmFt ZSBhbmQgaWNvbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev X1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRF U1QpOgorCiAyMDIxLTEyLTA1ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgog CiAgICAgICAgIFtHUFUgUHJvY2Vzc10gQWRkIHRoZSBlbmNvZGluZy9kZWNvZGluZyBmb3IgRmls dGVyIGFuZCBGaWx0ZXJFZmZlY3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpp bmRleCAzZTY2YmU0ZDFhMDJiNDU0MjJiYzBjMWNjMzRiNzJiNDQ4NDcwNzA2Li5lNGQxNDY3NjMz YTY2NjBlYTg4OTk4ZmRiNDhmMTMxOWE5MmMwYjI0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNh dGlvblBhbmVsLm1tCkBAIC0yMTkzLDYgKzIxOTMsMjYgQEAgVEVTVChXZWJBdXRoZW50aWNhdGlv blBhbmVsLCBHZXRBbGxDcmVkZW50aWFsKQogICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5j b20iKTsKIH0KIAorVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBHZXRBbGxDcmVkZW50aWFs V2l0aERpc3BsYXlOYW1lQW5kSWNvbikKK3sKKyAgICByZXNldCgpOworCisgICAgLy8geyJpZCI6 IGgnMDAwMTAyMDMwNDA1MDYwNzA4MDknLCAiaWNvbiI6ICJodHRwczovL2V4YW1wbGUuY29tL2lj b24ucG5nIiwgIm5hbWUiOiAiSm9obiIsICJkaXNwbGF5TmFtZSI6ICJKb2hubnkifQorICAgIEFT U0VSVF9UUlVFKGFkZEtleVRvS2V5Y2hhaW4odGVzdEVTMjU2UHJpdmF0ZUtleUJhc2U2NCwgImV4 YW1wbGUuY29tIiwgInBHSnBaRW9BQVFJREJBVUdCd2dKWkdsamIyNTRIR2gwZEhCek9pOHZaWGho YlhCc1pTNWpiMjB2YVdOdmJpNXdibWRrYm1GdFpXUktiMmh1YTJScGMzQnNZWGxPWVcxbFprcHZh RzV1ZVE9PSIpKTsKKworICAgIGF1dG8gYWZ0ZXIgPSBhZG9wdE5TKFtbTlNEYXRlIGFsbG9jXSBp bml0XSk7CisKKyAgICBhdXRvICpjcmVkZW50aWFscyA9IFtfV0tXZWJBdXRoZW50aWNhdGlvblBh bmVsIGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzV2l0aEFjY2Vzc0dyb3VwOkAi Y29tLmFwcGxlLlRlc3RXZWJLaXRBUEkiXTsKKyAgICBFWFBFQ1RfTk9UX05VTEwoY3JlZGVudGlh bHMpOworICAgIEVYUEVDVF9FUShbY3JlZGVudGlhbHMgY291bnRdLCAxbHUpOworCisgICAgRVhQ RUNUX05PVF9OVUxMKFtjcmVkZW50aWFscyBmaXJzdE9iamVjdF0pOworICAgIEVYUEVDVF9XS19T VFJFUShbY3JlZGVudGlhbHMgZmlyc3RPYmplY3RdW19XS0xvY2FsQXV0aGVudGljYXRvckNyZWRl bnRpYWxOYW1lS2V5XSwgIkpvaG4iKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW2NyZWRlbnRpYWxz IGZpcnN0T2JqZWN0XVtfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVL ZXldLCAiSm9obm55Iik7CisgICAgRVhQRUNUX1dLX1NUUkVRKFtjcmVkZW50aWFscyBmaXJzdE9i amVjdF1bX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbEljb25VUkxLZXldLCAiaHR0cHM6 Ly9leGFtcGxlLmNvbS9pY29uLnBuZyIpOworICAgIGNsZWFuVXBLZXljaGFpbigiZXhhbXBsZS5j b20iKTsKK30KKwogVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBVcGRhdGVDcmVkZW50aWFs VXNlcm5hbWUpCiB7CiAgICAgcmVzZXQoKTsK 446381 2021-12-08 10:15:30 -0800 2021-12-08 15:50:34 -0800 Patch bug-233389-20211208101529.patch text/plain 8891 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGEzODdlYmY4MDVjMTRhNDdk MjU1NWZiNjdiZGQyOTkyNDc2ZWM4N2YuLjI3NjI1YTEzYzIxZjZjZDdlNTg1MDRmYjcxMTdiODNh YjNhNDMyOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMTItMDggIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gQ29uc2lkZXIgc3Vw cG9ydCBmb3IgdGhlIGRpc3BsYXlOYW1lIGZvciBGSURPIGF1dGhlbnRpY2F0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzM4OQorICAgICAgICBy ZGFyOi8vODQ5Mzg3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisg ICAgICAgIFN0YXJ0IHN0b3JpbmcgdGhlIGRpc3BsYXlOYW1lIGZpZWxkIHdpdGggdGhlIHBsYXRm b3JtIGF1dGhlbnRpY2F0b3IKKyAgICAgICAgYW5kIGFkZCB0aGVtIHRvIHRoZSBnZXRBbGxMb2Nh bEF1dGhlbnRpY2F0b3JDcmVkZW50aWFscyBTUEkuCisKKyAgICAgICAgVGhlIGRpc3BsYXlOYW1l IGlzIHBhcnQgb2YgdGhlIFdlYkF1dGhuIGxldmVsIDIgc3BlYzoKKyAgICAgICAgaHR0cHM6Ly93 d3cudzMub3JnL1RSL3dlYmF1dGhuLTIvI2RvbS1wdWJsaWNrZXljcmVkZW50aWFsdXNlcmVudGl0 eS1kaXNwbGF5bmFtZQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRo ZW50aWNhdGlvblBhbmVsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJB dXRoZW50aWNhdGlvblBhbmVsLm1tOgorICAgICAgICAoZ2V0QWxsTG9jYWxBdXRoZW50aWNhdG9y Q3JlZGVudGlhbHNJbXBsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v Q29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhl bnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24pOgor CiAyMDIxLTEyLTA4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAg ICBTYW1lLXNpdGUgbGF4IGNvb2tpZXMgbm90IHNlbnQgYnkgZmV0Y2ggZXZlbnQgaGFuZGxlciBh ZnRlciBwYWdlIHJlbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLmgKaW5kZXggOWUzY2NjMzc1 ZmE1ZjBmNmVkNGYyNWY0YTFkMWY2YzhjZDU4N2Q0OC4uMmIxNDM3MjU0MjY5NmJjZDBjY2RhMTY5 Mjc2NmFkYWExYTUyYWRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5oCkBAIC04Nyw2ICs4 Nyw3IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9XS1dlYkF1dGhlbnRpY2F0aW9uVXNl clZlcmlmaWNhdGlvbkF2YWlsYWJpbGl0eSkgewogfSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdL X01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5n ICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXk7CitXS19FWFBP UlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlh bERpc3BsYXlOYW1lS2V5OwogV0tfRVhQT1JUIGV4dGVybiBOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleTsKIFdLX0VYUE9SVCBleHRlcm4gTlNTdHJp bmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsUmVseWluZ1BhcnR5SURL ZXk7CiBXS19FWFBPUlQgZXh0ZXJuIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNh dG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25EYXRlS2V5OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25Q YW5lbC5tbQppbmRleCBmODQxZWM4NDIzMmNmOTA2ZWQ3ZDJjNjhmOWI3MjY0YzRiMGQ1MTVmLi5l NWY5ZDZlNGY3MTFjZmFkMDE4MTNmNTRhMjQ4MTIwZTdjY2YzMGY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGlj YXRpb25QYW5lbC5tbQpAQCAtMTAwLDYgKzEwMCw3IEBAIHN0YXRpYyBWZWN0b3I8dWludDhfdD4g cHJvZHVjZUNsaWVudERhdGFKc29uSGFzaChOU0RhdGEgKmNsaWVudERhdGFKc29uKQogI2VuZGlm CiAKIE5TU3RyaW5nICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVL ZXkgPSBAIl9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxOYW1lS2V5IjsKK05TU3RyaW5n ICogY29uc3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbERpc3BsYXlOYW1lS2V5ID0g QCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsRGlzcGxheU5hbWVLZXkiOwogTlNTdHJp bmcgKiBjb25zdCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsSURLZXkgPSBAIl9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtleSI7CiBOU1N0cmluZyAqIGNvbnN0IF9XS0xv Y2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJREtleSA9IEAiX1dLTG9jYWxB dXRoZW50aWNhdG9yQ3JlZGVudGlhbFJlbHlpbmdQYXJ0eUlES2V5IjsKIE5TU3RyaW5nICogY29u c3QgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExhc3RNb2RpZmljYXRpb25EYXRlS2V5 ID0gQCJfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTGFzdE1vZGlmaWNhdGlvbkRhdGVL ZXkiOwpAQCAtMjY1LDE0ICsyNjYsMjAgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRB bGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICAg ICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9CiAgICAgICAgIGF1dG8mIHVzZXJuYW1l ID0gaXQtPnNlY29uZC5nZXRTdHJpbmcoKTsKLQotICAgICAgICBbcmVzdWx0IGFkZE9iamVjdDpA ewotICAgICAgICAgICAgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXk6IHVz ZXJuYW1lLAotICAgICAgICAgICAgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbElES2V5 OiBhdHRyaWJ1dGVzW2JyaWRnZV9jYXN0KGtTZWNBdHRyQXBwbGljYXRpb25MYWJlbCldLAotICAg ICAgICAgICAgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFJlbHlpbmdQYXJ0eUlES2V5 OiBhdHRyaWJ1dGVzW2JyaWRnZV9jYXN0KGtTZWNBdHRyTGFiZWwpXSwKLSAgICAgICAgICAgIF9X S0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxMYXN0TW9kaWZpY2F0aW9uRGF0ZUtleTogYXR0 cmlidXRlc1ticmlkZ2VfY2FzdChrU2VjQXR0ck1vZGlmaWNhdGlvbkRhdGUpXSwKLSAgICAgICAg ICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxDcmVhdGlvbkRhdGVLZXk6IGF0dHJp YnV0ZXNbYnJpZGdlX2Nhc3Qoa1NlY0F0dHJDcmVhdGlvbkRhdGUpXQotICAgICAgICB9XTsKKyAg ICAgICAgYXV0byBjcmVkZW50aWFsID0gYWRvcHROUyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxs b2NdIGluaXRXaXRoT2JqZWN0c0FuZEtleXM6CisgICAgICAgICAgICB1c2VybmFtZSwgX1dLTG9j YWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbE5hbWVLZXksCisgICAgICAgICAgICBhdHRyaWJ1dGVz W2JyaWRnZV9jYXN0KGtTZWNBdHRyQXBwbGljYXRpb25MYWJlbCldLCBfV0tMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsSURLZXksCisgICAgICAgICAgICBhdHRyaWJ1dGVzW2JyaWRnZV9jYXN0 KGtTZWNBdHRyTGFiZWwpXSwgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFJlbHlpbmdQ YXJ0eUlES2V5LAorICAgICAgICAgICAgYXR0cmlidXRlc1ticmlkZ2VfY2FzdChrU2VjQXR0ck1v ZGlmaWNhdGlvbkRhdGUpXSwgX1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbExhc3RNb2Rp ZmljYXRpb25EYXRlS2V5LAorICAgICAgICAgICAgYXR0cmlidXRlc1ticmlkZ2VfY2FzdChrU2Vj QXR0ckNyZWF0aW9uRGF0ZSldLCBfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsQ3JlYXRp b25EYXRlS2V5LAorICAgICAgICAgICAgbmlsCisgICAgICAgIF0pOworCisgICAgICAgIGl0ID0g cmVzcG9uc2VNYXAuZmluZChjYm9yOjpDQk9SVmFsdWUoZmlkbzo6a0Rpc3BsYXlOYW1lTWFwS2V5 KSk7CisgICAgICAgIGlmIChpdCAhPSByZXNwb25zZU1hcC5lbmQoKSAmJiBpdC0+c2Vjb25kLmlz U3RyaW5nKCkpCisgICAgICAgICAgICBbY3JlZGVudGlhbCBzZXRPYmplY3Q6aXQtPnNlY29uZC5n ZXRTdHJpbmcoKSBmb3JLZXk6X1dLTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbERpc3BsYXlO YW1lS2V5XTsKKworICAgICAgICBbcmVzdWx0IGFkZE9iamVjdDpjcmVkZW50aWFsLmdldCgpXTsK ICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRo ZW50aWNhdG9yLm1tCmluZGV4IDBiMDEwODk5N2ZjNTJhNDM4MDZhNGNlOTk0ZmFlODFlYThlNzMx MGMuLjFkOWVhZWI0ZDk3M2ExYWRlNGQ3NjljYjNiZWMyZTUwYTE4OWEyZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0 aGVudGljYXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KQEAgLTM0NywxNCArMzQ3LDE3IEBAIHZv aWQgTG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJVc2VyVmVy aWZpY2F0aW9uKFNlY0FjY2Vzc0NvCiAgICAgLy8gSGVyZSBpcyB0aGUga2V5Y2hhaW4gc2NoZW1h LgogICAgIC8vIGtTZWNBdHRyTGFiZWw6IFJQIElECiAgICAgLy8ga1NlY0F0dHJBcHBsaWNhdGlv bkxhYmVsOiBDcmVkZW50aWFsIElEIChhdXRvLWdlbiBieSBLZXljaGFpbikKLSAgICAvLyBrU2Vj QXR0ckFwcGxpY2F0aW9uVGFnOiB7ICJpZCI6IFVzZXJFbnRpdHkuaWQsICJuYW1lIjogVXNlckVu dGl0eS5uYW1lIH0gKENCT1IgZW5jb2RlZCkKKyAgICAvLyBrU2VjQXR0ckFwcGxpY2F0aW9uVGFn OiB7ICJpZCI6IFVzZXJFbnRpdHkuaWQsICJuYW1lIjogVXNlckVudGl0eS5uYW1lLCAiZGlzcGxh eU5hbWUiOiBVc2VyRW50aXR5Lm5hbWV9IChDQk9SIGVuY29kZWQpCiAgICAgLy8gTm90ZWQsIHRo ZSB2YWxlIG9mIGtTZWNBdHRyQXBwbGljYXRpb25MYWJlbCBpcyBhdXRvbWF0aWNhbGx5IGdlbmVy YXRlZCBieSB0aGUgS2V5Y2hhaW4sIHdoaWNoIGlzIGEgU0hBLTEgaGFzaCBvZgogICAgIC8vIHRo ZSBwdWJsaWMga2V5LgogICAgIGNvbnN0IGF1dG8mIHNlY0F0dHJMYWJlbCA9IGNyZWF0aW9uT3B0 aW9ucy5ycC5pZDsKIAorICAgIC8vIGlkLCBuYW1lLCBhbmQgZGlzcGxheU5hbWUgYXJlIHJlcXVp cmVkIGluIFB1YmxpY0tleUNyZWRlbnRpYWxVc2VyRW50aXR5CisgICAgLy8gaHR0cHM6Ly93d3cu dzMub3JnL1RSL3dlYmF1dGhuLTIvI2RpY3RkZWYtcHVibGlja2V5Y3JlZGVudGlhbHVzZXJlbnRp dHkKICAgICBjYm9yOjpDQk9SVmFsdWU6Ok1hcFZhbHVlIHVzZXJFbnRpdHlNYXA7CiAgICAgdXNl ckVudGl0eU1hcFtjYm9yOjpDQk9SVmFsdWUoZmlkbzo6a0VudGl0eUlkTWFwS2V5KV0gPSBjYm9y OjpDQk9SVmFsdWUoY3JlYXRpb25PcHRpb25zLnVzZXIuaWQpOwogICAgIHVzZXJFbnRpdHlNYXBb Y2Jvcjo6Q0JPUlZhbHVlKGZpZG86OmtFbnRpdHlOYW1lTWFwS2V5KV0gPSBjYm9yOjpDQk9SVmFs dWUoY3JlYXRpb25PcHRpb25zLnVzZXIubmFtZSk7CisgICAgdXNlckVudGl0eU1hcFtjYm9yOjpD Qk9SVmFsdWUoZmlkbzo6a0Rpc3BsYXlOYW1lTWFwS2V5KV0gPSBjYm9yOjpDQk9SVmFsdWUoY3Jl YXRpb25PcHRpb25zLnVzZXIuZGlzcGxheU5hbWUpOwogICAgIGF1dG8gdXNlckVudGl0eSA9IGNi b3I6OkNCT1JXcml0ZXI6OndyaXRlKGNib3I6OkNCT1JWYWx1ZShXVEZNb3ZlKHVzZXJFbnRpdHlN YXApKSk7CiAgICAgQVNTRVJUKHVzZXJFbnRpdHkpOwogICAgIGF1dG8gc2VjQXR0ckFwcGxpY2F0 aW9uVGFnID0gdG9OU0RhdGEoKnVzZXJFbnRpdHkpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGEzZGZkM2QwZWMxMTg0MDY1ZTg4Y2Q3MDMyZjI2 MTkwYTdhNmI0YWUuLmM3OTViNWU3YTVmNDMwMTY3ZWMyZDE4ODdlYzQ0NmUyMmYzMjJlYTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAyMS0xMi0wOCAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dlYkF1dGhuXSBDb25zaWRlciBzdXBwb3J0IGZvciB0aGUgZGlzcGxheU5hbWUgZm9y IEZJRE8gYXV0aGVudGljYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMzMzg5CisgICAgICAgIHJkYXI6Ly84NDkzODcwNworCisgICAgICAgIFJl dmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIG5ldyBmaWVs ZCBzdG9yZWQgd2l0aCBwbGF0Zm9ybSBhdXRoZW50aWNhdG9yOiBkaXNwbGF5TmFtZQorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9fV0tXZWJBdXRoZW50aWNhdGlv blBhbmVsLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjEtMTItMDcg IEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEFk ZCBpbml0aWFsIHN1cHBvcnQgZm9yIGZpbmQtaW4tcGFnZSBTUEkKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5l bC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvX1dLV2ViQXV0aGVu dGljYXRpb25QYW5lbC5tbQppbmRleCAzZTY2YmU0ZDFhMDJiNDU0MjJiYzBjMWNjMzRiNzJiNDQ4 NDcwNzA2Li41OWQxOWZkYjRiNWQ0NjJlMzFkNzFhNGY4ZmE1NmE5ODQwMmQ4MTEyIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL19XS1dlYkF1dGhlbnRp Y2F0aW9uUGFuZWwubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCkBAIC0yMTkzLDYgKzIxOTMsMjYgQEAgVEVT VChXZWJBdXRoZW50aWNhdGlvblBhbmVsLCBHZXRBbGxDcmVkZW50aWFsKQogICAgIGNsZWFuVXBL ZXljaGFpbigiZXhhbXBsZS5jb20iKTsKIH0KIAorVEVTVChXZWJBdXRoZW50aWNhdGlvblBhbmVs LCBHZXRBbGxDcmVkZW50aWFsV2l0aERpc3BsYXlOYW1lKQoreworICAgIHJlc2V0KCk7CisKKyAg ICAvLyB7ImlkIjogaCcwMDAxMDIwMzA0MDUwNjA3MDgwOScsICJuYW1lIjogIkpvaG4iLCAiZGlz cGxheU5hbWUiOiAiSm9obm55In0KKyAgICBBU1NFUlRfVFJVRShhZGRLZXlUb0tleWNoYWluKHRl c3RFUzI1NlByaXZhdGVLZXlCYXNlNjQsICJleGFtcGxlLmNvbSIsICJvMkpwWkVvQUFRSURCQVVH QndnSlpHNWhiV1ZrU205b2JtdGthWE53YkdGNVRtRnRaV1pLYjJodWJuaz0iKSk7CisKKyAgICBh dXRvIGFmdGVyID0gYWRvcHROUyhbW05TRGF0ZSBhbGxvY10gaW5pdF0pOworCisgICAgYXV0byAq Y3JlZGVudGlhbHMgPSBbX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbCBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFsc1dpdGhBY2Nlc3NHcm91cDpAImNvbS5hcHBsZS5UZXN0V2ViS2l0 QVBJIl07CisgICAgRVhQRUNUX05PVF9OVUxMKGNyZWRlbnRpYWxzKTsKKyAgICBFWFBFQ1RfRVEo W2NyZWRlbnRpYWxzIGNvdW50XSwgMWx1KTsKKworICAgIEVYUEVDVF9OT1RfTlVMTChbY3JlZGVu dGlhbHMgZmlyc3RPYmplY3RdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW2NyZWRlbnRpYWxzIGZp cnN0T2JqZWN0XVtfV0tMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsTmFtZUtleV0sICJKb2hu Iik7CisgICAgRVhQRUNUX1dLX1NUUkVRKFtjcmVkZW50aWFscyBmaXJzdE9iamVjdF1bX1dLTG9j YWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbERpc3BsYXlOYW1lS2V5XSwgIkpvaG5ueSIpOworCisg ICAgY2xlYW5VcEtleWNoYWluKCJleGFtcGxlLmNvbSIpOworfQorCiBURVNUKFdlYkF1dGhlbnRp Y2F0aW9uUGFuZWwsIFVwZGF0ZUNyZWRlbnRpYWxVc2VybmFtZSkKIHsKICAgICByZXNldCgpOwo=