223168 2021-03-14 16:21:19 -0700 Add internal additions for WebAuthn compatibility 2021-03-16 10:34:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham cdumez ews-watchlist jiewen_tan oldest_to_newest 1739287 0 katherine_cheney 2021-03-14 16:21:19 -0700 com.apple.webkit.webauthn should actually be com.apple.WebKit.WebAuthn for internal-compatibility reasons. 1739288 1 katherine_cheney 2021-03-14 16:21:46 -0700 <rdar://problem/74890060> 1739289 2 423137 katherine_cheney 2021-03-14 16:25:14 -0700 Created attachment 423137 Patch 1739486 3 423137 bfulgham 2021-03-15 09:47:58 -0700 Comment on attachment 423137 Patch Case sensitivity. *sigh*. r=me 1739594 4 423137 jiewen_tan 2021-03-15 12:36:41 -0700 Comment on attachment 423137 Patch Can we just add the WKA part and remove the entitlement part? 1739605 5 423224 katherine_cheney 2021-03-15 12:48:58 -0700 Created attachment 423224 Patch 1739607 6 katherine_cheney 2021-03-15 12:49:13 -0700 (In reply to Jiewen Tan from comment #4) > Comment on attachment 423137 [details] > Patch > > Can we just add the WKA part and remove the entitlement part? Yes, I updated the patch. 1739625 7 423224 jiewen_tan 2021-03-15 13:14:52 -0700 Comment on attachment 423224 Patch LGTM. 1739708 8 423255 katherine_cheney 2021-03-15 15:42:00 -0700 Created attachment 423255 Patch 1739726 9 423255 bfulgham 2021-03-15 16:41:20 -0700 Comment on attachment 423255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423255&action=review r=me > Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:54 > +static NSDictionary *createAlternateQuery(const String&) { return [NSDictionary alloc]; } Could this just be return nil, or perhapss ASSERT_NOT_REACHED? I don't think we should ever hit this code path. 1739729 10 423255 cdumez 2021-03-15 16:46:21 -0700 Comment on attachment 423255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423255&action=review >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:54 >> +static NSDictionary *createAlternateQuery(const String&) { return [NSDictionary alloc]; } > > Could this just be return nil, or perhapss ASSERT_NOT_REACHED? I don't think we should ever hit this code path. Please don't call [NSDictionary alloc] here, this would leak. 1739732 11 423255 cdumez 2021-03-15 16:54:44 -0700 Comment on attachment 423255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423255&action=review > Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:142 > + query = createAlternateQuery(rpId); Based on how this is used, createAlternateQuery() seems to either leak or return an autoreleased value. If it returns an autoreleased value, then I think we should not use "create" in the name. If it returns a value that is not autoreleased, then I think createAlternateQuery() should return a RetainPtr<>. 1739823 12 423292 katherine_cheney 2021-03-15 20:47:24 -0700 Created attachment 423292 Patch 1739971 13 423292 bfulgham 2021-03-16 09:23:55 -0700 Comment on attachment 423292 Patch r=me 1740017 14 ews-feeder 2021-03-16 10:34:00 -0700 Committed r274490: <https://commits.webkit.org/r274490> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423292. 423137 2021-03-14 16:25:14 -0700 2021-03-15 12:48:56 -0700 Patch bug-223168-20210314162513.patch text/plain 4534 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRhMmRlMzQyZGVmN2Mx NzIxZmYyYzE3OWQ2ZjA2YzVmNjNkZGNhMi4uNTExMWZkNDk2NTNhZWVlODQ2ODA2MjQ5NzVlZGIy OGNjYWM4ZGYyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTAzLTE0ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBX ZWJBdXRobiBlbnRpdGxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMzE2OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ4OTAwNjA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVz L3dlYmF1dGhuL1dlYkF1dGhlbnRpY2F0aW9uQ29uc3RhbnRzLmg6CisKIDIwMjEtMDMtMDMgIEFk aXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04g KHIyNzMxNTQpOiBTcGVlZG9tZXRlciAyIGlzIDEtMiUgcmVncmVzc2VkIG9uIGlPUwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpp bmRleCBjNTRlMzgxMGQ2YWIyZDIwZjU4ZWQxYjRjMWM0YWRhOGY4Mjg2ODZjLi4yNzhhMjBkODVl YmQ1YThiYjE5NTBlOTI5MjdlZjc1NThkOGZlODY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBA CisyMDIxLTAzLTE0ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgor CisgICAgICAgIFVwZGF0ZSBXZWJBdXRobiBlbnRpdGxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE2OAorICAgICAgICA8cmRhcjovL3By b2JsZW0vNzQ4OTAwNjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgY29tLmFwcGxlLndlYmtpdC53ZWJhdXRobiBzaG91bGQgYWN0dWFsbHkgYmUgY29t LmFwcGxlLldlYktpdC5XZWJBdXRobgorICAgICAgICBmb3IgaW50ZXJuYWwtY29tcGF0aWJpbGl0 eSByZWFzb25zLgorCisgICAgICAgICogU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50 aWNhdG9yLm1tOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhlbnRpY2F0b3JJbnRlcm5hbDo6 Z2V0RXhpc3RpbmdDcmVkZW50aWFscyk6CisKIDIwMjEtMDMtMDMgIENvbW1pdCBRdWV1ZSAgPGNv bW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyBy MjczODE0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRobi9XZWJB dXRoZW50aWNhdGlvbkNvbnN0YW50cy5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdXRo bi9XZWJBdXRoZW50aWNhdGlvbkNvbnN0YW50cy5oCmluZGV4IDQ1MWZmMzNiMjhlZDUwYjViYWY3 YjlhMzljZWE4MjA3N2U1MzExNTEuLjgzZWViMWQ1MTJhNDUzNzU5MzAyYzk5NjE1MmY0N2Y2M2I0 MDg5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXV0aG4vV2ViQXV0 aGVudGljYXRpb25Db25zdGFudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1 dGhuL1dlYkF1dGhlbnRpY2F0aW9uQ29uc3RhbnRzLmgKQEAgLTc3LDYgKzc3LDYgQEAgZW51bSBj bGFzcyBDbGllbnREYXRhVHlwZSA6IGJvb2wgewogICAgIEdldAogfTsKIAotY29uc3QgY2hhciBM b2NhbEF1dGhlbnRpY2F0aW9yQWNjZXNzR3JvdXBbXSA9ICJjb20uYXBwbGUud2Via2l0LndlYmF1 dGhuIjsKK2NvbnN0IGNoYXIgTG9jYWxBdXRoZW50aWNhdGlvckFjY2Vzc0dyb3VwW10gPSAiY29t LmFwcGxlLldlYktpdC5XZWJBdXRobiI7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaCBiL1Nv dXJjZS9XZWJLaXQvU2NyaXB0cy9wcm9jZXNzLWVudGl0bGVtZW50cy5zaAppbmRleCA0Mjg2YTE0 YWJhNjJhZGQ4ZjZkMTI4YWVmNmRjYjRmYWIyYmJiODI1Li40MGJiM2I5NWQ0YzBhNTcwOGIyZWJh ZDk1OGQ1NGMzOGQxNTVlZmEwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvcHJv Y2Vzcy1lbnRpdGxlbWVudHMuc2gKKysrIGIvU291cmNlL1dlYktpdC9TY3JpcHRzL3Byb2Nlc3Mt ZW50aXRsZW1lbnRzLnNoCkBAIC02NCw3ICs2NCw3IEBAIGZ1bmN0aW9uIG1hY19wcm9jZXNzX3dl YmF1dGhuX2VudGl0bGVtZW50cygpCiAgICAgICAgIHBsaXN0YnVkZHkgQWRkIDpjb20uYXBwbGUu c2VjdXJpdHkuZGV2aWNlLnVzYiBib29sIFlFUwogCiAgICAgICAgIHBsaXN0YnVkZHkgQWRkIDpr ZXljaGFpbi1hY2Nlc3MtZ3JvdXBzIGFycmF5Ci0gICAgICAgIHBsaXN0YnVkZHkgQWRkIDprZXlj aGFpbi1hY2Nlc3MtZ3JvdXBzOjAgc3RyaW5nIGNvbS5hcHBsZS53ZWJraXQud2ViYXV0aG4KKyAg ICAgICAgcGxpc3RidWRkeSBBZGQgOmtleWNoYWluLWFjY2Vzcy1ncm91cHM6MCBzdHJpbmcgY29t LmFwcGxlLldlYktpdC5XZWJBdXRobgogICAgICAgICBwbGlzdGJ1ZGR5IEFkZCA6a2V5Y2hhaW4t YWNjZXNzLWdyb3VwczoxIHN0cmluZyBsb2NrZG93bi1pZGVudGl0aWVzCiAKICAgICAgICAgcGxp c3RidWRkeSBBZGQgOmNvbS5hcHBsZS5zZWN1cml0eS5hdHRlc3RhdGlvbi5hY2Nlc3MgYm9vbCBZ RVMKQEAgLTI3NSw3ICsyNzUsNyBAQCBmdW5jdGlvbiBpb3NfZmFtaWx5X3Byb2Nlc3Nfd2ViYXV0 aG5fZW50aXRsZW1lbnRzKCkKICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxlLlVJS2l0LnZl bmRzLXZpZXctc2VydmljZXMgYm9vbCBZRVMKIAogICAgIHBsaXN0YnVkZHkgQWRkIDprZXljaGFp bi1hY2Nlc3MtZ3JvdXBzIGFycmF5Ci0gICAgcGxpc3RidWRkeSBBZGQgOmtleWNoYWluLWFjY2Vz cy1ncm91cHM6MCBzdHJpbmcgY29tLmFwcGxlLndlYmtpdC53ZWJhdXRobgorICAgIHBsaXN0YnVk ZHkgQWRkIDprZXljaGFpbi1hY2Nlc3MtZ3JvdXBzOjAgc3RyaW5nIGNvbS5hcHBsZS5XZWJLaXQu V2ViQXV0aG4KICAgICBwbGlzdGJ1ZGR5IEFkZCA6a2V5Y2hhaW4tYWNjZXNzLWdyb3VwczoxIHN0 cmluZyBsb2NrZG93bi1pZGVudGl0aWVzCiAKICAgICBwbGlzdGJ1ZGR5IEFkZCA6Y29tLmFwcGxl LnByaXZhdGUuTW9iaWxlR2VzdGFsdC5BbGxvd2VkUHJvdGVjdGVkS2V5cyBhcnJheQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9j YWxBdXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGlj YXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCmluZGV4IDViNDViYzI4YjU3MjQzNDMw ZDMyMjc4NTdiYzBiMTZlNTQ0MDE2M2YuLmRhNmVlNWIxMDc3ZjIxNDY4ZmM5YTE0MTNiMDEyMTUy YTU0MGMxZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRp Y2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KQEAg LTQ3LDYgKzQ3LDEyIEBACiAjaW1wb3J0IDx3dGYvdGV4dC9CYXNlNjQuaD4KICNpbXBvcnQgPHd0 Zi90ZXh0L1N0cmluZ0hhc2guaD4KIAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW1w b3J0IDxXZWJLaXRBZGRpdGlvbnMvTG9jYWxBdXRoZW50aWNhdG9yQWRkaXRpb25zLmg+CisjZWxz ZQorI2RlZmluZSBHRVRfRVhJU1RJTkdfQ1JFREVOVElBTF9BRERJVElPTlMKKyNlbmRpZgorCiBu YW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBmaWRvOwogdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CkBAIC0xMjQsNiArMTMwLDcgQEAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxSZWY8 QXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlPj4+IGdldEV4aXN0aW5nQ3JlZGVudGkKICAg ICAgICAgKGlkKWtTZWNBdHRyTGFiZWw6IHJwSWQsCiAgICAgICAgIChpZClrU2VjUmV0dXJuQXR0 cmlidXRlczogQFlFUywKICAgICAgICAgKGlkKWtTZWNNYXRjaExpbWl0OiAoaWQpa1NlY01hdGNo TGltaXRBbGwsCisgICAgICAgIEdFVF9FWElTVElOR19DUkVERU5USUFMX0FERElUSU9OUwogI2lm IEhBVkUoREFUQV9QUk9URUNUSU9OX0tFWUNIQUlOKQogICAgICAgICAoaWQpa1NlY1VzZURhdGFQ cm90ZWN0aW9uS2V5Y2hhaW46IEBZRVMKICNlbHNlCg== 423224 2021-03-15 12:48:58 -0700 2021-03-15 15:41:59 -0700 Patch bug-223168-20210315124857.patch text/plain 1930 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5MTBhYjA1ZjZkMzUwNzZh NzYyZmYxZGM2NjM3N2Q2YjhkZTEwMjYuLjgwYWFkMzRjY2VmN2JiYzVkN2JjZTA5OGVmMGFlM2M0 NWUxNmZlOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMTQgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGludGVybmFs IGFkZGl0aW9ucyBmb3IgV2ViQXV0aG4gY29tcGF0aWJpbGl0eQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTY4CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS83NDg5MDA2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRp Y2F0b3IubW06CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvckludGVybmFsOjpn ZXRFeGlzdGluZ0NyZWRlbnRpYWxzKToKKwogMjAyMS0wMy0xMyAgUGVuZyBMaXUgIDxwZW5nLmxp dTZAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFVQXVtNU0VdIE1lZGlhU291cmNlOjpidWZmZXJl ZCBhbmQgTWVkaWFTb3VyY2U6OmFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IHVwZGF0ZSBpbiB0 aGUgc2FtZSBydW4gbG9vcCBhcyBNZWRpYVNvdXJjZTo6ZW5kT2ZTdHJlYW0oKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxB dXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCmluZGV4IDViNDViYzI4YjU3MjQzNDMwZDMy Mjc4NTdiYzBiMTZlNTQ0MDE2M2YuLmNkNDA0ODU4ZmVhOTdjZjE4NTFiYmRjNTQ1NDhjYWI3NTcy OTYyMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0 aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KQEAgLTQ3 LDYgKzQ3LDEyIEBACiAjaW1wb3J0IDx3dGYvdGV4dC9CYXNlNjQuaD4KICNpbXBvcnQgPHd0Zi90 ZXh0L1N0cmluZ0hhc2guaD4KIAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW1wb3J0 IDxXZWJLaXRBZGRpdGlvbnMvTG9jYWxBdXRoZW50aWNhdG9yQWRkaXRpb25zLmg+CisjZWxzZQor I2RlZmluZSBHRVRfRVhJU1RJTkdfQ1JFREVOVElBTF9BRERJVElPTlMKKyNlbmRpZgorCiBuYW1l c3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBmaWRvOwogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CkBAIC0xMzAsNiArMTM2LDcgQEAgc3RhdGljIE9wdGlvbmFsPFZlY3RvcjxSZWY8QXV0 aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlPj4+IGdldEV4aXN0aW5nQ3JlZGVudGkKICAgICAg ICAgKGlkKWtTZWNBdHRyTm9MZWdhY3k6IEBZRVMKICNlbmRpZgogICAgIH07CisgICAgR0VUX0VY SVNUSU5HX0NSRURFTlRJQUxfQURESVRJT05TCiAgICAgQ0ZUeXBlUmVmIGF0dHJpYnV0ZXNBcnJh eVJlZiA9IG51bGxwdHI7CiAgICAgT1NTdGF0dXMgc3RhdHVzID0gU2VjSXRlbUNvcHlNYXRjaGlu ZygoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5LCAmYXR0cmlidXRlc0FycmF5UmVmKTsK ICAgICBpZiAoc3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91bmQpCg== 423255 2021-03-15 15:42:00 -0700 2021-03-15 20:47:22 -0700 Patch bug-223168-20210315154159.patch text/plain 2088 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5MTBhYjA1ZjZkMzUwNzZh NzYyZmYxZGM2NjM3N2Q2YjhkZTEwMjYuLjgwYWFkMzRjY2VmN2JiYzVkN2JjZTA5OGVmMGFlM2M0 NWUxNmZlOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMTQgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGludGVybmFs IGFkZGl0aW9ucyBmb3IgV2ViQXV0aG4gY29tcGF0aWJpbGl0eQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTY4CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS83NDg5MDA2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRp Y2F0b3IubW06CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvckludGVybmFsOjpn ZXRFeGlzdGluZ0NyZWRlbnRpYWxzKToKKwogMjAyMS0wMy0xMyAgUGVuZyBMaXUgIDxwZW5nLmxp dTZAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFVQXVtNU0VdIE1lZGlhU291cmNlOjpidWZmZXJl ZCBhbmQgTWVkaWFTb3VyY2U6OmFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IHVwZGF0ZSBpbiB0 aGUgc2FtZSBydW4gbG9vcCBhcyBNZWRpYVNvdXJjZTo6ZW5kT2ZTdHJlYW0oKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxB dXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRp b24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCmluZGV4IDViNDViYzI4YjU3MjQzNDMwZDMy Mjc4NTdiYzBiMTZlNTQ0MDE2M2YuLmVmMTY0Y2Q2MmVkYzQ5MmNmOTNjZDRiZTYxZWMzNDUxYTc2 NDhkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0 aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KQEAgLTQ3 LDYgKzQ3LDEzIEBACiAjaW1wb3J0IDx3dGYvdGV4dC9CYXNlNjQuaD4KICNpbXBvcnQgPHd0Zi90 ZXh0L1N0cmluZ0hhc2guaD4KIAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW1wb3J0 IDxXZWJLaXRBZGRpdGlvbnMvTG9jYWxBdXRoZW50aWNhdG9yQWRkaXRpb25zLmg+CisjZWxzZQor c3RhdGljIGJvb2wgc2hvdWxkQ3JlYXRlQWx0ZXJuYXRlUXVlcnkoKSB7IHJldHVybiBmYWxzZTsg fQorc3RhdGljIE5TRGljdGlvbmFyeSAqY3JlYXRlQWx0ZXJuYXRlUXVlcnkoY29uc3QgU3RyaW5n JikgeyByZXR1cm4gW05TRGljdGlvbmFyeSBhbGxvY107IH0KKyNlbmRpZgorCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBmaWRvOwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CkBAIC0xMzAsNiArMTM3LDEwIEBAIHN0YXRpYyBPcHRpb25hbDxWZWN0b3I8UmVmPEF1dGhlbnRp Y2F0b3JBc3NlcnRpb25SZXNwb25zZT4+PiBnZXRFeGlzdGluZ0NyZWRlbnRpCiAgICAgICAgIChp ZClrU2VjQXR0ck5vTGVnYWN5OiBAWUVTCiAjZW5kaWYKICAgICB9OworCisgICAgaWYgKHNob3Vs ZENyZWF0ZUFsdGVybmF0ZVF1ZXJ5KCkpCisgICAgICAgIHF1ZXJ5ID0gY3JlYXRlQWx0ZXJuYXRl UXVlcnkocnBJZCk7CisKICAgICBDRlR5cGVSZWYgYXR0cmlidXRlc0FycmF5UmVmID0gbnVsbHB0 cjsKICAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBD RkRpY3Rpb25hcnlSZWYpcXVlcnksICZhdHRyaWJ1dGVzQXJyYXlSZWYpOwogICAgIGlmIChzdGF0 dXMgJiYgc3RhdHVzICE9IGVyclNlY0l0ZW1Ob3RGb3VuZCkK 423292 2021-03-15 20:47:24 -0700 2021-03-16 10:34:01 -0700 Patch bug-223168-20210315204723.patch text/plain 2171 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5MTBhYjA1ZjZkMzUwNzZh NzYyZmYxZGM2NjM3N2Q2YjhkZTEwMjYuLmVmNjBjZTFjMmQ1NzM4ZTQ1Nzc4Yzc3ZjVhYWU5YWY5 ODg5MTI5NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDMtMTUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGludGVybmFs IGFkZGl0aW9ucyBmb3IgV2ViQXV0aG4gY29tcGF0aWJpbGl0eQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzMTY4CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS83NDg5MDA2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRp Y2F0b3IubW06CisgICAgICAgIChzaG91bGRVc2VBbHRlcm5hdGVRdWVyeSk6CisgICAgICAgIChh bHRlcm5hdGVRdWVyeUZvclJQSUQpOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhlbnRpY2F0 b3JJbnRlcm5hbDo6Z2V0RXhpc3RpbmdDcmVkZW50aWFscyk6CisKIDIwMjEtMDMtMTMgIFBlbmcg TGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF1bTVNFXSBNZWRpYVNv dXJjZTo6YnVmZmVyZWQgYW5kIE1lZGlhU291cmNlOjphY3RpdmVTb3VyY2VCdWZmZXJzIGRvIG5v dCB1cGRhdGUgaW4gdGhlIHNhbWUgcnVuIGxvb3AgYXMgTWVkaWFTb3VyY2U6OmVuZE9mU3RyZWFt KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9u L0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQppbmRleCA1YjQ1YmMy OGI1NzI0MzQzMGQzMjI3ODU3YmMwYjE2ZTU0NDAxNjNmLi4yNjBjYTZhODAwMzBhMTM0ZTc3ZTc1 ZDEyMmQ5MTQ4MzYzYTE5NWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNh dG9yLm1tCkBAIC00Nyw2ICs0NywxNyBAQAogI2ltcG9ydCA8d3RmL3RleHQvQmFzZTY0Lmg+CiAj aW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxf U0RLKQorI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL0xvY2FsQXV0aGVudGljYXRvckFkZGl0aW9u cy5oPgorI2Vsc2UKK3N0YXRpYyBib29sIHNob3VsZFVzZUFsdGVybmF0ZVF1ZXJ5KCkgeyByZXR1 cm4gZmFsc2U7IH0KK3N0YXRpYyBOU0RpY3Rpb25hcnkgKmFsdGVybmF0ZVF1ZXJ5Rm9yUlBJRChj b25zdCBTdHJpbmcmKQoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBu aWw7Cit9CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgZmlk bzsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAtMTMwLDYgKzE0MSwxMCBAQCBzdGF0aWMg T3B0aW9uYWw8VmVjdG9yPFJlZjxBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2U+Pj4gZ2V0 RXhpc3RpbmdDcmVkZW50aQogICAgICAgICAoaWQpa1NlY0F0dHJOb0xlZ2FjeTogQFlFUwogI2Vu ZGlmCiAgICAgfTsKKworICAgIGlmIChzaG91bGRVc2VBbHRlcm5hdGVRdWVyeSgpKQorICAgICAg ICBxdWVyeSA9IGFsdGVybmF0ZVF1ZXJ5Rm9yUlBJRChycElkKTsKKwogICAgIENGVHlwZVJlZiBh dHRyaWJ1dGVzQXJyYXlSZWYgPSBudWxscHRyOwogICAgIE9TU3RhdHVzIHN0YXR1cyA9IFNlY0l0 ZW1Db3B5TWF0Y2hpbmcoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilxdWVyeSwgJmF0dHJpYnV0 ZXNBcnJheVJlZik7CiAgICAgaWYgKHN0YXR1cyAmJiBzdGF0dXMgIT0gZXJyU2VjSXRlbU5vdEZv dW5kKQo=