223998 2021-03-31 08:19:03 -0700 Send WebSocket cocoa authentication challenge to AuthenticationManager 2021-03-31 10:22:03 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen webkit-bug-importer oldest_to_newest 1745620 0 youennf 2021-03-31 08:19:03 -0700 Send WebSocket cocoa authentication challenge to AuthenticationManager 1745622 1 424771 youennf 2021-03-31 08:24:08 -0700 Created attachment 424771 Patch 1745634 2 webkit-bug-importer 2021-03-31 09:02:07 -0700 <rdar://problem/76055282> 1745681 3 ews-feeder 2021-03-31 10:22:02 -0700 Committed r275289: <https://commits.webkit.org/r275289> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424771. 424771 2021-03-31 08:24:08 -0700 2021-03-31 10:22:03 -0700 Patch bug-223998-20210331172407.patch text/plain 10783 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhZDhjMTlkOGMxMGNhNDQx NTNiMTljMTY1YWUxNDMwYjVhZjBjYTkuLjJmNWJkODc4MWQwOWIxYWEyMmNkN2QxNThhYmJkYzMz ODc0MjY1MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDMtMzEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlbmQgV2ViU29ja2V0IGNvY29h IGF1dGhlbnRpY2F0aW9uIGNoYWxsZW5nZSB0byBBdXRoZW50aWNhdGlvbk1hbmFnZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzk5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2Ugb2YgYXV0 aGVudGljYXRpb24gY2hhbGxlbmdlIHJlbGF0ZWQgdG8gV2ViU29ja2V0VGFzaywgc2VuZCBpdCB0 byB0aGUgQXV0aGVudGljYXRpb25NYW5hZ2VyIGZvciBldmFsdWF0aW9uLgorICAgICAgICBNaW5v ciByZWZhY3RvcmluZyB0byByZXVzZSB0aGUgc2FtZSBjb21wbGV0aW9uIGhhbmRsZXIgYXMgZm9y IG5ldHdvcmsgZGF0YSB0YXNrcy4KKyAgICAgICAgQ292ZXJlZCBieSBMYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3NpbXBsZS13c3MuaHRtbCB3aXRoIE5TVVJMU2Vz c2lvbldlYlNvY2tldCBjb2RlIHBhdGggZW5hYmxlZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtTZXNzaW9uQ29jb2E6OmFsbG93c1NwZWNpZmljSFRUUFNDZXJ0aWZpY2F0ZUZvckhvc3QpOgor ICAgICAgICAoV2ViS2l0OjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y29udGludWVEaWRSZWNlaXZlQ2hhbGxlbmdlKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y3JlYXRlV2ViU29ja2V0VGFzayk6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNvY2tldFRhc2s6OnBhZ2VJRCBjb25zdCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlNvY2tldFRhc2s6OnBhcnRpdGlvbiBjb25zdCk6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1tOgorCiAyMDIxLTAzLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UtYWZ0ZXItbW92ZSBp biBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6Y2hlY2tVc2VyTWVkaWFQ ZXJtaXNzaW9uRm9yU3BlZWNoUmVjb2duaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCAyNGE0 MmRmMzExOTAzZDhiNjYxYjI4ODRmMGUwNmE2MGM0MTFiZjc4Li44OThhN2QzY2Q2NWExNWRlNGI2 MzBkNzhiZTQ1MWUzZmZiMTQ0MGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC0xNTU3LDMzICsx NTU3LDExIEBAIGJvb2wgTmV0d29ya1Nlc3Npb25Db2NvYTo6YWxsb3dzU3BlY2lmaWNIVFRQU0Nl cnRpZmljYXRlRm9ySG9zdChjb25zdCBXZWJDb3JlOjpBCiAgICAgcmV0dXJuIFdlYkNvcmU6OmNl cnRpZmljYXRlc01hdGNoKHRydXN0LmdldCgpLCBjaGFsbGVuZ2UubnNVUkxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSgpLnByb3RlY3Rpb25TcGFjZS5zZXJ2ZXJUcnVzdCk7CiB9CiAKLXZvaWQgTmV0 d29ya1Nlc3Npb25Db2NvYTo6Y29udGludWVEaWRSZWNlaXZlQ2hhbGxlbmdlKFNlc3Npb25XcmFw cGVyJiBzZXNzaW9uV3JhcHBlciwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2UmIGNoYWxsZW5nZSwgTmVnb3RpYXRlZExlZ2FjeVRMUyBuZWdvdGlhdGVkTGVnYWN5VExTLCBO ZXR3b3JrRGF0YVRhc2tDb2NvYTo6VGFza0lkZW50aWZpZXIgdGFza0lkZW50aWZpZXIsIE5ldHdv cmtEYXRhVGFza0NvY29hKiBuZXR3b3JrRGF0YVRhc2ssIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo V2ViS2l0OjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3Jl OjpDcmVkZW50aWFsJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgaWYgKCFuZXR3b3Jr RGF0YVRhc2spIHsKLSNpZiBIQVZFKE5TVVJMU0VTU0lPTl9XRUJTT0NLRVQpCi0gICAgICAgIGlm IChhdXRvKiB3ZWJTb2NrZXRUYXNrID0gc2Vzc2lvbldyYXBwZXIud2ViU29ja2V0RGF0YVRhc2tN YXAuZ2V0KHRhc2tJZGVudGlmaWVyKSkgewotICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBj aGFsbGVuZ2VzIGZvciB3ZWIgc29ja2V0LgotICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo QXV0aGVudGljYXRpb25DaGFsbGVuZ2VEaXNwb3NpdGlvbjo6UGVyZm9ybURlZmF1bHRIYW5kbGlu ZywgeyB9KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotI2VuZGlmCi0gICAgICAg IGF1dG8gZG93bmxvYWRJRCA9IHNlc3Npb25XcmFwcGVyLmRvd25sb2FkTWFwLmdldCh0YXNrSWRl bnRpZmllcik7Ci0gICAgICAgIGlmIChkb3dubG9hZElEKSB7Ci0gICAgICAgICAgICBpZiAoYXV0 byogZG93bmxvYWQgPSBuZXR3b3JrUHJvY2VzcygpLmRvd25sb2FkTWFuYWdlcigpLmRvd25sb2Fk KGRvd25sb2FkSUQpKSB7Ci0gICAgICAgICAgICAgICAgV2ViQ29yZTo6QXV0aGVudGljYXRpb25D aGFsbGVuZ2UgYXV0aGVudGljYXRpb25DaGFsbGVuZ2UgeyBjaGFsbGVuZ2UgfTsKLSAgICAgICAg ICAgICAgICAvLyBSZWNlaXZlZCBhbiBhdXRoZW50aWNhdGlvbiBjaGFsbGVuZ2UgZm9yIGEgZG93 bmxvYWQgYmVpbmcgcmVzdW1lZC4KLSAgICAgICAgICAgICAgICBkb3dubG9hZC0+ZGlkUmVjZWl2 ZUNoYWxsZW5nZShhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwgV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcikpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAg fQotICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IGRpZFJlY2VpdmVDaGFsbGVuZ2Ug Y29tcGxldGlvbkhhbmRsZXIgKGNhbmNlbCkiLCB0YXNrSWRlbnRpZmllcik7Ci0gICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb246OkNhbmNl bCwgeyB9KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KIAotICAgIGF1dG8gc2Vzc2lvbklEID0g dGhpcy0+c2Vzc2lvbklEKCk7CitzdGF0aWMgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJLaXQ6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIGNvbnN0IFdl YkNvcmU6OkNyZWRlbnRpYWwmIGNyZWRlbnRpYWwpPiBjcmVhdGVDaGFsbGVuZ2VDb21wbGV0aW9u SGFuZGxlcihSZWY8TmV0d29ya1Byb2Nlc3M+JiYgbmV0d29ya1Byb2Nlc3MsIFBBTDo6U2Vzc2lv bklEIHNlc3Npb25JRCwgIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBj aGFsbGVuZ2UsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uLCB1aW50NjRfdCB0YXNrSWRlbnRpZmll ciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJLaXQ6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl RGlzcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkNyZWRlbnRpYWwmKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKKyB7CiAgICAgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UgYXV0aGVudGlj YXRpb25DaGFsbGVuZ2UgeyBjaGFsbGVuZ2UgfTsKLSAgICBhdXRvIGNoYWxsZW5nZUNvbXBsZXRp b25IYW5kbGVyID0gW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl ciksIG5ldHdvcmtQcm9jZXNzID0gbWFrZVJlZihuZXR3b3JrUHJvY2VzcygpKSwgc2Vzc2lvbklE LCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwgdGFza0lkZW50aWZpZXIsIHBhcnRpdGlvbiA9IG5l dHdvcmtEYXRhVGFzay0+cGFydGl0aW9uKCldKFdlYktpdDo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6Q3JlZGVudGlhbCYgY3Jl ZGVudGlhbCkgbXV0YWJsZSB7CisgICAgcmV0dXJuIFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpLCBuZXR3b3JrUHJvY2VzcyA9IFdURk1vdmUobmV0d29ya1By b2Nlc3MpLCBzZXNzaW9uSUQsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLCB0YXNrSWRlbnRpZmll ciwgcGFydGl0aW9uXShXZWJLaXQ6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb24g ZGlzcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkNyZWRlbnRpYWwmIGNyZWRlbnRpYWwpIG11dGFi bGUgewogI2lmICFMT0dfRElTQUJMRUQKICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxs dSBkaWRSZWNlaXZlQ2hhbGxlbmdlIGNvbXBsZXRpb25IYW5kbGVyICVkIiwgdGFza0lkZW50aWZp ZXIsIGRpc3Bvc2l0aW9uKTsKICNlbHNlCkBAIC0xNjA5LDEzICsxNTg3LDQwIEBAIHZvaWQgTmV0 d29ya1Nlc3Npb25Db2NvYTo6Y29udGludWVEaWRSZWNlaXZlQ2hhbGxlbmdlKFNlc3Npb25XcmFw cGVyJiBzZXNzaW9uV3JhCiAjZW5kaWYKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoZGlzcG9z aXRpb24sIGNyZWRlbnRpYWwpOwogICAgIH07Cit9CisKK3ZvaWQgTmV0d29ya1Nlc3Npb25Db2Nv YTo6Y29udGludWVEaWRSZWNlaXZlQ2hhbGxlbmdlKFNlc3Npb25XcmFwcGVyJiBzZXNzaW9uV3Jh cHBlciwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSwg TmVnb3RpYXRlZExlZ2FjeVRMUyBuZWdvdGlhdGVkTGVnYWN5VExTLCBOZXR3b3JrRGF0YVRhc2tD b2NvYTo6VGFza0lkZW50aWZpZXIgdGFza0lkZW50aWZpZXIsIE5ldHdvcmtEYXRhVGFza0NvY29h KiBuZXR3b3JrRGF0YVRhc2ssIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViS2l0OjpBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFsJik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAgaWYgKCFuZXR3b3JrRGF0YVRhc2spIHsKKyNp ZiBIQVZFKE5TVVJMU0VTU0lPTl9XRUJTT0NLRVQpCisgICAgICAgIGlmIChhdXRvKiB3ZWJTb2Nr ZXRUYXNrID0gc2Vzc2lvbldyYXBwZXIud2ViU29ja2V0RGF0YVRhc2tNYXAuZ2V0KHRhc2tJZGVu dGlmaWVyKSkgeworICAgICAgICAgICAgYXV0byBjaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9 IGNyZWF0ZUNoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyKG5ldHdvcmtQcm9jZXNzKCksIHNlc3Np b25JRCgpLCBjaGFsbGVuZ2UsIHdlYlNvY2tldFRhc2stPnBhcnRpdGlvbigpLCAwLCBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgICAgICBuZXR3b3JrUHJvY2VzcygpLmF1dGhl bnRpY2F0aW9uTWFuYWdlcigpLmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShzZXNz aW9uSUQoKSwgd2ViU29ja2V0VGFzay0+cGFnZUlEKCksIG51bGxwdHIsIGNoYWxsZW5nZSwgbmVn b3RpYXRlZExlZ2FjeVRMUywgV1RGTW92ZShjaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlcikpOwor CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyNlbmRpZgorICAgICAgICBhdXRvIGRv d25sb2FkSUQgPSBzZXNzaW9uV3JhcHBlci5kb3dubG9hZE1hcC5nZXQodGFza0lkZW50aWZpZXIp OworICAgICAgICBpZiAoZG93bmxvYWRJRCkgeworICAgICAgICAgICAgaWYgKGF1dG8qIGRvd25s b2FkID0gbmV0d29ya1Byb2Nlc3MoKS5kb3dubG9hZE1hbmFnZXIoKS5kb3dubG9hZChkb3dubG9h ZElEKSkgeworICAgICAgICAgICAgICAgIFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl IGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIHsgY2hhbGxlbmdlIH07CisgICAgICAgICAgICAgICAg Ly8gUmVjZWl2ZWQgYW4gYXV0aGVudGljYXRpb24gY2hhbGxlbmdlIGZvciBhIGRvd25sb2FkIGJl aW5nIHJlc3VtZWQuCisgICAgICAgICAgICAgICAgZG93bmxvYWQtPmRpZFJlY2VpdmVDaGFsbGVu Z2UoYXV0aGVudGljYXRpb25DaGFsbGVuZ2UsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsK KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAg ICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSBkaWRSZWNlaXZlQ2hhbGxlbmdlIGNvbXBsZXRp b25IYW5kbGVyIChjYW5jZWwpIiwgdGFza0lkZW50aWZpZXIpOworICAgICAgICBjb21wbGV0aW9u SGFuZGxlcihBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uOjpDYW5jZWwsIHsgfSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKKyAgICBhdXRvIGNoYWxsZW5nZUNvbXBsZXRpb25I YW5kbGVyID0gY3JlYXRlQ2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXIobmV0d29ya1Byb2Nlc3Mo KSwgc2Vzc2lvbklEKCksIGNoYWxsZW5nZSwgbmV0d29ya0RhdGFUYXNrLT5wYXJ0aXRpb24oKSwg dGFza0lkZW50aWZpZXIsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICBpZiAobmVn b3RpYXRlZExlZ2FjeVRMUyA9PSBOZWdvdGlhdGVkTGVnYWN5VExTOjpZZXMKICAgICAgICAgJiYg ZmFzdFNlcnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQoKQogICAgICAgICAmJiAhbmV0d29ya0Rh dGFUYXNrLT5pc1RvcExldmVsTmF2aWdhdGlvbigpKQogICAgICAgICByZXR1cm4gY2hhbGxlbmdl Q29tcGxldGlvbkhhbmRsZXIoQXV0aGVudGljYXRpb25DaGFsbGVuZ2VEaXNwb3NpdGlvbjo6Q2Fu Y2VsLCB7IH0pOwogCi0gICAgbmV0d29ya0RhdGFUYXNrLT5kaWRSZWNlaXZlQ2hhbGxlbmdlKFdU Rk1vdmUoYXV0aGVudGljYXRpb25DaGFsbGVuZ2UpLCBuZWdvdGlhdGVkTGVnYWN5VExTLCBXVEZN b3ZlKGNoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgbmV0d29ya0RhdGFUYXNrLT5k aWRSZWNlaXZlQ2hhbGxlbmdlKFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIHsgY2hh bGxlbmdlIH0sIG5lZ290aWF0ZWRMZWdhY3lUTFMsIFdURk1vdmUoY2hhbGxlbmdlQ29tcGxldGlv bkhhbmRsZXIpKTsKIH0KIAogRE1GV2Vic2l0ZVBvbGljeU1vbml0b3IgKk5ldHdvcmtTZXNzaW9u Q29jb2E6OmRldmljZU1hbmFnZW1lbnRQb2xpY3lNb25pdG9yKCkKQEAgLTE2NDUsNyArMTY1MCw3 IEBAIHN0ZDo6dW5pcXVlX3B0cjxXZWJTb2NrZXRUYXNrPiBOZXR3b3JrU2Vzc2lvbkNvY29hOjpj cmVhdGVXZWJTb2NrZXRUYXNrKFdlYlBhZ2VQCiAgICAgW25zUmVxdWVzdCBfc2V0UHJvcGVydHk6 QE5PIGZvcktleTooTlNTdHJpbmcgKilfa0NGVVJMQ29ubmVjdGlvblByb3BlcnR5U2hvdWxkU25p ZmZdOwogCiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+IHRhc2sgPSBb c2Vzc2lvblNldEZvclBhZ2Uod2ViUGFnZVByb3h5SUQpLnNlc3Npb25XaXRoQ3JlZGVudGlhbFN0 b3JhZ2Uuc2Vzc2lvbiB3ZWJTb2NrZXRUYXNrV2l0aFJlcXVlc3Q6bnNSZXF1ZXN0LmdldCgpXTsK LSAgICByZXR1cm4gbWFrZVVuaXF1ZTxXZWJTb2NrZXRUYXNrPihjaGFubmVsLCBXVEZNb3ZlKHRh c2spKTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxXZWJTb2NrZXRUYXNrPihjaGFubmVsLCB3ZWJQ YWdlUHJveHlJRCwgcmVxdWVzdCwgV1RGTW92ZSh0YXNrKSk7CiB9CiAKIHZvaWQgTmV0d29ya1Nl c3Npb25Db2NvYTo6YWRkV2ViU29ja2V0VGFzayhXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdlYlBh Z2VQcm94eUlELCBXZWJTb2NrZXRUYXNrJiB0YXNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EuaCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLmgKaW5kZXggZTY4MjZl NDdlODM5NTk0MDI4YWY4ZjRhZWQyMzkyYjRiMDVkMmY1YS4uMzk1MzU3MDM1MDJkNWE1NGIzZjVh OWFlMjRjM2ZlMzIwMjgwOGE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NvY29hL1dlYlNvY2tldFRhc2tDb2NvYS5oCkBAIC0yOCwxMSArMjgsMTYgQEAK ICNpZiBIQVZFKE5TVVJMU0VTU0lPTl9XRUJTT0NLRVQpCiAKICNpbmNsdWRlICJEYXRhUmVmZXJl bmNlLmgiCisjaW5jbHVkZSAiV2ViUGFnZVByb3h5SWRlbnRpZmllci5oIgogI2luY2x1ZGUgPHd0 Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBPQkpDX0NMQVNTIE5T VVJMU2Vzc2lvbldlYlNvY2tldFRhc2s7CiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIFJl c291cmNlUmVxdWVzdDsKK30KKwogbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrU2Vz c2lvbjsKIGNsYXNzIE5ldHdvcmtTZXNzaW9uQ29jb2E7CkBAIC00MSw3ICs0Niw3IEBAIGNsYXNz IE5ldHdvcmtTb2NrZXRDaGFubmVsOwogY2xhc3MgV2ViU29ja2V0VGFzayA6IHB1YmxpYyBDYW5N YWtlV2Vha1B0cjxXZWJTb2NrZXRUYXNrPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7 CiBwdWJsaWM6Ci0gICAgV2ViU29ja2V0VGFzayhOZXR3b3JrU29ja2V0Q2hhbm5lbCYsIFJldGFp blB0cjxOU1VSTFNlc3Npb25XZWJTb2NrZXRUYXNrPiYmKTsKKyAgICBXZWJTb2NrZXRUYXNrKE5l dHdvcmtTb2NrZXRDaGFubmVsJiwgV2ViUGFnZVByb3h5SWRlbnRpZmllciwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+ JiYpOwogICAgIH5XZWJTb2NrZXRUYXNrKCk7CiAKICAgICB2b2lkIHNlbmRTdHJpbmcoY29uc3Qg SVBDOjpEYXRhUmVmZXJlbmNlJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKQEAgLTU5 LDYgKzY0LDkgQEAgcHVibGljOgogCiAgICAgTmV0d29ya1Nlc3Npb25Db2NvYSogbmV0d29ya1Nl c3Npb24oKTsKIAorICAgIFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlEKCkgY29uc3QgeyBy ZXR1cm4gbV9wYWdlSUQ7IH0KKyAgICBTdHJpbmcgcGFydGl0aW9uKCkgY29uc3QgeyByZXR1cm4g bV9wYXJ0aXRpb247IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIHJlYWROZXh0TWVzc2FnZSgpOwog CkBAIC02Niw2ICs3NCw4IEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldl YlNvY2tldFRhc2s+IG1fdGFzazsKICAgICBib29sIG1fcmVjZWl2ZWREaWRDbG9zZSB7IGZhbHNl IH07CiAgICAgYm9vbCBtX3JlY2VpdmVkRGlkQ29ubmVjdCB7IGZhbHNlIH07CisgICAgV2ViUGFn ZVByb3h5SWRlbnRpZmllciBtX3BhZ2VJRDsKKyAgICBTdHJpbmcgbV9wYXJ0aXRpb247CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EubW0KaW5kZXggOTBiYzQwOWJmZmI3 MGEwZWU5ZTczNThiMzg2NzU5N2QyOWYyNGUwNi4uZGY1OTgyYjE2NDVmMTA1ODRlZDQ5ZmEwNmFk MzZhOTNiMDU0ZjQwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EubW0KQEAgLTQwLDkgKzQwLDExIEBAIG5hbWVz cGFjZSBXZWJLaXQgewogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotV2ViU29ja2V0VGFz azo6V2ViU29ja2V0VGFzayhOZXR3b3JrU29ja2V0Q2hhbm5lbCYgY2hhbm5lbCwgUmV0YWluUHRy PE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+JiYgdGFzaykKK1dlYlNvY2tldFRhc2s6OldlYlNv Y2tldFRhc2soTmV0d29ya1NvY2tldENoYW5uZWwmIGNoYW5uZWwsIFdlYlBhZ2VQcm94eUlkZW50 aWZpZXIgd2ViUGFnZVByb3h5SUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCwgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+JiYgdGFzaykKICAgICA6 IG1fY2hhbm5lbChjaGFubmVsKQogICAgICwgbV90YXNrKFdURk1vdmUodGFzaykpCisgICAgLCBt X3BhZ2VJRCh3ZWJQYWdlUHJveHlJRCkKKyAgICAsIG1fcGFydGl0aW9uKHJlcXVlc3QuY2FjaGVQ YXJ0aXRpb24oKSkKIHsKICAgICByZWFkTmV4dE1lc3NhZ2UoKTsKICAgICBtX2NoYW5uZWwuZGlk U2VuZEhhbmRzaGFrZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0IHsgW21fdGFzayBjdXJyZW50UmVx dWVzdF0gfSk7Cg==