231986 2021-10-19 14:53:47 -0700 Fix crash when calling setUsernameForLocalCredentialWithID 2021-10-21 09:26:45 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232057 1 pascoe webkit-unassigned bfulgham ddkilzer webkit-bug-importer oldest_to_newest 1806336 0 pascoe 2021-10-19 14:53:47 -0700 rdar://84425279 1806349 1 441803 pascoe 2021-10-19 15:04:11 -0700 Created attachment 441803 Patch 1806386 2 441811 pascoe 2021-10-19 15:56:59 -0700 Created attachment 441811 Patch 1806401 3 441811 ddkilzer 2021-10-19 16:36:10 -0700 Comment on attachment 441811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441811&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:341 > auto updatedTag = cbor::CBORWriter::write(cbor::CBORValue(WTFMove(updatedUserMap))); > - auto secAttrApplicationTag = [NSData dataWithBytesNoCopy:updatedTag->data() length:updatedTag->size()]; > + > + auto secAttrApplicationTag = adoptNS([[NSData alloc] initWithBytes:updatedTag->data() length:updatedTag->size()]); It's a good idea not to copy memory if you don't have to, but +[NSData dataWithBytesNoCopy:length:] requires that the object that holds the bytes stay alive until the NSData object is deallocated. This looks like the correct fix. > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:344 > - (__bridge id)kSecAttrApplicationTag: secAttrApplicationTag, > + (__bridge id)kSecAttrApplicationTag: secAttrApplicationTag.get(), In place of using (__bridge id) cast, you can use the new bridge_id_cast() helper function in <wtf/cocoa/TypeCastsCocoa.h>. This change is not required to land the patch, though. 1806414 4 441819 pascoe 2021-10-19 17:09:04 -0700 Created attachment 441819 Follow up patch to address comment 1806421 5 pascoe 2021-10-19 17:22:16 -0700 Follow up is separate in an attempt to keep the history / blame of the file clean, it won't apply cleanly until the first patch is landed (I'll hit retry failed builds then). 1806858 6 441819 ddkilzer 2021-10-20 14:44:27 -0700 Comment on attachment 441819 Follow up patch to address comment View in context: https://bugs.webkit.org/attachment.cgi?id=441819&action=review r=me once Apple Cocoa ports build. > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:354 > + status = SecItemUpdate(bridge_cast(query.get()), bridge_cast(updateParams)); For future reference, this: bridge_cast(query.get()) Can also be written as this: bridge_cast(query).get() It doesn't really matter which way you do it now, though it will be more efficient the second way once projects switch to ARC (since we'll be able to tell ARC to just take over the ownership of the `id` object without incrementing the ref count—but we'll have to call .leakRef() or .release() instead of .get() in that specific case). No need to change this patch to move the .get(), though. 1806862 7 ews-feeder 2021-10-20 14:49:17 -0700 Committed r284574 (243314@main): <https://commits.webkit.org/243314@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441811. 1806865 8 pascoe 2021-10-20 14:50:34 -0700 Reopening to queue follow up 1806893 9 bfulgham 2021-10-20 15:33:38 -0700 Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:319:75: error: extraneous ')' before ';' 1806895 10 441819 bfulgham 2021-10-20 15:34:03 -0700 Comment on attachment 441819 Follow up patch to address comment View in context: https://bugs.webkit.org/attachment.cgi?id=441819&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:319 > + NSDictionary *attributes = (__bridge NSDictionary *)attributesArrayRef); Oops! extra parentheses here! 1807136 11 pascoe 2021-10-21 07:54:39 -0700 Putting the follow up patch in a separate bug for good practice: https://bugs.webkit.org/show_bug.cgi?id=232057 1807204 12 441819 bfulgham 2021-10-21 09:26:29 -0700 Comment on attachment 441819 Follow up patch to address comment Marking second patch obsolete, since Pascoe is fixing in Bug 232057. 441803 2021-10-19 15:04:11 -0700 2021-10-19 15:56:52 -0700 Patch bug-231986-20211019150410.patch text/plain 1938 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFjN2EzYmQzYTg4ZTFlOGRj OGEwZDRmNjZkMGJiNDFlNDk3MmRlZDYuLjIyMzU3ODUzZTMyMmY0ODg3N2JiNWM3OGJhZTE4MGVk NzE0ZjUyZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTAtMTkgIEpvaG4gUGFz Y29lICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBjcmFzaCB3aGVuIGNhbGxp bmcgc2V0VXNlcm5hbWVGb3JMb2NhbENyZWRlbnRpYWxXaXRoSUQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTk4NgorICAgICAgICA8cmRhcjovL3By b2JsZW0vODQ0MjUyNzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNpbmcgYSBjb3B5IGhlcmUgcmVzdWx0cyBpbiBhIGNyYXNoIHdoZW4gdGhlIE5T RGF0YSBkZWFsbG9jcywgZml4IGJ5IHVzaW5nIGEgY29weSBhbmQgUmV0YWluUHRyCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06Cisg ICAgICAgICgrW19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwgc2V0VXNlcm5hbWVGb3JMb2NhbENy ZWRlbnRpYWxXaXRoSUQ6dXNlcm5hbWU6XSk6CisKIDIwMjEtMTAtMTkgIE1pY2hhZWwgQ2F0YW56 YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgVXBkYXRlIHNlY2NvbXAgZmls dGVycyB3aXRoIGxhdGVzdCBjaGFuZ2VzIGZyb20gZmxhdHBhawpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25Q YW5lbC5tbQppbmRleCA1MWEzNDNiN2VlZjExODA2YWFmYzI3NmVhMWQ4YmI1YjlhMmM2ZmE0Li45 ZjZmMzFlNzliOTAzNmY2YzViZDI1MmY0M2NjMTQyOGFmNmVlOTA2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGlj YXRpb25QYW5lbC5tbQpAQCAtMzM3LDEwICszMzcsMTEgQEAgc3RhdGljIFJldGFpblB0cjxOU0Fy cmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFj Y2UKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBhdXRvIHVwZGF0ZWRUYWcgPSBjYm9yOjpD Qk9SV3JpdGVyOjp3cml0ZShjYm9yOjpDQk9SVmFsdWUoV1RGTW92ZSh1cGRhdGVkVXNlck1hcCkp KTsKLSAgICBhdXRvIHNlY0F0dHJBcHBsaWNhdGlvblRhZyA9IFtOU0RhdGEgZGF0YVdpdGhCeXRl c05vQ29weTp1cGRhdGVkVGFnLT5kYXRhKCkgbGVuZ3RoOnVwZGF0ZWRUYWctPnNpemUoKV07CisK KyAgICBhdXRvIHNlY0F0dHJBcHBsaWNhdGlvblRhZyA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2Nd IGluaXRXaXRoQnl0ZXM6dXBkYXRlZFRhZy0+ZGF0YSgpIGxlbmd0aDp1cGRhdGVkVGFnLT5zaXpl KCldKTsKIAogICAgIE5TRGljdGlvbmFyeSAqdXBkYXRlUGFyYW1zID0gQHsKLSAgICAgICAgKF9f YnJpZGdlIGlkKWtTZWNBdHRyQXBwbGljYXRpb25UYWc6IHNlY0F0dHJBcHBsaWNhdGlvblRhZywK KyAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQXBwbGljYXRpb25UYWc6IHNlY0F0dHJBcHBs aWNhdGlvblRhZy5nZXQoKSwKICAgICB9OwogCiAgICAgW3F1ZXJ5IHNldERpY3Rpb25hcnk6QHsK 441811 2021-10-19 15:56:59 -0700 2021-10-20 14:49:18 -0700 Patch bug-231986-20211019155657.patch text/plain 2085 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFjN2EzYmQzYTg4ZTFlOGRj OGEwZDRmNjZkMGJiNDFlNDk3MmRlZDYuLmNhZDYzZWNhYWM2YTFlZmMxYTNlMjE4MGRjODljYzBh MzgzZTQ4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMTAtMTkgIEpvaG4gUGFz Y29lICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBjcmFzaCB3aGVuIGNhbGxp bmcgc2V0VXNlcm5hbWVGb3JMb2NhbENyZWRlbnRpYWxXaXRoSUQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTk4NgorICAgICAgICA8cmRhcjovL3By b2JsZW0vODQ0MjUyNzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNpbmcgYSBjb3B5IGhlcmUgcmVzdWx0cyBpbiBhIGNyYXNoIHdoZW4gdGhlIE5T RGF0YSBkZWFsbG9jcyBiZWNhdXNlIHRoZQorICAgICAgICBbTlNEYXRhIGRhdGFXaXRoQnl0ZXNO b0NvcHldIHdhcyB1c2VkIGEgYnVmZmVyIHRoYXQgd2FzIG5vdCBhbGxvY2F0ZWQgd2l0aCBtYWxs b2MuCisgICAgICAgIFRoaXMgaXMgZml4ZWQgYnkgaW5zdGVhZCB1c2luZyBbTlNEYXRhIGluaXRX aXRoQnl0ZXNdIGFuZCBSZXRhaW5QdHIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW06CisgICAgICAgICgrW19XS1dlYkF1dGhlbnRp Y2F0aW9uUGFuZWwgc2V0VXNlcm5hbWVGb3JMb2NhbENyZWRlbnRpYWxXaXRoSUQ6dXNlcm5hbWU6 XSk6CisKIDIwMjEtMTAtMTkgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5v cmc+CiAKICAgICAgICAgVXBkYXRlIHNlY2NvbXAgZmlsdGVycyB3aXRoIGxhdGVzdCBjaGFuZ2Vz IGZyb20gZmxhdHBhawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1dlYkF1dGhlbnRpY2F0aW9uUGFuZWwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQppbmRleCA1MWEzNDNiN2Vl ZjExODA2YWFmYzI3NmVhMWQ4YmI1YjlhMmM2ZmE0Li45ZjZmMzFlNzliOTAzNmY2YzViZDI1MmY0 M2NjMTQyOGFmNmVlOTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpAQCAtMzM3LDEw ICszMzcsMTEgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhlbnRp Y2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICAgICAgcmV0dXJuOwogICAg IH0KICAgICBhdXRvIHVwZGF0ZWRUYWcgPSBjYm9yOjpDQk9SV3JpdGVyOjp3cml0ZShjYm9yOjpD Qk9SVmFsdWUoV1RGTW92ZSh1cGRhdGVkVXNlck1hcCkpKTsKLSAgICBhdXRvIHNlY0F0dHJBcHBs aWNhdGlvblRhZyA9IFtOU0RhdGEgZGF0YVdpdGhCeXRlc05vQ29weTp1cGRhdGVkVGFnLT5kYXRh KCkgbGVuZ3RoOnVwZGF0ZWRUYWctPnNpemUoKV07CisKKyAgICBhdXRvIHNlY0F0dHJBcHBsaWNh dGlvblRhZyA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6dXBkYXRlZFRh Zy0+ZGF0YSgpIGxlbmd0aDp1cGRhdGVkVGFnLT5zaXplKCldKTsKIAogICAgIE5TRGljdGlvbmFy eSAqdXBkYXRlUGFyYW1zID0gQHsKLSAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQXBwbGlj YXRpb25UYWc6IHNlY0F0dHJBcHBsaWNhdGlvblRhZywKKyAgICAgICAgKF9fYnJpZGdlIGlkKWtT ZWNBdHRyQXBwbGljYXRpb25UYWc6IHNlY0F0dHJBcHBsaWNhdGlvblRhZy5nZXQoKSwKICAgICB9 OwogCiAgICAgW3F1ZXJ5IHNldERpY3Rpb25hcnk6QHsK 441819 2021-10-19 17:09:04 -0700 2021-10-21 09:26:29 -0700 Follow up patch to address comment followup text/plain 7694 pascoe ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggY2FkNjNlY2FhYzZhLi5jMmZjOTUwZjEyNmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTkgQEAKKzIwMjEtMTAtMTkgIEpvaG4gUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgor CisgICAgICAgIEZvbGxvd3VwOiBGaXggY3Jhc2ggd2hlbiBjYWxsaW5nIHNldFVzZXJuYW1lRm9y TG9jYWxDcmVkZW50aWFsV2l0aElECisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzE5ODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0NDI1Mjc5Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbGxvdyB1 cCB0byBhZGRyZXNzIERhdmlkJ3MgY29tbWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbToKKyAgICAgICAgKGdldEFsbExvY2Fs QXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbCk6CisgICAgICAgICgrW19XS1dlYkF1dGhlbnRp Y2F0aW9uUGFuZWwgZGVsZXRlTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbFdpdGhJRDpdKToK KyAgICAgICAgKCtbX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbCBzZXRVc2VybmFtZUZvckxvY2Fs Q3JlZGVudGlhbFdpdGhJRDp1c2VybmFtZTpdKToKKyAgICAgICAgLSBVc2UgPHd0Zi9jb2NvYS9U eXBlQ2FzdHNDb2NvYS5oPgorCiAyMDIxLTEwLTE5ICBKb2huIFBhc2NvZSAgPGpfcGFzY29lQGFw cGxlLmNvbT4KIAogICAgICAgICBGaXggY3Jhc2ggd2hlbiBjYWxsaW5nIHNldFVzZXJuYW1lRm9y TG9jYWxDcmVkZW50aWFsV2l0aElECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJBdXRoZW50aWNhdGlvblBhbmVsLm1tCmluZGV4IDlm NmYzMWU3OWI5MC4uYTYyZjhlOTM5Yzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2ViQXV0aGVudGljYXRpb25QYW5lbC5tbQpA QCAtNTcsNiArNTcsNyBAQAogI2ltcG9ydCA8cGFsL2NyeXB0by9DcnlwdG9EaWdlc3QuaD4KICNp bXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9y dCA8d3RmL2NvY29hL1R5cGVDYXN0c0NvY29hLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvVmVjdG9y Q29jb2EuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L0Jhc2U2NC5oPgogCkBAIC0yMTQsMjQgKzIxNSwy NCBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNjZQogewogICAgIGF1dG8gcXVlcnkgPSBhZG9wdE5T KFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOwogICAgIFtxdWVyeSBzZXREaWN0 aW9uYXJ5OkB7Ci0gICAgICAgIChfX2JyaWRnZSBpZClrU2VjQ2xhc3M6IChfX2JyaWRnZSBpZClr U2VjQ2xhc3NLZXksCi0gICAgICAgIChfX2JyaWRnZSBpZClrU2VjQXR0cktleUNsYXNzOiAoX19i cmlkZ2UgaWQpa1NlY0F0dHJLZXlDbGFzc1ByaXZhdGUsCi0gICAgICAgIChfX2JyaWRnZSBpZClr U2VjQXR0ckFjY2Vzc0dyb3VwOiBhY2Nlc3NHcm91cCwKLSAgICAgICAgKF9fYnJpZGdlIGlkKWtT ZWNSZXR1cm5BdHRyaWJ1dGVzOiBAWUVTLAotICAgICAgICAoX19icmlkZ2UgaWQpa1NlY01hdGNo TGltaXQ6IChfX2JyaWRnZSBpZClrU2VjTWF0Y2hMaW1pdEFsbCwKLSAgICAgICAgKF9fYnJpZGdl IGlkKWtTZWNVc2VEYXRhUHJvdGVjdGlvbktleWNoYWluOiBAWUVTCisgICAgICAgIGJyaWRnZV9p ZF9jYXN0KGtTZWNDbGFzcyk6IGJyaWRnZV9pZF9jYXN0KGtTZWNDbGFzc0tleSksCisgICAgICAg IGJyaWRnZV9pZF9jYXN0KGtTZWNBdHRyS2V5Q2xhc3MpOiBicmlkZ2VfaWRfY2FzdChrU2VjQXR0 cktleUNsYXNzUHJpdmF0ZSksCisgICAgICAgIGJyaWRnZV9pZF9jYXN0KGtTZWNBdHRyQWNjZXNz R3JvdXApOiBhY2Nlc3NHcm91cCwKKyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qoa1NlY1JldHVybkF0 dHJpYnV0ZXMpOiBAWUVTLAorICAgICAgICBicmlkZ2VfaWRfY2FzdChrU2VjTWF0Y2hMaW1pdCk6 IGJyaWRnZV9pZF9jYXN0KGtTZWNNYXRjaExpbWl0QWxsKSwKKyAgICAgICAgYnJpZGdlX2lkX2Nh c3Qoa1NlY1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW4pOiBAWUVTCiAgICAgfV07CiAgICAgdXBk YXRlUXVlcnlJZk5lY2Vzc2FyeShxdWVyeS5nZXQoKSk7CiAKICAgICBDRlR5cGVSZWYgYXR0cmli dXRlc0FycmF5UmVmID0gbnVsbHB0cjsKLSAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29w eU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVlcnkuZ2V0KCksICZhdHRyaWJ1 dGVzQXJyYXlSZWYpOworICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0ZW1Db3B5TWF0Y2hpbmco YnJpZGdlX2Nhc3QocXVlcnkuZ2V0KCkpLCAmYXR0cmlidXRlc0FycmF5UmVmKTsKICAgICBpZiAo c3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91bmQpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgIGF1dG8gcmV0YWluQXR0cmlidXRlc0FycmF5ID0gYWRvcHRDRihhdHRyaWJ1 dGVzQXJyYXlSZWYpOwogCiAgICAgYXV0byByZXN1bHQgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJy YXkgYWxsb2NdIGluaXRdKTsKICAgICBmb3IgKE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyBpbiAo TlNBcnJheSAqKWF0dHJpYnV0ZXNBcnJheVJlZikgewotICAgICAgICBhdXRvIGRlY29kZWRSZXNw b25zZSA9IGNib3I6OkNCT1JSZWFkZXI6OnJlYWQodmVjdG9yRnJvbU5TRGF0YShhdHRyaWJ1dGVz WyhfX2JyaWRnZSBpZClrU2VjQXR0ckFwcGxpY2F0aW9uVGFnXSkpOworICAgICAgICBhdXRvIGRl Y29kZWRSZXNwb25zZSA9IGNib3I6OkNCT1JSZWFkZXI6OnJlYWQodmVjdG9yRnJvbU5TRGF0YShh dHRyaWJ1dGVzW2JyaWRnZV9pZF9jYXN0KGtTZWNBdHRyQXBwbGljYXRpb25UYWcpXSkpOwogICAg ICAgICBpZiAoIWRlY29kZWRSZXNwb25zZSB8fCAhZGVjb2RlZFJlc3BvbnNlLT5pc01hcCgpKSB7 CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwpAQCAtMjQ3LDggKzI0OCw4IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZ2V0 QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHNJbXBsKE5TU3RyaW5nICphY2NlCiAKICAg ICAgICAgW3Jlc3VsdCBhZGRPYmplY3Q6QHsKICAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGlj YXRvckNyZWRlbnRpYWxOYW1lS2V5OiB1c2VybmFtZSwKLSAgICAgICAgICAgIF9XS0xvY2FsQXV0 aGVudGljYXRvckNyZWRlbnRpYWxJREtleTogYXR0cmlidXRlc1soX19icmlkZ2UgaWQpa1NlY0F0 dHJBcHBsaWNhdGlvbkxhYmVsXSwKLSAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNy ZWRlbnRpYWxSZWx5aW5nUGFydHlJREtleTogYXR0cmlidXRlc1soX19icmlkZ2UgaWQpa1NlY0F0 dHJMYWJlbF0KKyAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxJREtl eTogYXR0cmlidXRlc1ticmlkZ2VfaWRfY2FzdChrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWwpXSwK KyAgICAgICAgICAgIF9XS0xvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxSZWx5aW5nUGFydHlJ REtleTogYXR0cmlidXRlc1ticmlkZ2VfaWRfY2FzdChrU2VjQXR0ckxhYmVsKV0KICAgICAgICAg fV07CiAgICAgfQogCkBAIC0yNzksMTMgKzI4MCwxMyBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJy YXk+IGdldEFsbExvY2FsQXV0aGVudGljYXRvckNyZWRlbnRpYWxzSW1wbChOU1N0cmluZyAqYWNj ZQogI2lmIEVOQUJMRShXRUJfQVVUSE4pCiAgICAgYXV0byBkZWxldGVRdWVyeSA9IGFkb3B0TlMo W1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CiAgICAgW2RlbGV0ZVF1ZXJ5IHNl dERpY3Rpb25hcnk6QHsKLSAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNDbGFzczogKF9fYnJpZGdl IGlkKWtTZWNDbGFzc0tleSwKLSAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRyQXBwbGljYXRp b25MYWJlbDogY3JlZGVudGlhbElELAotICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1VzZURhdGFQ cm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMKKyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNz KTogYnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzS2V5KSwKKyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qo a1NlY0F0dHJBcHBsaWNhdGlvbkxhYmVsKTogY3JlZGVudGlhbElELAorICAgICAgICBicmlkZ2Vf aWRfY2FzdChrU2VjVXNlRGF0YVByb3RlY3Rpb25LZXljaGFpbik6IEBZRVMKICAgICB9XTsKICAg ICB1cGRhdGVRdWVyeUlmTmVjZXNzYXJ5KGRlbGV0ZVF1ZXJ5LmdldCgpKTsKIAotICAgIFNlY0l0 ZW1EZWxldGUoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilkZWxldGVRdWVyeS5nZXQoKSk7Cisg ICAgU2VjSXRlbURlbGV0ZShicmlkZ2VfY2FzdChkZWxldGVRdWVyeS5nZXQoKSkpOwogI2VuZGlm CiB9CiAKQEAgLTMwMSwyMiArMzAyLDIyIEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZ2V0 QWxsTG9jYWxBdXRoZW50aWNhdG9yQ3JlZGVudGlhbHNJbXBsKE5TU3RyaW5nICphY2NlCiAjaWYg RU5BQkxFKFdFQl9BVVRITikKICAgICBhdXRvIHF1ZXJ5ID0gYWRvcHROUyhbW05TTXV0YWJsZURp Y3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKICAgICBbcXVlcnkgc2V0RGljdGlvbmFyeTpAewotICAg ICAgICAoX19icmlkZ2UgaWQpa1NlY0NsYXNzOiAoX19icmlkZ2UgaWQpa1NlY0NsYXNzS2V5LAot ICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1JldHVybkF0dHJpYnV0ZXM6IEBZRVMsCi0gICAgICAg IChfX2JyaWRnZSBpZClrU2VjQXR0ckFwcGxpY2F0aW9uTGFiZWw6IGNyZWRlbnRpYWxJRCwKLSAg ICAgICAgKF9fYnJpZGdlIGlkKWtTZWNSZXR1cm5QZXJzaXN0ZW50UmVmIDogKF9fYnJpZGdlIGlk KWtDRkJvb2xlYW5UcnVlLAotICAgICAgICAoX19icmlkZ2UgaWQpa1NlY1VzZURhdGFQcm90ZWN0 aW9uS2V5Y2hhaW46IEBZRVMKKyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzKTogYnJp ZGdlX2lkX2Nhc3Qoa1NlY0NsYXNzS2V5KSwKKyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qoa1NlY1Jl dHVybkF0dHJpYnV0ZXMpOiBAWUVTLAorICAgICAgICBicmlkZ2VfaWRfY2FzdChrU2VjQXR0ckFw cGxpY2F0aW9uTGFiZWwpOiBjcmVkZW50aWFsSUQsCisgICAgICAgIGJyaWRnZV9pZF9jYXN0KGtT ZWNSZXR1cm5QZXJzaXN0ZW50UmVmKSA6IGJyaWRnZV9pZF9jYXN0KGtDRkJvb2xlYW5UcnVlKSwK KyAgICAgICAgYnJpZGdlX2lkX2Nhc3Qoa1NlY1VzZURhdGFQcm90ZWN0aW9uS2V5Y2hhaW4pOiBA WUVTCiAgICAgfV07CiAgICAgdXBkYXRlUXVlcnlJZk5lY2Vzc2FyeShxdWVyeS5nZXQoKSk7CiAK ICAgICBDRlR5cGVSZWYgYXR0cmlidXRlc0FycmF5UmVmID0gbnVsbHB0cjsKLSAgICBPU1N0YXR1 cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYp cXVlcnkuZ2V0KCksICZhdHRyaWJ1dGVzQXJyYXlSZWYpOworICAgIE9TU3RhdHVzIHN0YXR1cyA9 IFNlY0l0ZW1Db3B5TWF0Y2hpbmcoYnJpZGdlX2Nhc3QocXVlcnkuZ2V0KCkpLCAmYXR0cmlidXRl c0FycmF5UmVmKTsKICAgICBpZiAoc3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91 bmQpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9Ci0gICAgTlNEaWN0aW9uYXJ5ICphdHRyaWJ1dGVzID0gKF9fYnJpZGdlIE5TRGljdGlvbmFy eSAqKWF0dHJpYnV0ZXNBcnJheVJlZjsKLSAgICBhdXRvIGRlY29kZWRSZXNwb25zZSA9IGNib3I6 OkNCT1JSZWFkZXI6OnJlYWQodmVjdG9yRnJvbU5TRGF0YShhdHRyaWJ1dGVzWyhfX2JyaWRnZSBp ZClrU2VjQXR0ckFwcGxpY2F0aW9uVGFnXSkpOworICAgIE5TRGljdGlvbmFyeSAqYXR0cmlidXRl cyA9IChfX2JyaWRnZSBOU0RpY3Rpb25hcnkgKilhdHRyaWJ1dGVzQXJyYXlSZWYpOworICAgIGF1 dG8gZGVjb2RlZFJlc3BvbnNlID0gY2Jvcjo6Q0JPUlJlYWRlcjo6cmVhZCh2ZWN0b3JGcm9tTlNE YXRhKGF0dHJpYnV0ZXNbYnJpZGdlX2lkX2Nhc3Qoa1NlY0F0dHJBcHBsaWNhdGlvblRhZyldKSk7 CiAgICAgaWYgKCFkZWNvZGVkUmVzcG9uc2UgfHwgIWRlY29kZWRSZXNwb25zZS0+aXNNYXAoKSkg ewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzQx LDE2ICszNDIsMTYgQEAgc3RhdGljIFJldGFpblB0cjxOU0FycmF5PiBnZXRBbGxMb2NhbEF1dGhl bnRpY2F0b3JDcmVkZW50aWFsc0ltcGwoTlNTdHJpbmcgKmFjY2UKICAgICBhdXRvIHNlY0F0dHJB cHBsaWNhdGlvblRhZyA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6dXBk YXRlZFRhZy0+ZGF0YSgpIGxlbmd0aDp1cGRhdGVkVGFnLT5zaXplKCldKTsKIAogICAgIE5TRGlj dGlvbmFyeSAqdXBkYXRlUGFyYW1zID0gQHsKLSAgICAgICAgKF9fYnJpZGdlIGlkKWtTZWNBdHRy QXBwbGljYXRpb25UYWc6IHNlY0F0dHJBcHBsaWNhdGlvblRhZy5nZXQoKSwKKyAgICAgICAgYnJp ZGdlX2lkX2Nhc3Qoa1NlY0F0dHJBcHBsaWNhdGlvblRhZyk6IHNlY0F0dHJBcHBsaWNhdGlvblRh Zy5nZXQoKSwKICAgICB9OwogCiAgICAgW3F1ZXJ5IHNldERpY3Rpb25hcnk6QHsKLSAgICAgICAg KF9fYnJpZGdlIGlkKWtTZWNWYWx1ZVBlcnNpc3RlbnRSZWY6IFthdHRyaWJ1dGVzIG9iamVjdEZv cktleTooX19icmlkZ2UgaWQpa1NlY1ZhbHVlUGVyc2lzdGVudFJlZl0sCi0gICAgICAgIChfX2Jy aWRnZSBpZClrU2VjQ2xhc3M6IChfX2JyaWRnZSBpZClrU2VjQ2xhc3NLZXksCisgICAgICAgIGJy aWRnZV9pZF9jYXN0KGtTZWNWYWx1ZVBlcnNpc3RlbnRSZWYpOiBbYXR0cmlidXRlcyBvYmplY3RG b3JLZXk6YnJpZGdlX2lkX2Nhc3Qoa1NlY1ZhbHVlUGVyc2lzdGVudFJlZildLAorICAgICAgICBi cmlkZ2VfaWRfY2FzdChrU2VjQ2xhc3MpOiBicmlkZ2VfaWRfY2FzdChrU2VjQ2xhc3NLZXkpLAog ICAgIH1dOwogICAgIHVwZGF0ZVF1ZXJ5SWZOZWNlc3NhcnkocXVlcnkuZ2V0KCkpOwogCi0gICAg c3RhdHVzID0gU2VjSXRlbVVwZGF0ZSgoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5Lmdl dCgpLCAoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXVwZGF0ZVBhcmFtcyk7CisgICAgc3RhdHVz ID0gU2VjSXRlbVVwZGF0ZShicmlkZ2VfY2FzdChxdWVyeS5nZXQoKSksIGJyaWRnZV9jYXN0KHVw ZGF0ZVBhcmFtcykpOwogICAgIGlmIChzdGF0dXMgJiYgc3RhdHVzICE9IGVyclNlY0l0ZW1Ob3RG b3VuZCkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuOwo=