215626 2020-08-18 14:27:30 -0700 WKWebViews using fastServerTrustEvaluationEnabled should only allow legacy TLS for main resource loads 2020-08-19 18:50:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215640 InRadar P2 Normal --- 1 achristensen achristensen darin webkit-bug-importer oldest_to_newest 1681185 0 achristensen 2020-08-18 14:27:30 -0700 WKWebViews using fastServerTrustEvaluationEnabled should only allow legacy TLS for main resource loads 1681193 1 406811 achristensen 2020-08-18 14:38:20 -0700 Created attachment 406811 Patch 1681195 2 406811 darin 2020-08-18 14:41:02 -0700 Comment on attachment 406811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406811&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:397 > + if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes > + && fastServerTrustEvaluationEnabled > + && !isTopLevelNavigation()) > + return completionHandler(AuthenticationChallengeDisposition::Cancel, { }); Why not do this in NetworkSessionCocoa::continueDidReceiveChallenge rather than passing more state through? 1681201 3 406813 achristensen 2020-08-18 14:50:58 -0700 Created attachment 406813 Patch 1681202 4 406813 achristensen 2020-08-18 14:51:35 -0700 Comment on attachment 406813 Patch Great idea! 1681217 5 ews-feeder 2020-08-18 15:18:25 -0700 Committed r265835: <https://trac.webkit.org/changeset/265835> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406813. 1681218 6 webkit-bug-importer 2020-08-18 15:19:18 -0700 <rdar://problem/67356569> 1681578 7 achristensen 2020-08-19 18:50:48 -0700 http://trac.webkit.org/r265930 406811 2020-08-18 14:38:20 -0700 2020-08-18 14:50:56 -0700 Patch bug-215626-20200818143820.patch text/plain 8254 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxZGU2MTI2ZjljNTI2MDQx ZmVlMzMzMjgzNTJkY2E0ZDU1MjliMzcuLjZjODE0NGExM2E5ZjhlYzNiOTQyMGJjZmYxM2RlMjE3 YzFjMzRiNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDgtMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXS1dlYlZpZXdz IHVzaW5nIGZhc3RTZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkIHNob3VsZCBvbmx5IGFsbG93 IGxlZ2FjeSBUTFMgZm9yIG1haW4gcmVzb3VyY2UgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTYyNgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNjcyNjg4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2UgaGF2ZSBpbnRyb2R1Y2VkIHB1YmxpYyBBUEkgd2ViVmlldzphdXRoZW50aWNhdGlv bkNoYWxsZW5nZTpzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6IGluIFdLTmF2aWdhdGlvbkRlbGVn YXRlIHRvIGFsbG93CisgICAgICAgIGFwcGxpY2F0aW9ucyB0byBjaG9vc2Ugd2hldGhlciB0byBh bGxvdyBUTFMgMS4wIG9yIDEuMSBjb25uZWN0aW9ucy4gIFdlIGRvbid0IHdhbnQgdG8gYnJlYWsg dGhpcyBBUEkgb3IgYnJlYWsgZXhpc3RpbmcgdGhpcmQgcGFydHkKKyAgICAgICAgYXBwcyB0aGF0 IGxvYWQgcGFnZXMgdGhhdCBsb2FkIHRoaXJkIHBhcnR5IHN1YnJlc291cmNlcyB0aGF0IHVzZSBU TFMgMS4wIG9yIDEuMS4KKworICAgICAgICBIb3dldmVyLCB3ZSBkbyB3YW50IFNhZmFyaSwgd2hp Y2ggdXNlcyBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5hYmxlZCBTUEksIHRvIHNpbGVudGx5 IGZhaWwgc3VicmVzb3VyY2UgbG9hZHMgdGhhdCB1c2UgVExTIDEuMCBvciAxLjEuCisgICAgICAg IFRoaXMgbWF0Y2hlcyB0aGUgY3VycmVudCBiZWhhdmlvciBvZiBDaHJvbWUgYW5kIEZpcmVmb3gs IHdoaWNoIHdhcyBub3QgaW1wbGVtZW50ZWQgaW4gdGhvc2Ugb3RoZXIgYnJvd3NlcnMgd2hlbiB3 ZSBkZWNpZGVkIHRvIGFzayBhYm91dCBzdWJyZXNvdXJjZXMuCisKKyAgICAgICAgQ292ZXJlZCBi eSBhbiBBUEkgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtE YXRhVGFza0NvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29hOjpk aWRSZWNlaXZlQ2hhbGxlbmdlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNvY29h Ojpjb250aW51ZURpZFJlY2VpdmVDaGFsbGVuZ2UpOgorCiAyMDIwLTA4LTExICBKZXIgTm9ibGUg IDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIEFkZCBFeHBlcmltZW50YWwg RmVhdHVyZSBwcmVmZXJlbmNlIGZvciBTVyBWUDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EuaCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EuaAppbmRleCBmMDEz MzQ4MTRkM2RkMDhkZjUxMGE4ODJmMzQxZjY1NjJjNTg3NGJhLi4yNmVkMmZiODE4Y2Q0Mzc1ZjIw OTUwNWRlOWE0YjJiZDZlYWNhMjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5oCkBAIC01Niw3ICs1Niw3 IEBAIHB1YmxpYzoKICAgICB1c2luZyBUYXNrSWRlbnRpZmllciA9IHVpbnQ2NF90OwogCiAgICAg dm9pZCBkaWRTZW5kRGF0YSh1aW50NjRfdCB0b3RhbEJ5dGVzU2VudCwgdWludDY0X3QgdG90YWxC eXRlc0V4cGVjdGVkVG9TZW5kKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVDaGFsbGVuZ2UoV2ViQ29y ZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmJiwgTmVnb3RpYXRlZExlZ2FjeVRMUywgQ2hhbGxl bmdlQ29tcGxldGlvbkhhbmRsZXImJik7CisgICAgdm9pZCBkaWRSZWNlaXZlQ2hhbGxlbmdlKFdl YkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiYsIE5lZ290aWF0ZWRMZWdhY3lUTFMsIGJv b2wgZmFzdFNlcnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQsIENoYWxsZW5nZUNvbXBsZXRpb25I YW5kbGVyJiYpOwogICAgIHZvaWQgZGlkTmVnb3RpYXRlTW9kZXJuVExTKGNvbnN0IFdlYkNvcmU6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAgICAgdm9pZCBkaWRDb21wbGV0ZVdpdGhFcnJv cihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgV2ViQ29yZTo6TmV0d29ya0xv YWRNZXRyaWNzJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYmLCBOZWdvdGlhdGVkTGVnYWN5VExTLCBSZXNwb25zZUNvbXBsZXRpb25IYW5k bGVyJiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrRGF0YVRhc2tDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KaW5kZXggODRlNWQ0MGNhMjQzYWQ5MDZmNjM2NjE2 Njg0MGVjZGRjNTk4ODgzZC4uZGViNDkxNTRmYmZlMjZiNDEwMDZmYWFlYzhhNjQ3NTJhMGIzMzFi ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr RGF0YVRhc2tDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tCkBAIC0zODcsMTAgKzM4NywxNSBAQCB2b2lkIE5ldHdv cmtEYXRhVGFza0NvY29hOjpkaWRTZW5kRGF0YSh1aW50NjRfdCB0b3RhbEJ5dGVzU2VudCwgdWlu dDY0X3QgdG90YWxCeQogICAgICAgICBtX2NsaWVudC0+ZGlkU2VuZERhdGEodG90YWxCeXRlc1Nl bnQsIHRvdGFsQnl0ZXNFeHBlY3RlZFRvU2VuZCk7CiB9CiAKLXZvaWQgTmV0d29ya0RhdGFUYXNr Q29jb2E6OmRpZFJlY2VpdmVDaGFsbGVuZ2UoV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2UmJiBjaGFsbGVuZ2UsIE5lZ290aWF0ZWRMZWdhY3lUTFMgbmVnb3RpYXRlZExlZ2FjeVRMUywg Q2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgTmV0 d29ya0RhdGFUYXNrQ29jb2E6OmRpZFJlY2VpdmVDaGFsbGVuZ2UoV2ViQ29yZTo6QXV0aGVudGlj YXRpb25DaGFsbGVuZ2UmJiBjaGFsbGVuZ2UsIE5lZ290aWF0ZWRMZWdhY3lUTFMgbmVnb3RpYXRl ZExlZ2FjeVRMUywgYm9vbCBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5hYmxlZCwgQ2hhbGxl bmdlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBXVEZFbWl0 U2lnbnBvc3QobV90YXNrLmdldCgpLCAiRGF0YVRhc2siLCAicmVjZWl2ZWQgY2hhbGxlbmdlIik7 CiAKKyAgICBpZiAobmVnb3RpYXRlZExlZ2FjeVRMUyA9PSBOZWdvdGlhdGVkTGVnYWN5VExTOjpZ ZXMKKyAgICAgICAgJiYgZmFzdFNlcnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQKKyAgICAgICAg JiYgIWlzVG9wTGV2ZWxOYXZpZ2F0aW9uKCkpCisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFu ZGxlcihBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uOjpDYW5jZWwsIHsgfSk7CisK ICAgICBpZiAodHJ5UGFzc3dvcmRCYXNlZEF1dGhlbnRpY2F0aW9uKGNoYWxsZW5nZSwgY29tcGxl dGlvbkhhbmRsZXIpKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA3 ZTUyYzkwYWFmODFmZWEzMThkZjNlNWQ1MDhjYzEzMjkyMDhlNWExLi4yZWQyYmEwNzk2YWY5MzEy ZTdhOTMzYjNhZTUwYTU5OTU0MDMxZjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC0xNTQzLDcg KzE1NDMsNyBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmNvbnRpbnVlRGlkUmVjZWl2ZUNo YWxsZW5nZShTZXNzaW9uV3JhcHBlciYgc2Vzc2lvbldyYQogI2VuZGlmCiAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKGRpc3Bvc2l0aW9uLCBjcmVkZW50aWFsKTsKICAgICB9OwotICAgIG5ldHdv cmtEYXRhVGFzay0+ZGlkUmVjZWl2ZUNoYWxsZW5nZShXVEZNb3ZlKGF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlKSwgbmVnb3RpYXRlZExlZ2FjeVRMUywgV1RGTW92ZShjaGFsbGVuZ2VDb21wbGV0aW9u SGFuZGxlcikpOworICAgIG5ldHdvcmtEYXRhVGFzay0+ZGlkUmVjZWl2ZUNoYWxsZW5nZShXVEZN b3ZlKGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSwgbmVnb3RpYXRlZExlZ2FjeVRMUywgZmFzdFNl cnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQoKSwgV1RGTW92ZShjaGFsbGVuZ2VDb21wbGV0aW9u SGFuZGxlcikpOwogfQogCiBETUZXZWJzaXRlUG9saWN5TW9uaXRvciAqTmV0d29ya1Nlc3Npb25D b2NvYTo6ZGV2aWNlTWFuYWdlbWVudFBvbGljeU1vbml0b3IoKQpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlkZTFhNWYxMzM1MmFkNDAyMjYyMjYw ZmE1YjI3N2E0NTk4OTA1MjIuLmJmNTFhNjRkMWUwYmVlYTY3NmFmZTMwNTI4MWNkNmQ3OWNmN2Mw ODQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAyMC0wOC0xOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgorCisgICAgICAgIFdLV2ViVmlld3MgdXNpbmcgZmFzdFNlcnZlclRydXN0 RXZhbHVhdGlvbkVuYWJsZWQgc2hvdWxkIG9ubHkgYWxsb3cgbGVnYWN5IFRMUyBmb3IgbWFpbiBy ZXNvdXJjZSBsb2FkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE1NjI2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NzI2ODg5Mj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjpURVNUKToKKwogMjAyMC0wOC0xMSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CiAKICAgICAgICAgVXBkYXRlIGZpbHRlci1idWlsZC13ZWJraXQgZm9yIHVua25vd24vdW5o YW5kbGVkIG1lc3NhZ2VzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9UTFNEZXByZWNhdGlvbi5tbQppbmRleCA2NzdmMDBhMzA1NzAzZTI0OTZhYmRl NjRjM2FmYzJjZDI3N2FkMTY3Li4wODAyOTNkN2RlZTNhZTE0NmQzZTE1NzQ1Yzg4MzRiZDZmOGQy MWVlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RM U0RlcHJlY2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvVExTRGVwcmVjYXRpb24ubW0KQEAgLTQzOSw2ICs0MzksNDMgQEAgVEVTVChUTFNWZXJzaW9u LCBCYWNrRm9yd2FyZEhhc09ubHlTZWN1cmVDb250ZW50KQogICAgIEVYUEVDVF9GQUxTRShbd2Vi VmlldyBoYXNPbmx5U2VjdXJlQ29udGVudF0pOwogfQogCitURVNUKFRMU1ZlcnNpb24sIExlZ2Fj eVN1YnJlc291cmNlcykKK3sKKyAgICBIVFRQU2VydmVyIGxlZ2FjeVNlcnZlcih7CisgICAgICAg IHsgIi9mcmFtZSIsIHsgInNob3VsZG4ndCBsb2FkIHdpdGggZmFzdFNlcnZlclRydXN0RXZhbHVh dGlvbkVuYWJsZWQiIH19CisgICAgfSwgSFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzV2l0aExl Z2FjeVRMUyk7CisKKyAgICBIVFRQU2VydmVyIG1vZGVyblNlcnZlcih7CisgICAgICAgIHsgIi8i LCB7IG1ha2VTdHJpbmcoIjxpZnJhbWUgc3JjPSdodHRwczovLzEyNy4wLjAuMToiLCBsZWdhY3lT ZXJ2ZXIucG9ydCgpLCAiL2ZyYW1lJy8+IikgfX0KKyAgICB9LCBIVFRQU2VydmVyOjpQcm90b2Nv bDo6SHR0cHMpOworCisgICAgYXV0byBkYXRhU3RvcmVDb25maWd1cmF0aW9uID0gW1tbX1dLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXROb25QZXJzaXN0ZW50Q29uZmln dXJhdGlvbl0gYXV0b3JlbGVhc2VdOworICAgIGRhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZmFzdFNl cnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQgPSBZRVM7CisgICAgYXV0byB3ZWJWaWV3Q29uZmln dXJhdGlvbiA9IFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBuZXddIGF1dG9yZWxlYXNlXTsKKyAg ICB3ZWJWaWV3Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlID0gW1tbV0tXZWJzaXRlRGF0 YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOmRhdGFTdG9yZUNvbmZpZ3VyYXRp b25dIGF1dG9yZWxlYXNlXTsKKyAgICBhdXRvIHdlYlZpZXcgPSBbW1tXS1dlYlZpZXcgYWxsb2Nd IGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3 ZWJWaWV3Q29uZmlndXJhdGlvbl0gYXV0b3JlbGVhc2VdOworCisgICAgYXV0byBkZWxlZ2F0ZSA9 IFtbVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXddIGF1dG9yZWxlYXNlXTsKKyAgICBbZGVsZWdh dGUgc2V0RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl4oV0tXZWJWaWV3ICosIE5T VVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKmNoYWxsZW5nZSwgdm9pZCAoXmNhbGxiYWNrKShO U1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24sIE5TVVJMQ3JlZGVudGlhbCAqKSkg eworICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5hdXRo ZW50aWNhdGlvbk1ldGhvZCwgTlNVUkxBdXRoZW50aWNhdGlvbk1ldGhvZFNlcnZlclRydXN0KTsK KyAgICAgICAgY2FsbGJhY2soTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZVVzZUNyZWRlbnRpYWws IFtOU1VSTENyZWRlbnRpYWwgY3JlZGVudGlhbEZvclRydXN0OmNoYWxsZW5nZS5wcm90ZWN0aW9u U3BhY2Uuc2VydmVyVHJ1c3RdKTsKKyAgICB9XTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9u RGVsZWdhdGU6ZGVsZWdhdGVdOworCisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6bW9kZXJuU2Vy dmVyLnJlcXVlc3QoKV07CisgICAgW2RlbGVnYXRlIHdhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9u XTsKKworICAgIEVYUEVDVF9FUShsZWdhY3lTZXJ2ZXIudG90YWxSZXF1ZXN0cygpLCAwdSk7Cisg ICAgRVhQRUNUX0VRKG1vZGVyblNlcnZlci50b3RhbFJlcXVlc3RzKCksIDF1KTsKKyAgICAKKyAg ICBhdXRvIGRlZmF1bHRXZWJWaWV3ID0gW1tXS1dlYlZpZXcgbmV3XSBhdXRvcmVsZWFzZV07Cisg ICAgW2RlZmF1bHRXZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZV07CisgICAg W2RlZmF1bHRXZWJWaWV3IGxvYWRSZXF1ZXN0Om1vZGVyblNlcnZlci5yZXF1ZXN0KCldOworICAg IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CisgICAgRVhQRUNUX0VRKGxl Z2FjeVNlcnZlci50b3RhbFJlcXVlc3RzKCksIDF1KTsKKyAgICBFWFBFQ1RfRVEobW9kZXJuU2Vy dmVyLnRvdGFsUmVxdWVzdHMoKSwgMnUpOworfQorCiAjZW5kaWYgLy8gSEFWRShORVRXT1JLX0ZS QU1FV09SSykgJiYgSEFWRShUTFNfUFJPVE9DT0xfVkVSU0lPTl9UKQogCiB9Cg== 406813 2020-08-18 14:50:58 -0700 2020-08-18 15:18:26 -0700 Patch bug-215626-20200818145057.patch text/plain 5669 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxZGU2MTI2ZjljNTI2MDQx ZmVlMzMzMjgzNTJkY2E0ZDU1MjliMzcuLmZhYzdmNWZkZmE5NTc4OTJlMTljNDA1Yjc2NGZhYjUx ZTYxNGZkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDgtMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXS1dlYlZpZXdz IHVzaW5nIGZhc3RTZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkIHNob3VsZCBvbmx5IGFsbG93 IGxlZ2FjeSBUTFMgZm9yIG1haW4gcmVzb3VyY2UgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTYyNgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNjcyNjg4OTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAg ICAgV2UgaGF2ZSBpbnRyb2R1Y2VkIHB1YmxpYyBBUEkgd2ViVmlldzphdXRoZW50aWNhdGlvbkNo YWxsZW5nZTpzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6IGluIFdLTmF2aWdhdGlvbkRlbGVnYXRl IHRvIGFsbG93CisgICAgICAgIGFwcGxpY2F0aW9ucyB0byBjaG9vc2Ugd2hldGhlciB0byBhbGxv dyBUTFMgMS4wIG9yIDEuMSBjb25uZWN0aW9ucy4gIFdlIGRvbid0IHdhbnQgdG8gYnJlYWsgdGhp cyBBUEkgb3IgYnJlYWsgZXhpc3RpbmcgdGhpcmQgcGFydHkKKyAgICAgICAgYXBwcyB0aGF0IGxv YWQgcGFnZXMgdGhhdCBsb2FkIHRoaXJkIHBhcnR5IHN1YnJlc291cmNlcyB0aGF0IHVzZSBUTFMg MS4wIG9yIDEuMS4KKworICAgICAgICBIb3dldmVyLCB3ZSBkbyB3YW50IFNhZmFyaSwgd2hpY2gg dXNlcyBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5hYmxlZCBTUEksIHRvIHNpbGVudGx5IGZh aWwgc3VicmVzb3VyY2UgbG9hZHMgdGhhdCB1c2UgVExTIDEuMCBvciAxLjEuCisgICAgICAgIFRo aXMgbWF0Y2hlcyB0aGUgY3VycmVudCBiZWhhdmlvciBvZiBDaHJvbWUgYW5kIEZpcmVmb3gsIHdo aWNoIHdhcyBub3QgaW1wbGVtZW50ZWQgaW4gdGhvc2Ugb3RoZXIgYnJvd3NlcnMgd2hlbiB3ZSBk ZWNpZGVkIHRvIGFzayBhYm91dCBzdWJyZXNvdXJjZXMuCisKKyAgICAgICAgQ292ZXJlZCBieSBh biBBUEkgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ29jb2E6OmNvbnRp bnVlRGlkUmVjZWl2ZUNoYWxsZW5nZSk6CisKIDIwMjAtMDgtMTEgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gQWRkIEV4cGVyaW1lbnRhbCBGZWF0dXJl IHByZWZlcmVuY2UgZm9yIFNXIFZQOQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IDdlNTJjOTBhYWY4 MWZlYTMxOGRmM2U1ZDUwOGNjMTMyOTIwOGU1YTEuLmYwYjcxNDE5MjE5ZjBhNzAxNzk2NzdmYmRl NTU4ZGFhMTFlNDJjODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTE1NDMsNiArMTU0MywxMiBA QCB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmNvbnRpbnVlRGlkUmVjZWl2ZUNoYWxsZW5nZShT ZXNzaW9uV3JhcHBlciYgc2Vzc2lvbldyYQogI2VuZGlmCiAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKGRpc3Bvc2l0aW9uLCBjcmVkZW50aWFsKTsKICAgICB9OworCisgICAgaWYgKG5lZ290aWF0 ZWRMZWdhY3lUTFMgPT0gTmVnb3RpYXRlZExlZ2FjeVRMUzo6WWVzCisgICAgICAgICYmIGZhc3RT ZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkKCkKKyAgICAgICAgJiYgIW5ldHdvcmtEYXRhVGFz ay0+aXNUb3BMZXZlbE5hdmlnYXRpb24oKSkKKyAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5k bGVyKEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb246OkNhbmNlbCwgeyB9KTsKKwog ICAgIG5ldHdvcmtEYXRhVGFzay0+ZGlkUmVjZWl2ZUNoYWxsZW5nZShXVEZNb3ZlKGF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlKSwgbmVnb3RpYXRlZExlZ2FjeVRMUywgV1RGTW92ZShjaGFsbGVuZ2VD b21wbGV0aW9uSGFuZGxlcikpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggOWRlMWE1ZjEzMzUyYWQ0MDIyNjIyNjBmYTViMjc3YTQ1OTg5 MDUyMi4uYTcwZWNjNDI0NTRhYzI4ZThkYzM2MDlhM2RlZGM4YjQ1MmNjNmFiNCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIwLTA4LTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgV0tXZWJWaWV3cyB1c2luZyBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5h YmxlZCBzaG91bGQgb25seSBhbGxvdyBsZWdhY3kgVExTIGZvciBtYWluIHJlc291cmNlIGxvYWRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU2MjYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY3MjY4ODkyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9UTFNEZXByZWNhdGlvbi5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAy MDIwLTA4LTExICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBV cGRhdGUgZmlsdGVyLWJ1aWxkLXdlYmtpdCBmb3IgdW5rbm93bi91bmhhbmRsZWQgbWVzc2FnZXMK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVw cmVjYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RMU0Rl cHJlY2F0aW9uLm1tCmluZGV4IDY3N2YwMGEzMDU3MDNlMjQ5NmFiZGU2NGMzYWZjMmNkMjc3YWQx NjcuLjIyNDRiNzc1YzAxYzUyYmFhNTE4ZGQ3NTg0Y2RjZjYyZDM0MzExZmYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNhdGlv bi5tbQpAQCAtNDM5LDYgKzQzOSw0MyBAQCBURVNUKFRMU1ZlcnNpb24sIEJhY2tGb3J3YXJkSGFz T25seVNlY3VyZUNvbnRlbnQpCiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc09ubHlTZWN1 cmVDb250ZW50XSk7CiB9CiAKK1RFU1QoVExTVmVyc2lvbiwgTGVnYWN5U3VicmVzb3VyY2VzKQor eworICAgIEhUVFBTZXJ2ZXIgbGVnYWN5U2VydmVyKHsKKyAgICAgICAgeyAiL2ZyYW1lIiwgeyAi c2hvdWxkbid0IGxvYWQgd2l0aCBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5hYmxlZCIgfX0K KyAgICB9LCBIVFRQU2VydmVyOjpQcm90b2NvbDo6SHR0cHNXaXRoTGVnYWN5VExTKTsKKworICAg IEhUVFBTZXJ2ZXIgbW9kZXJuU2VydmVyKHsKKyAgICAgICAgeyAiLyIsIHsgbWFrZVN0cmluZygi PGlmcmFtZSBzcmM9J2h0dHBzOi8vMTI3LjAuMC4xOiIsIGxlZ2FjeVNlcnZlci5wb3J0KCksICIv ZnJhbWUnLz4iKSB9fQorICAgIH0sIEhUVFBTZXJ2ZXI6OlByb3RvY29sOjpIdHRwcyk7CisKKyAg ICBhdXRvIGRhdGFTdG9yZUNvbmZpZ3VyYXRpb24gPSBbW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbiBhbGxvY10gaW5pdE5vblBlcnNpc3RlbnRDb25maWd1cmF0aW9uXSBhdXRvcmVs ZWFzZV07CisgICAgZGF0YVN0b3JlQ29uZmlndXJhdGlvbi5mYXN0U2VydmVyVHJ1c3RFdmFsdWF0 aW9uRW5hYmxlZCA9IFlFUzsKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIG5ld10gYXV0b3JlbGVhc2VdOworICAgIHdlYlZpZXdDb25maWd1 cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUgPSBbW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9p bml0V2l0aENvbmZpZ3VyYXRpb246ZGF0YVN0b3JlQ29uZmlndXJhdGlvbl0gYXV0b3JlbGVhc2Vd OworICAgIGF1dG8gd2ViVmlldyA9IFtbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0 aW9uXSBhdXRvcmVsZWFzZV07CisKKyAgICBhdXRvIGRlbGVnYXRlID0gW1tUZXN0TmF2aWdhdGlv bkRlbGVnYXRlIG5ld10gYXV0b3JlbGVhc2VdOworICAgIFtkZWxlZ2F0ZSBzZXREaWRSZWNlaXZl QXV0aGVudGljYXRpb25DaGFsbGVuZ2U6XihXS1dlYlZpZXcgKiwgTlNVUkxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSAqY2hhbGxlbmdlLCB2b2lkICheY2FsbGJhY2spKE5TVVJMU2Vzc2lvbkF1dGhD aGFsbGVuZ2VEaXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFsICopKSB7CisgICAgICAgIEVYUEVD VF9XS19TVFJFUShjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlLmF1dGhlbnRpY2F0aW9uTWV0aG9k LCBOU1VSTEF1dGhlbnRpY2F0aW9uTWV0aG9kU2VydmVyVHJ1c3QpOworICAgICAgICBjYWxsYmFj ayhOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlVXNlQ3JlZGVudGlhbCwgW05TVVJMQ3JlZGVudGlh bCBjcmVkZW50aWFsRm9yVHJ1c3Q6Y2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZS5zZXJ2ZXJUcnVz dF0pOworICAgIH1dOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0 ZV07CisKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDptb2Rlcm5TZXJ2ZXIucmVxdWVzdCgpXTsK KyAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOworCisgICAgRVhQRUNU X0VRKGxlZ2FjeVNlcnZlci50b3RhbFJlcXVlc3RzKCksIDB1KTsKKyAgICBFWFBFQ1RfRVEobW9k ZXJuU2VydmVyLnRvdGFsUmVxdWVzdHMoKSwgMXUpOworCisgICAgYXV0byBkZWZhdWx0V2ViVmll dyA9IFtbV0tXZWJWaWV3IG5ld10gYXV0b3JlbGVhc2VdOworICAgIFtkZWZhdWx0V2ViVmlldyBz ZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGVdOworICAgIFtkZWZhdWx0V2ViVmlldyBsb2Fk UmVxdWVzdDptb2Rlcm5TZXJ2ZXIucmVxdWVzdCgpXTsKKyAgICBbZGVsZWdhdGUgd2FpdEZvckRp ZEZpbmlzaE5hdmlnYXRpb25dOworICAgIEVYUEVDVF9FUShsZWdhY3lTZXJ2ZXIudG90YWxSZXF1 ZXN0cygpLCAxdSk7CisgICAgRVhQRUNUX0VRKG1vZGVyblNlcnZlci50b3RhbFJlcXVlc3RzKCks IDJ1KTsKK30KKwogI2VuZGlmIC8vIEhBVkUoTkVUV09SS19GUkFNRVdPUkspICYmIEhBVkUoVExT X1BST1RPQ09MX1ZFUlNJT05fVCkKIAogfQo=