232971 2021-11-10 16:43:09 -0800 [Curl] Security information sometimes do not appear in inspector network tab 2021-11-15 14:59:35 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 takashi.komori takashi.komori basuke chris.reid don.olmstead ews-watchlist fujii galpeter ross.kirsling stephan.szabo takashi.komori webkit-bug-importer oldest_to_newest 1813844 0 takashi.komori 2021-11-10 16:43:09 -0800 On Curl port, security information sometimes do not appear in inspector network tab. This is because CurlSSLVerifier could be empty when using HTTP/2 connection. In this ticket, we will fix this issue. 1813859 1 443882 takashi.komori 2021-11-10 17:30:40 -0800 Created attachment 443882 Patch 1813917 2 443882 fujii 2021-11-10 22:42:14 -0800 Comment on attachment 443882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443882&action=review > Source/WebCore/platform/network/curl/CurlContext.cpp:916 > + return m_sslVerifier->certificateInfo(); Do we still need this code path? If we can get the cert info from SSL*, why do we need to get the cert info from m_sslVerifier? 1814992 3 takashi.komori 2021-11-15 01:55:54 -0800 (In reply to Fujii Hironori from comment #2) > Comment on attachment 443882 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443882&action=review > > > Source/WebCore/platform/network/curl/CurlContext.cpp:916 > > + return m_sslVerifier->certificateInfo(); > > Do we still need this code path? If we can get the cert info from SSL*, why > do we need to get the cert info from m_sslVerifier? We can get SSL* by calling curl_easy_getinfo with CURLINFO_TLS_SSL_PTR, but it works only while the connection is not terminated. When curl connects a bad cert server, didCompleteTransfer is called and the connection terminates. Therefore, we can't remove the routine gets certificate information from CurlSSLVerifier. https://curl.se/libcurl/c/CURLINFO_TLS_SSL_PTR.html >If the internals pointer is NULL then either the SSL backend is not supported, an SSL session has not yet been established or the connection is no longer associated with the easy handle (eg curl_easy_perform has returned). 1815225 4 ews-feeder 2021-11-15 14:44:20 -0800 Committed r285838 (244270@main): <https://commits.webkit.org/244270@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443882. 1815240 5 webkit-bug-importer 2021-11-15 14:59:35 -0800 <rdar://problem/85430487> 443882 2021-11-10 17:30:40 -0800 2021-11-15 14:44:21 -0800 Patch bug-232971-20211111103037.patch text/plain 8502 takashi.komori U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzBhMzUxZGFkYjExYjAx MTNiMjgyMmIwZjc5MzAzNzVhMzYwMDFkOS4uMGUwODY4MzI3Mjk4MmEyOGY4YTdlYzg4Y2I1OWM4 OWJmOTNmZmMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTEwICBUYWth c2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNvbnkuY29tPgorCisgICAgICAgIFtDdXJsXSBT ZWN1cml0eSBpbmZvcm1hdGlvbiBzb21ldGltZXMgZG8gbm90IGFwcGVhciBpbiBpbnNwZWN0b3Ig bmV0d29yayB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMjk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEdldCBjZXJ0aWZpY2F0ZSBpbmZvcm1hdGlvbiBmcm9tIFNTTCBjb250ZXh0IHdoZW4gQ3Vy bFNTTFZlcmlmaWVyIGlzIGVtcHR5LgorCisgICAgICAgIE5vIHRlc3RzIHlldC4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DZXJ0aWZpY2F0ZUluZm8uaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxIYW5kbGU6OmFkZEV4dHJhTmV0d29ya0xv YWRNZXRyaWNzKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxIYW5kbGU6OmNlcnRpZmljYXRlSW5m byBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0Lmg6 CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL09wZW5TU0xIZWxwZXIuY3BwOgorICAg ICAgICAoT3BlblNTTDo6U3RhY2tPZlg1MDk6OlN0YWNrT2ZYNTA5KToKKyAgICAgICAgKE9wZW5T U0w6OlN0YWNrT2ZYNTA5Ojp+U3RhY2tPZlg1MDkpOgorICAgICAgICAoT3BlblNTTDo6cGVtRGF0 YUZyb21DdHgpOgorICAgICAgICAoT3BlblNTTDo6Y3JlYXRlQ2VydGlmaWNhdGVJbmZvKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvT3BlblNTTEhlbHBlci5oOgorCiAyMDIxLTEx LTA4ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5d IGNoYWxsZW5nZSBkb2VzIG5vdCBnZXQgcGFzc2VkIHRvIC1bX1dLV2ViQXV0aGVudGljYXRpb25Q YW5lbCBnZXRBc3NlcnRpb25XaXRoQ2hhbGxlbmdlOm9yaWdpbjpvcHRpb25zOmNvbXBsZXRpb25I YW5kbGVyOl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DZXJ0aWZpY2F0ZUluZm8uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DZXJ0aWZpY2F0ZUluZm8uaAppbmRleCBmMjY4ZTNiOTE1MThhYzFjM2ZkZjA1YmRlNzNlOGFm NTY2NThmYjJjLi5iNjQwM2RjMDc0ZmNlZDlmZDk1ZWI0ZjBmYzcyYzE1MTBkMGRhNDFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ2VydGlmaWNhdGVJ bmZvLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0NlcnRpZmlj YXRlSW5mby5oCkBAIC0zNSw2ICszNSw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IENlcnRpZmljYXRlSW5mbyB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6 CiAgICAgdXNpbmcgQ2VydGlmaWNhdGUgPSBWZWN0b3I8dWludDhfdD47CiAgICAgdXNpbmcgQ2Vy dGlmaWNhdGVDaGFpbiA9IFZlY3RvcjxDZXJ0aWZpY2F0ZT47CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcAppbmRleCA3OGIzYzg0 NmQ2YzA5YmNlMjhmMjI5NTdlYmU1OWViOTRmOTUyNTA4Li4yNzFlOGEzOTRkM2M3OGE5YjMwZjNj NTE3OWQyNzM3ZGM2ZWE0OWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHAKQEAgLTc3Niw2ICs3NzYsMjAgQEAgc3RkOjpv cHRpb25hbDxsb25nPiBDdXJsSGFuZGxlOjpnZXRIdHRwVmVyc2lvbigpCiAgICAgcmV0dXJuIHZl cnNpb247CiB9CiAKK3N0ZDo6b3B0aW9uYWw8U1NMKj4gQ3VybEhhbmRsZTo6c3NsQ29ubmVjdGlv bigpIGNvbnN0Cit7CisgICAgY3VybF90bHNzZXNzaW9uaW5mbyogaW5mbyA9IG51bGxwdHI7CisK KyAgICBhdXRvIGVycm9yQ29kZSA9IGN1cmxfZWFzeV9nZXRpbmZvKG1faGFuZGxlLCBDVVJMSU5G T19UTFNfU1NMX1BUUiwgJmluZm8pOworICAgIGlmIChlcnJvckNvZGUgIT0gQ1VSTEVfT0spCisg ICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICBpZiAoIWluZm8gfHwgaW5mby0+YmFj a2VuZCAhPSBDVVJMU1NMQkFDS0VORF9PUEVOU1NMIHx8ICFpbmZvLT5pbnRlcm5hbHMpCisgICAg ICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U1NMKj4o aW5mby0+aW50ZXJuYWxzKTsKK30KKwogc3RkOjpvcHRpb25hbDxOZXR3b3JrTG9hZE1ldHJpY3M+ IEN1cmxIYW5kbGU6OmdldE5ldHdvcmtMb2FkTWV0cmljcyhNb25vdG9uaWNUaW1lIHN0YXJ0VGlt ZSkKIHsKICAgICBkb3VibGUgbmFtZUxvb2t1cCA9IDAuMDsKQEAgLTg3MSwxOCArODg1LDEwIEBA IHZvaWQgQ3VybEhhbmRsZTo6YWRkRXh0cmFOZXR3b3JrTG9hZE1ldHJpY3MoTmV0d29ya0xvYWRN ZXRyaWNzJiBuZXR3b3JrTG9hZE1ldHJpCiAKICAgICBhdXRvIGFkZGl0aW9uYWxNZXRyaWNzID0g QWRkaXRpb25hbE5ldHdvcmtMb2FkTWV0cmljc0ZvcldlYkluc3BlY3Rvcjo6Y3JlYXRlKCk7CiAg ICAgaWYgKCFtX3Rsc0Nvbm5lY3Rpb25JbmZvKSB7Ci0gICAgICAgIGN1cmxfdGxzc2Vzc2lvbmlu Zm8qIGluZm8gPSBudWxscHRyOwotCi0gICAgICAgIGVycm9yQ29kZSA9IGN1cmxfZWFzeV9nZXRp bmZvKG1faGFuZGxlLCBDVVJMSU5GT19UTFNfU1NMX1BUUiwgJmluZm8pOwotICAgICAgICBpZiAo ZXJyb3JDb2RlICE9IENVUkxFX09LKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlm IChpbmZvICYmIGluZm8tPmJhY2tlbmQgPT0gQ1VSTFNTTEJBQ0tFTkRfT1BFTlNTTCAmJiBpbmZv LT5pbnRlcm5hbHMpIHsKLSAgICAgICAgICAgIGF1dG8gc3NsID0gc3RhdGljX2Nhc3Q8U1NMKj4o aW5mby0+aW50ZXJuYWxzKTsKLQorICAgICAgICBpZiAoYXV0byBzc2wgPSBzc2xDb25uZWN0aW9u KCkpIHsKICAgICAgICAgICAgIG1fdGxzQ29ubmVjdGlvbkluZm8gPSBtYWtlVW5pcXVlPFRMU0Nv bm5lY3Rpb25JbmZvPigpOwotICAgICAgICAgICAgbV90bHNDb25uZWN0aW9uSW5mby0+cHJvdG9j b2wgPSBPcGVuU1NMOjp0bHNWZXJzaW9uKHNzbCk7Ci0gICAgICAgICAgICBtX3Rsc0Nvbm5lY3Rp b25JbmZvLT5jaXBoZXIgPSBPcGVuU1NMOjp0bHNDaXBoZXJOYW1lKHNzbCk7CisgICAgICAgICAg ICBtX3Rsc0Nvbm5lY3Rpb25JbmZvLT5wcm90b2NvbCA9IE9wZW5TU0w6OnRsc1ZlcnNpb24oKnNz bCk7CisgICAgICAgICAgICBtX3Rsc0Nvbm5lY3Rpb25JbmZvLT5jaXBoZXIgPSBPcGVuU1NMOjp0 bHNDaXBoZXJOYW1lKCpzc2wpOwogICAgICAgICB9CiAgICAgfQogCkBAIC05MDYsMTAgKzkxMiwy MSBAQCB2b2lkIEN1cmxIYW5kbGU6OmFkZEV4dHJhTmV0d29ya0xvYWRNZXRyaWNzKE5ldHdvcmtM b2FkTWV0cmljcyYgbmV0d29ya0xvYWRNZXRyaQogCiBzdGQ6Om9wdGlvbmFsPENlcnRpZmljYXRl SW5mbz4gQ3VybEhhbmRsZTo6Y2VydGlmaWNhdGVJbmZvKCkgY29uc3QKIHsKLSAgICBpZiAoIW1f c3NsVmVyaWZpZXIpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisgICAgaWYgKG1fc3Ns VmVyaWZpZXIgJiYgIW1fc3NsVmVyaWZpZXItPmNlcnRpZmljYXRlSW5mbygpLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuIG1fc3NsVmVyaWZpZXItPmNlcnRpZmljYXRlSW5mbygpOworCisgICAg Ly8gSWYgeW91IHVzZSBhbiBleGlzdGluZyBIVFRQLzIgY29ubmVjdGlvbiwgU1NMVmVyaWZpZXIg ZG9lcyBub3QgZXhpc3QuCisgICAgaWYgKG1fY2VydGlmaWNhdGVJbmZvKQorICAgICAgICByZXR1 cm4gKm1fY2VydGlmaWNhdGVJbmZvOworCisgICAgaWYgKGF1dG8gc3NsID0gc3NsQ29ubmVjdGlv bigpKSB7CisgICAgICAgIGlmIChhdXRvIGNlcnRpZmljYXRlSW5mbyA9IE9wZW5TU0w6OmNyZWF0 ZUNlcnRpZmljYXRlSW5mbygqc3NsKSkgeworICAgICAgICAgICAgbV9jZXJ0aWZpY2F0ZUluZm8g PSBXVEZNb3ZlKGNlcnRpZmljYXRlSW5mbyk7CisgICAgICAgICAgICByZXR1cm4gKm1fY2VydGlm aWNhdGVJbmZvOworICAgICAgICB9CisgICAgfQogCi0gICAgcmV0dXJuIG1fc3NsVmVyaWZpZXIt PmNlcnRpZmljYXRlSW5mbygpOworICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiB9CiAKIGxvbmcg bG9uZyBDdXJsSGFuZGxlOjptYXhDdXJsT2ZmVCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5oCmluZGV4IDVlNmFlN2QyM2EwMTBjMjJk NzczYTVjM2JiOTkwOTcxMmIyOWYyOWYuLjliZDFiYjUzNDM5MmY0MmY2ZDg0YWEyZjdlMTVjYjY2 NjcyNmMwZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DdXJsQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DdXJsQ29udGV4dC5oCkBAIC0yNiw2ICsyNiw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5j bHVkZSAiQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiQ3VybFByb3h5U2V0dGluZ3MuaCIK ICNpbmNsdWRlICJDdXJsU1NMSGFuZGxlLmgiCiAKQEAgLTMzMCw2ICszMzEsOCBAQCBwcml2YXRl OgogICAgIHN0YXRpYyBDVVJMY29kZSB3aWxsU2V0dXBTc2xDdHhDYWxsYmFjayhDVVJMKiwgdm9p ZCogc3NsQ3R4LCB2b2lkKiB1c2VyRGF0YSk7CiAgICAgQ1VSTGNvZGUgd2lsbFNldHVwU3NsQ3R4 KHZvaWQqIHNzbEN0eCk7CiAKKyAgICBzdGQ6Om9wdGlvbmFsPFNTTCo+IHNzbENvbm5lY3Rpb24o KSBjb25zdDsKKwogICAgIENVUkwqIG1faGFuZGxlIHsgbnVsbHB0ciB9OwogICAgIGNoYXIgbV9l cnJvckJ1ZmZlcltDVVJMX0VSUk9SX1NJWkVdIHsgfTsKIApAQCAtMzM4LDYgKzM0MSw3IEBAIHBy aXZhdGU6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q3VybFNTTFZlcmlmaWVyPiBtX3NzbFZlcmlm aWVyOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxUTFNDb25uZWN0aW9uSW5mbz4gbV90bHNDb25uZWN0 aW9uSW5mbzsKKyAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxDZXJ0aWZpY2F0ZUluZm8+IG1f Y2VydGlmaWNhdGVJbmZvOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL09wZW5TU0xIZWxwZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL09wZW5TU0xIZWxwZXIuY3Bw CmluZGV4IDBmMDI5MjA2MjIyNzY0MmMxNWJlYmU4NDUzM2E2YjcyYWUzYTA3NzEuLjM2MTUwOWQ3 NGRjOTUxMmY1MWY0MWI5MmQ2OTdhYmM4MWQ5NWJiNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9PcGVuU1NMSGVscGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvT3BlblNTTEhlbHBlci5jcHAKQEAgLTY3LDE0 ICs2NywyMSBAQCBwcml2YXRlOgogCiBjbGFzcyBTdGFja09mWDUwOSB7CiBwdWJsaWM6CisgICAg U3RhY2tPZlg1MDkoU1RBQ0tfT0YoWDUwOSkqIGNlcnRzKQorICAgICAgICA6IG1fY2VydHMgeyBj ZXJ0cyB9CisgICAgICAgICwgbV9vd25lciB7IGZhbHNlIH0KKyAgICB7CisgICAgfQorCiAgICAg U3RhY2tPZlg1MDkoWDUwOV9TVE9SRV9DVFgqIGN0eCkKICAgICAgICAgOiBtX2NlcnRzIHsgWDUw OV9TVE9SRV9DVFhfZ2V0MV9jaGFpbihjdHgpIH0KKyAgICAgICAgLCBtX293bmVyIHsgdHJ1ZSB9 CiAgICAgewogICAgIH0KIAogICAgIH5TdGFja09mWDUwOSgpCiAgICAgewotICAgICAgICBpZiAo bV9jZXJ0cykKKyAgICAgICAgaWYgKG1fY2VydHMgJiYgbV9vd25lcikKICAgICAgICAgICAgIHNr X1g1MDlfcG9wX2ZyZWUobV9jZXJ0cywgWDUwOV9mcmVlKTsKICAgICB9CiAKQEAgLTgyLDcgKzg5 LDggQEAgcHVibGljOgogICAgIFg1MDkqIGl0ZW0oaW50IGkpIHsgcmV0dXJuIHNrX1g1MDlfdmFs dWUobV9jZXJ0cywgaSk7IH0KIAogcHJpdmF0ZToKLSAgICBTVEFDS19PRihYNTA5KSogbV9jZXJ0 cyB7IG51bGxwdHIgfTsKKyAgICBTVEFDS19PRihYNTA5KSogbV9jZXJ0czsKKyAgICBib29sIG1f b3duZXI7CiB9OwogCiBjbGFzcyBCSU8gewpAQCAtMTQxLDEwICsxNDksOSBAQCBwcml2YXRlOgog fTsKIAogCi1zdGF0aWMgVmVjdG9yPFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbzo6Q2VydGlmaWNh dGU+IHBlbURhdGFGcm9tQ3R4KFg1MDlfU1RPUkVfQ1RYKiBjdHgpCitzdGF0aWMgVmVjdG9yPFdl YkNvcmU6OkNlcnRpZmljYXRlSW5mbzo6Q2VydGlmaWNhdGU+IHBlbURhdGFGcm9tQ3R4KFN0YWNr T2ZYNTA5JiYgY2VydHMpCiB7CiAgICAgVmVjdG9yPFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbzo6 Q2VydGlmaWNhdGU+IHJlc3VsdDsKLSAgICBTdGFja09mWDUwOSBjZXJ0cyB7IGN0eCB9OwogCiAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjZXJ0cy5jb3VudCgpOyBpKyspIHsKICAgICAgICAgQklP IGJpbyhjZXJ0cy5pdGVtKGkpKTsKQEAgLTE1OCwxMiArMTY1LDIyIEBAIHN0YXRpYyBWZWN0b3I8 V2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvOjpDZXJ0aWZpY2F0ZT4gcGVtRGF0YUZyb21DdHgoWDUw OV9TVE9SRV9DCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAorc3RkOjp1bmlxdWVfcHRyPFdlYkNv cmU6OkNlcnRpZmljYXRlSW5mbz4gY3JlYXRlQ2VydGlmaWNhdGVJbmZvKFNTTCogc3NsKQorewor ICAgIGlmICghc3NsKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGF1dG8gY2VydENo YWluID0gU1NMX2dldF9wZWVyX2NlcnRfY2hhaW4oc3NsKTsKKworICAgIHJldHVybiBtYWtlVW5p cXVlPFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbz4oWDUwOV9WX09LLCBwZW1EYXRhRnJvbUN0eChT dGFja09mWDUwOShjZXJ0Q2hhaW4pKSk7Cit9CisKIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Q2Vy dGlmaWNhdGVJbmZvPiBjcmVhdGVDZXJ0aWZpY2F0ZUluZm8oWDUwOV9TVE9SRV9DVFgqIGN0eCkK IHsKICAgICBpZiAoIWN0eCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIHJl dHVybiBXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8oWDUwOV9TVE9SRV9DVFhfZ2V0X2Vycm9yKGN0 eCksIHBlbURhdGFGcm9tQ3R4KGN0eCkpOworICAgIHJldHVybiBXZWJDb3JlOjpDZXJ0aWZpY2F0 ZUluZm8oWDUwOV9TVE9SRV9DVFhfZ2V0X2Vycm9yKGN0eCksIHBlbURhdGFGcm9tQ3R4KFN0YWNr T2ZYNTA5KGN0eCkpKTsKIH0KIAogc3RhdGljIFN0cmluZyB0b1N0cmluZyhjb25zdCBBU04xX1NU UklORyogbmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y3VybC9PcGVuU1NMSGVscGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvT3BlblNTTEhlbHBlci5oCmluZGV4IGIxOGYzNmY2MTVlM2M0NWE5ZWE3NTUyYTZiZTEyZjI1 N2QyZGFlY2YuLjg4Y2M2YmVkMmFmM2Y3NzVlN2ExNWMzMDcwOTM3YmUzMzc4ZjhkYzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9PcGVuU1NMSGVscGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL09wZW5TU0xIZWxw ZXIuaApAQCAtMzEsNiArMzEsNyBAQAogCiBuYW1lc3BhY2UgT3BlblNTTCB7CiAKK3N0ZDo6dW5p cXVlX3B0cjxXZWJDb3JlOjpDZXJ0aWZpY2F0ZUluZm8+IGNyZWF0ZUNlcnRpZmljYXRlSW5mbyhT U0wqKTsKIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvPiBjcmVhdGVDZXJ0 aWZpY2F0ZUluZm8oWDUwOV9TVE9SRV9DVFgqKTsKIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Q2Vy dGlmaWNhdGVTdW1tYXJ5PiBjcmVhdGVTdW1tYXJ5SW5mbyhjb25zdCBWZWN0b3I8dWludDhfdD4m IHBlbSk7CiAK