190789 2018-10-22 02:33:20 -0700 [WPE][GTK] Pass full certificate chain in CertificateInfo coder 2018-10-23 08:52:20 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 csaavedra csaavedra bugs-noreply commit-queue mcatanzaro oldest_to_newest 1471188 0 csaavedra 2018-10-22 02:33:20 -0700 [WPE][GTK] Pass certificate issuer between processes if present in CertificateInfo 1471189 1 352882 csaavedra 2018-10-22 02:36:13 -0700 Created attachment 352882 Patch 1471190 2 csaavedra 2018-10-22 02:38:28 -0700 This is a bit of a RFC/WIP, but it would be really useful for apps to have at least the issuer certificate in the GTlsCertificate that the WebKitWebView API provides. The idea of the patch is to not lose that information when passing it between process. It could be done more elegantly (or even continue with the whole chain but I think this is good enough for now. 1471191 3 csaavedra 2018-10-22 02:43:51 -0700 Additionally one could add a signed-certificate/issuer-certificate combo to the tests resources and a test that checks this. 1471212 4 352882 mcatanzaro 2018-10-22 07:34:50 -0700 Comment on attachment 352882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352882&action=review This seems like a great idea! But I disagree that it's sufficient to pass just the immediate issuer: I'd consider it broken to pass only a single issuer and not the entire chain. The problem is that this will enable manual certificate verification and more complex certificate information dialogs... or it would seem to, and they'll work for most websites, but they will be broken for websites that send more than one intermediate certificate. So can you add a loop here? You'd just need to use a uint32_t instead of a bool to encode the total number of certificates in the chain before decoding the certificates themselves, so it should be an easy enhancement. > Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp:129 > + GRefPtr<GTlsCertificate> issuer = adoptGRef(G_TLS_CERTIFICATE(g_initable_new( > + g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", issuerBytes.get(), nullptr))); > + > + certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new( > + g_tls_backend_get_certificate_type(backend), 0, 0, "certificate", certificateBytes.get(), "issuer", issuer.get(), nullptr))); It will also be less-confusing if you do this in the opposite order: encode the server certificate first, then the issuer, then the issuer's issuer, etc. until the chain ends. > Tools/ChangeLog:17 > + (testSSL): Test that the self-signed certificatt has no bogus certificate > Tools/TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp:77 > + // Self-signed certificate has a nullptr issuer. > + g_assert(!g_tls_certificate_get_issuer(test->m_certificate.get())); It doesn't really test the change, but it's good enough IMO. Setting up a more complex certificate, as would be needed to test this, is already tested elsewhere in our stack below the WebKit layer, and the likelihood of this particular WebKit code breaking in the future is relatively low, so I think it's OK. 1471519 5 352962 csaavedra 2018-10-23 01:52:00 -0700 Created attachment 352962 Patch 1471524 6 352964 csaavedra 2018-10-23 02:31:38 -0700 Created attachment 352964 Patch 1471562 7 352964 mcatanzaro 2018-10-23 07:39:16 -0700 Comment on attachment 352964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352964&action=review Wow, it's a good do-while loop. Don't see those very often. > Source/WebKit/Shared/soup/WebCoreArgumentCodersSoup.cpp:85 > + // Encode starting from the root certificate. > + for (uint32_t i = chainLength; i > 0; i--) { > + GRefPtr<GByteArray> certificate = adoptGRef(certificatesDataList[i - 1]); > + encoder.encodeVariableLengthByteArray(IPC::DataReference(certificate->data, certificate->len)); > } Eh, maybe it *was* nicer the other way around... whatever, either order is totally fine, as you prefer. 1471585 8 352964 commit-queue 2018-10-23 08:52:18 -0700 Comment on attachment 352964 Patch Clearing flags on attachment: 352964 Committed r237351: <https://trac.webkit.org/changeset/237351> 1471586 9 commit-queue 2018-10-23 08:52:20 -0700 All reviewed patches have been landed. Closing bug. 352882 2018-10-22 02:36:13 -0700 2018-10-23 01:51:56 -0700 Patch bug-190789-20181022123612.patch text/plain 6840 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjMmY2ZDg2NmNjYmFlNThk YWI0ZDUzNDg1YzMwNDEyNTBhZTczY2EuLjlhN2FlOWZkYjI3MzQ4OWNkMTc4ZGU2MThlMTRmZmEy NTI1NWU1OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMTAtMjIgIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtHVEtdIFBh c3MgY2VydGlmaWNhdGUgaXNzdWVyIGJldHdlZW4gcHJvY2Vzc2VzIGlmIHByZXNlbnQgaW4gQ2Vy dGlmaWNhdGVJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTA3ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXaGVuIHRoZSBuZXR3b3JrIHByb2Nlc3Mgc2VyaWFsaXplcyBjZXJ0aWZpY2F0ZSBkYXRh IHRvIG90aGVyCisgICAgICAgIHByb2Nlc3NlcyB0aHJvdWdoIHRoZSBhcmd1bWVudCBjb2RlcnMs IHRoZSBjZXJ0aWZpY2F0ZSBpc3N1ZXIsIGlmCisgICAgICAgIHByZXNlbnQsIGlzIGxvc3QuIElu IHByYWN0aWNlIHRoaXMgbWVhbnMgdGhhdCBhcHBsaWNhdGlvbnMgdXNpbmcKKyAgICAgICAgdGhl IGxpYnJhcnkgQVBJIHRvIGRpc3BsYXkgY2VydGlmaWNhdGUgaW5mbyBoYXZlIG5vIGRldGFpbHMg b24gdGhlCisgICAgICAgIGNlcnRpZmljYXRlIGlzc3Vlciwgb3RoZXIgdGhhbiB0aGUgdmVyeSBi YXNpY3MgaW5jbHVkZWQgaW4gdGhlCisgICAgICAgIGNlcnRpZmljYXRlLiBJbXByb3ZlIHRoaXMg Ynkgc2VyaWFsaXppbmcgdG9nZXRoZXIgd2l0aCB0aGUKKyAgICAgICAgY2VydGlmaWNhdGUgdGhl IGlzc3VlciBlbnRpdHkgY2VydGlmaWNhdGUsIGlmIGF2YWlsYWJsZS4KKworICAgICAgICAqIFNo YXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPENlcnRpZmljYXRlSW5mbz46OmVuY29kZSk6IEVuY29kZSB0aGUgaXNzdWVy CisgICAgICAgIGNlcnRpZmljYXRlIGlmIHByZXNlbnQKKyAgICAgICAgKElQQzo6QXJndW1lbnRD b2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjpkZWNvZGUpOiBEZWNvZGUgaXQgaWYgcHJlc2VudAorICAg ICAgICBhbmQgc2V0IGl0IHRvIHRoZSBjZXJ0aWZpY2F0ZS4KKwogMjAxOC0xMC0xOSAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBXZWJDb250ZW50 IHByb2Nlc3MgdG8gY2hlY2sgc29tZSBmaWxlIHN5c3RlbSBmZWF0dXJlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAK aW5kZXggYmQ5YmEwOWZjYjBlYmJhNDU2NzhmMGM5MzgwM2NjZTA1MmQ0ZWZkNC4uZmYyNGJhMWZl OWQ1ZDY4NjM5NDc1Yzg4ZDIwNTZiNzRlZmE2OTBlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCkBAIC02Nyw2 ICs2NywyMiBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8Q2VydGlmaWNhdGVJbmZvPjo6ZW5jb2RlKEVu Y29kZXImIGVuY29kZXIsIGNvbnN0IENlcnRpZmljYXRlSQogICAgIEdSZWZQdHI8R0J5dGVBcnJh eT4gY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoY2VydGlmaWNhdGVEYXRhKTsKICAgICBlbmNvZGVy LmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KElQQzo6RGF0YVJlZmVyZW5jZShjZXJ0aWZp Y2F0ZS0+ZGF0YSwgY2VydGlmaWNhdGUtPmxlbikpOwogICAgIGVuY29kZXIgPDwgc3RhdGljX2Nh c3Q8dWludDMyX3Q+KGNlcnRpZmljYXRlSW5mby50bHNFcnJvcnMoKSk7CisKKyAgICBHUmVmUHRy PEdUbHNDZXJ0aWZpY2F0ZT4gaXNzdWVyID0gZ190bHNfY2VydGlmaWNhdGVfZ2V0X2lzc3Vlcihj ZXJ0aWZpY2F0ZUluZm8uY2VydGlmaWNhdGUoKSk7CisgICAgaWYgKCFpc3N1ZXIpIHsKKyAgICAg ICAgZW5jb2RlciA8PCBmYWxzZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGdfb2Jq ZWN0X2dldChHX09CSkVDVChpc3N1ZXIuZ2V0KCkpLCAiY2VydGlmaWNhdGUiLCAmY2VydGlmaWNh dGVEYXRhLCBOVUxMKTsKKyAgICBpZiAoIWNlcnRpZmljYXRlRGF0YSkgeworICAgICAgICBlbmNv ZGVyIDw8IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZW5jb2RlciA8PCB0 cnVlOworICAgIGNlcnRpZmljYXRlID0gYWRvcHRHUmVmKGNlcnRpZmljYXRlRGF0YSk7CisgICAg ZW5jb2Rlci5lbmNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheShJUEM6OkRhdGFSZWZlcmVuY2Uo Y2VydGlmaWNhdGUtPmRhdGEsIGNlcnRpZmljYXRlLT5sZW4pKTsKIH0KIAogYm9vbCBBcmd1bWVu dENvZGVyPENlcnRpZmljYXRlSW5mbz46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBDZXJ0aWZp Y2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbykKQEAgLTg2LDE0ICsxMDIsMzYgQEAgYm9vbCBBcmd1 bWVudENvZGVyPENlcnRpZmljYXRlSW5mbz46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBDZXJ0 aWZpY2F0ZUluZm8mIGMKICAgICBjZXJ0aWZpY2F0ZURhdGEgPSBnX2J5dGVfYXJyYXlfYXBwZW5k KGNlcnRpZmljYXRlRGF0YSwgY2VydGlmaWNhdGVEYXRhUmVmZXJlbmNlLmRhdGEoKSwgY2VydGlm aWNhdGVEYXRhUmVmZXJlbmNlLnNpemUoKSk7CiAgICAgR1JlZlB0cjxHQnl0ZUFycmF5PiBjZXJ0 aWZpY2F0ZUJ5dGVzID0gYWRvcHRHUmVmKGNlcnRpZmljYXRlRGF0YSk7CiAKLSAgICBHVGxzQmFj a2VuZCogYmFja2VuZCA9IGdfdGxzX2JhY2tlbmRfZ2V0X2RlZmF1bHQoKTsKLSAgICBHUmVmUHRy PEdUbHNDZXJ0aWZpY2F0ZT4gY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoR19UTFNfQ0VSVElGSUNB VEUoZ19pbml0YWJsZV9uZXcoCi0gICAgICAgIGdfdGxzX2JhY2tlbmRfZ2V0X2NlcnRpZmljYXRl X3R5cGUoYmFja2VuZCksIDAsIDAsICJjZXJ0aWZpY2F0ZSIsIGNlcnRpZmljYXRlQnl0ZXMuZ2V0 KCksIG51bGxwdHIpKSk7Ci0gICAgY2VydGlmaWNhdGVJbmZvLnNldENlcnRpZmljYXRlKGNlcnRp ZmljYXRlLmdldCgpKTsKLQogICAgIHVpbnQzMl90IHRsc0Vycm9yczsKICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHRsc0Vycm9ycykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIEdUbHNC YWNrZW5kKiBiYWNrZW5kID0gZ190bHNfYmFja2VuZF9nZXRfZGVmYXVsdCgpOworCisgICAgYm9v bCBoYXNJc3N1ZXI7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShoYXNJc3N1ZXIpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBHUmVmUHRyPEdUbHNDZXJ0aWZpY2F0ZT4gY2VydGlmaWNh dGU7CisgICAgaWYgKGhhc0lzc3VlcikgeworICAgICAgICBJUEM6OkRhdGFSZWZlcmVuY2UgaXNz dWVyRGF0YVJlZmVyZW5jZTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVZhcmlhYmxlTGVu Z3RoQnl0ZUFycmF5KGlzc3VlckRhdGFSZWZlcmVuY2UpKQorICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworCisgICAgICAgIEdCeXRlQXJyYXkqIGlzc3VlckRhdGEgPSBnX2J5dGVfYXJyYXlfc2l6 ZWRfbmV3KGlzc3VlckRhdGFSZWZlcmVuY2Uuc2l6ZSgpKTsKKyAgICAgICAgaXNzdWVyRGF0YSA9 IGdfYnl0ZV9hcnJheV9hcHBlbmQoaXNzdWVyRGF0YSwgaXNzdWVyRGF0YVJlZmVyZW5jZS5kYXRh KCksIGlzc3VlckRhdGFSZWZlcmVuY2Uuc2l6ZSgpKTsKKyAgICAgICAgR1JlZlB0cjxHQnl0ZUFy cmF5PiBpc3N1ZXJCeXRlcyA9IGFkb3B0R1JlZihpc3N1ZXJEYXRhKTsKKworICAgICAgICBHUmVm UHRyPEdUbHNDZXJ0aWZpY2F0ZT4gaXNzdWVyID0gYWRvcHRHUmVmKEdfVExTX0NFUlRJRklDQVRF KGdfaW5pdGFibGVfbmV3KAorICAgICAgICAgICAgZ190bHNfYmFja2VuZF9nZXRfY2VydGlmaWNh dGVfdHlwZShiYWNrZW5kKSwgMCwgMCwgImNlcnRpZmljYXRlIiwgaXNzdWVyQnl0ZXMuZ2V0KCks IG51bGxwdHIpKSk7CisKKyAgICAgICAgY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoR19UTFNfQ0VS VElGSUNBVEUoZ19pbml0YWJsZV9uZXcoCisgICAgICAgICAgICBnX3Rsc19iYWNrZW5kX2dldF9j ZXJ0aWZpY2F0ZV90eXBlKGJhY2tlbmQpLCAwLCAwLCAiY2VydGlmaWNhdGUiLCBjZXJ0aWZpY2F0 ZUJ5dGVzLmdldCgpLCAiaXNzdWVyIiwgaXNzdWVyLmdldCgpLCBudWxscHRyKSkpOworICAgIH0g ZWxzZQorICAgICAgICBjZXJ0aWZpY2F0ZSA9IGFkb3B0R1JlZihHX1RMU19DRVJUSUZJQ0FURShn X2luaXRhYmxlX25ldygKKyAgICAgICAgICAgIGdfdGxzX2JhY2tlbmRfZ2V0X2NlcnRpZmljYXRl X3R5cGUoYmFja2VuZCksIDAsIDAsICJjZXJ0aWZpY2F0ZSIsIGNlcnRpZmljYXRlQnl0ZXMuZ2V0 KCksIG51bGxwdHIpKSk7CisKKyAgICBjZXJ0aWZpY2F0ZUluZm8uc2V0Q2VydGlmaWNhdGUoY2Vy dGlmaWNhdGUuZ2V0KCkpOwogICAgIGNlcnRpZmljYXRlSW5mby5zZXRUTFNFcnJvcnMoc3RhdGlj X2Nhc3Q8R1Rsc0NlcnRpZmljYXRlRmxhZ3M+KHRsc0Vycm9ycykpOwogCiAgICAgcmV0dXJuIHRy dWU7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg NmRhNTg5NjVmZmFmZDlkODZjNzEzNTBlNTZlZDU2NTE0N2JmZGJlYy4uMzFkODhhMmI2NWE2YTc0 NGI0OGY0MGE5ZmQxNzQ3N2E4ZDhmMDU4MyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTEwLTIyICBDbGF1ZGlv IFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dQRV1bR1RLXSBQ YXNzIGNlcnRpZmljYXRlIGlzc3VlciBiZXR3ZWVuIHByb2Nlc3NlcyBpZiBwcmVzZW50IGluIENl cnRpZmljYXRlSW5mbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkwNzg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiB0aGUgbmV0d29yayBwcm9jZXNzIHNlcmlhbGl6ZXMgY2VydGlmaWNhdGUgZGF0 YSB0byBvdGhlcgorICAgICAgICBwcm9jZXNzZXMgdGhyb3VnaCB0aGUgYXJndW1lbnQgY29kZXJz LCB0aGUgY2VydGlmaWNhdGUgaXNzdWVyLCBpZgorICAgICAgICBwcmVzZW50LCBpcyBsb3N0LiBJ biBwcmFjdGljZSB0aGlzIG1lYW5zIHRoYXQgYXBwbGljYXRpb25zIHVzaW5nCisgICAgICAgIHRo ZSBsaWJyYXJ5IEFQSSB0byBkaXNwbGF5IGNlcnRpZmljYXRlIGluZm8gaGF2ZSBubyBkZXRhaWxz IG9uIHRoZQorICAgICAgICBjZXJ0aWZpY2F0ZSBpc3N1ZXIsIG90aGVyIHRoYW4gdGhlIHZlcnkg YmFzaWNzIGluY2x1ZGVkIGluIHRoZQorICAgICAgICBjZXJ0aWZpY2F0ZS4gSW1wcm92ZSB0aGlz IGJ5IHNlcmlhbGl6aW5nIHRvZ2V0aGVyIHdpdGggdGhlCisgICAgICAgIGNlcnRpZmljYXRlIHRo ZSBpc3N1ZXIgZW50aXR5IGNlcnRpZmljYXRlLCBpZiBhdmFpbGFibGUuCisKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHA6CisgICAgICAgICh0ZXN0 U1NMKTogVGVzdCB0aGF0IHRoZSBzZWxmLXNpZ25lZCBjZXJ0aWZpY2F0dCBoYXMgbm8gYm9ndXMK KyAgICAgICAgaXNzdWVyIGNlcnRpZmljYXRlLgorCiAyMDE4LTEwLTE5ICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBNaW5pQnJvd3NlciBoYXMgYW4g dW51c2VkIGluamVjdGVkIGJ1bmRsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRHTGliL1Rlc3RTU0wuY3BwCmluZGV4IDE0ZTE5ZmRhY2UyYWJkNjJhNWFkZjFmNGE0N2M5 OGFiMzBkMGQ5OGIuLjcwZTYwNmI5ODcyMTA2YmE3YzAzYzRhOWM3YTgwNTJjZTY2Y2NiNjMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0U1NMLmNw cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHAK QEAgLTczLDYgKzczLDggQEAgc3RhdGljIHZvaWQgdGVzdFNTTChTU0xUZXN0KiB0ZXN0LCBnY29u c3Rwb2ludGVyKQogICAgIHRlc3QtPmxvYWRVUkkoa0h0dHBzU2VydmVyLT5nZXRVUklGb3JQYXRo KCIvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKICAgICBn X2Fzc2VydCh0ZXN0LT5tX2NlcnRpZmljYXRlKTsKKyAgICAvLyBTZWxmLXNpZ25lZCBjZXJ0aWZp Y2F0ZSBoYXMgYSBudWxscHRyIGlzc3Vlci4KKyAgICBnX2Fzc2VydCghZ190bHNfY2VydGlmaWNh dGVfZ2V0X2lzc3Vlcih0ZXN0LT5tX2NlcnRpZmljYXRlLmdldCgpKSk7CiAgICAgLy8gV2UgYWx3 YXlzIGV4cGVjdCBlcnJvcnMgYmVjYXVzZSB3ZSBhcmUgdXNpbmcgYSBzZWxmLXNpZ25lZCBjZXJ0 aWZpY2F0ZSwKICAgICAvLyBidXQgb25seSBHX1RMU19DRVJUSUZJQ0FURV9VTktOT1dOX0NBIGZs YWdzIHNob3VsZCBiZSBwcmVzZW50LgogICAgIGdfYXNzZXJ0KHRlc3QtPm1fdGxzRXJyb3JzKTsK 352962 2018-10-23 01:52:00 -0700 2018-10-23 02:31:34 -0700 Patch bug-190789-20181023115159.patch text/plain 7517 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjMmY2ZDg2NmNjYmFlNThk YWI0ZDUzNDg1YzMwNDEyNTBhZTczY2EuLjkyNjUwZWZlZTUwZDQ2NzMyN2VhN2JkNWU4N2JiNWFm MGFmNDU2MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMTAtMjMgIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtHVEtdIFBh c3MgZnVsbCBjZXJ0aWZpY2F0ZSBjaGFpbiBpbiBDZXJ0aWZpY2F0ZUluZm8gY29kZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDc4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIG5ldHdv cmsgcHJvY2VzcyBzZXJpYWxpemVzIGNlcnRpZmljYXRlIGRhdGEgdG8gb3RoZXIKKyAgICAgICAg cHJvY2Vzc2VzIHRocm91Z2ggdGhlIGFyZ3VtZW50IGNvZGVycywgdGhlIGNlcnRpZmljYXRlIGNo YWluLCBpZgorICAgICAgICBwcmVzZW50LCBpcyBsb3N0LiBJbiBwcmFjdGljZSB0aGlzIG1lYW5z IHRoYXQgYXBwbGljYXRpb25zIHVzaW5nCisgICAgICAgIHRoZSBwdWJsaWMgQVBJIHRvIHByb2Nl c3MgY2VydGlmaWNhdGUgaW5mbyBoYXZlIG5vIGRldGFpbHMgb24gdGhlCisgICAgICAgIGNlcnRp ZmljYXRlIGNoYWluLCBvdGhlciB0aGFuIHRoZSB2ZXJ5IGJhc2ljcyBpbmNsdWRlZCBpbiB0aGUK KyAgICAgICAgY2VydGlmaWNhdGUuIFNlcmlhbGl6ZSB0aGUgZW50aXJlIGNoYWluIGlmIGF2YWls YWJsZSBpbiB0aGUKKyAgICAgICAgY2VydGlmaWNhdGUuCisKKyAgICAgICAgKiBTaGFyZWQvc291 cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRD b2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjplbmNvZGUpOiBFbmNvZGUgdGhlCisgICAgICAgIGNlcnRp ZmljYXRlIGNoYWluIGlmIHByZXNlbnQuCisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8Q2Vy dGlmaWNhdGVJbmZvPjo6ZGVjb2RlKTogRGVjb2RlIHRoZQorICAgICAgICBlbnRpcmUgY2VydGlm aWNhdGUgY2hhaW4gYW5kIHJlYnVpbGQgaXQuCisKIDIwMTgtMTAtMTkgIEJyZW50IEZ1bGdoYW0g IDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgV2ViQ29udGVudCBwcm9jZXNz IHRvIGNoZWNrIHNvbWUgZmlsZSBzeXN0ZW0gZmVhdHVyZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCmluZGV4IGJk OWJhMDlmY2IwZWJiYTQ1Njc4ZjBjOTM4MDNjY2UwNTJkNGVmZDQuLjA0N2MxYjAzODNiOTA1MzA4 YmY2ZGExMGVmZmUzYjgzZDdiYTFmMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcApAQCAtNTIsNDggKzUyLDcz IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+OjpkZWNvZGVQbGF0Zm9ybURh dGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyCiB2b2lkIEFyZ3VtZW50Q29kZXI8Q2VydGlmaWNh dGVJbmZvPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IENlcnRpZmljYXRlSW5mbyYg Y2VydGlmaWNhdGVJbmZvKQogewogICAgIGlmICghY2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRl KCkpIHsKLSAgICAgICAgZW5jb2RlciA8PCBmYWxzZTsKKyAgICAgICAgZW5jb2RlciA8PCAwOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaW50IGNoYWluTGVuZ3RoID0gMDsKKyAgICBH VGxzQ2VydGlmaWNhdGUqIGNlcnRpZmljYXRlID0gY2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRl KCk7CiAgICAgR0J5dGVBcnJheSogY2VydGlmaWNhdGVEYXRhID0gMDsKLSAgICBnX29iamVjdF9n ZXQoR19PQkpFQ1QoY2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRlKCkpLCAiY2VydGlmaWNhdGUi LCAmY2VydGlmaWNhdGVEYXRhLCBOVUxMKTsKLSAgICBpZiAoIWNlcnRpZmljYXRlRGF0YSkgewot ICAgICAgICBlbmNvZGVyIDw8IGZhbHNlOworICAgIFZlY3RvcjxHQnl0ZUFycmF5Kj4gY2VydGlm aWNhdGVzRGF0YUxpc3Q7CisKKyAgICBkbyB7CisgICAgICAgIGdfb2JqZWN0X2dldChHX09CSkVD VChjZXJ0aWZpY2F0ZSksICJjZXJ0aWZpY2F0ZSIsICZjZXJ0aWZpY2F0ZURhdGEsIE5VTEwpOwor CisgICAgICAgIGlmICghY2VydGlmaWNhdGVEYXRhKQorICAgICAgICAgICAgYnJlYWs7CisKKyAg ICAgICAgY2VydGlmaWNhdGVzRGF0YUxpc3QuYXBwZW5kKGNlcnRpZmljYXRlRGF0YSk7CisgICAg ICAgIGNoYWluTGVuZ3RoKys7CisKKyAgICAgICAgY2VydGlmaWNhdGUgPSBnX3Rsc19jZXJ0aWZp Y2F0ZV9nZXRfaXNzdWVyKGNlcnRpZmljYXRlKTsKKyAgICB9IHdoaWxlIChjZXJ0aWZpY2F0ZSk7 CisKKyAgICBlbmNvZGVyIDw8IGNoYWluTGVuZ3RoOworCisgICAgaWYgKCFjaGFpbkxlbmd0aCkK ICAgICAgICAgcmV0dXJuOworCisgICAgLy8gRW5jb2RlIHN0YXJ0aW5nIGZyb20gdGhlIHJvb3Qg Y2VydGlmaWNhdGUuCisgICAgZm9yIChpbnQgaSA9IGNoYWluTGVuZ3RoIC0gMTsgaSA+PSAwOyBp LS0pIHsKKyAgICAgICAgR1JlZlB0cjxHQnl0ZUFycmF5PiBjZXJ0aWZpY2F0ZSA9IGFkb3B0R1Jl ZihjZXJ0aWZpY2F0ZXNEYXRhTGlzdFtpXSk7CisgICAgICAgIGVuY29kZXIuZW5jb2RlVmFyaWFi bGVMZW5ndGhCeXRlQXJyYXkoSVBDOjpEYXRhUmVmZXJlbmNlKGNlcnRpZmljYXRlLT5kYXRhLCBj ZXJ0aWZpY2F0ZS0+bGVuKSk7CiAgICAgfQogCi0gICAgZW5jb2RlciA8PCB0cnVlOwotICAgIEdS ZWZQdHI8R0J5dGVBcnJheT4gY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoY2VydGlmaWNhdGVEYXRh KTsKLSAgICBlbmNvZGVyLmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KElQQzo6RGF0YVJl ZmVyZW5jZShjZXJ0aWZpY2F0ZS0+ZGF0YSwgY2VydGlmaWNhdGUtPmxlbikpOwogICAgIGVuY29k ZXIgPDwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGNlcnRpZmljYXRlSW5mby50bHNFcnJvcnMoKSk7 CiB9CiAKIGJvb2wgQXJndW1lbnRDb2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjpkZWNvZGUoRGVjb2Rl ciYgZGVjb2RlciwgQ2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8pCiB7Ci0gICAgYm9v bCBoYXNDZXJ0aWZpY2F0ZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhc0NlcnRpZmljYXRl KSkKKyAgICBpbnQgY2hhaW5MZW5ndGg7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjaGFpbkxl bmd0aCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghaGFzQ2VydGlmaWNhdGUp CisgICAgaWYgKCFjaGFpbkxlbmd0aCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBJUEM6 OkRhdGFSZWZlcmVuY2UgY2VydGlmaWNhdGVEYXRhUmVmZXJlbmNlOwotICAgIGlmICghZGVjb2Rl ci5kZWNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheShjZXJ0aWZpY2F0ZURhdGFSZWZlcmVuY2Up KQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgR1Rsc0NlcnRpZmljYXRlKiBpc3N1ZXIgPSBu dWxscHRyOworICAgIEdUbHNCYWNrZW5kKiBiYWNrZW5kID0gZ190bHNfYmFja2VuZF9nZXRfZGVm YXVsdCgpOworICAgIEdSZWZQdHI8R1Rsc0NlcnRpZmljYXRlPiBjZXJ0aWZpY2F0ZTsKKyAgICBm b3IgKGludCBpID0gMDsgaSA8IGNoYWluTGVuZ3RoOyBpKyspIHsKKyAgICAgICAgSVBDOjpEYXRh UmVmZXJlbmNlIGNlcnRpZmljYXRlRGF0YVJlZmVyZW5jZTsKKyAgICAgICAgaWYgKCFkZWNvZGVy LmRlY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KGNlcnRpZmljYXRlRGF0YVJlZmVyZW5jZSkp CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBHQnl0ZUFycmF5KiBjZXJ0aWZpY2F0 ZURhdGEgPSBnX2J5dGVfYXJyYXlfc2l6ZWRfbmV3KGNlcnRpZmljYXRlRGF0YVJlZmVyZW5jZS5z aXplKCkpOwotICAgIGNlcnRpZmljYXRlRGF0YSA9IGdfYnl0ZV9hcnJheV9hcHBlbmQoY2VydGlm aWNhdGVEYXRhLCBjZXJ0aWZpY2F0ZURhdGFSZWZlcmVuY2UuZGF0YSgpLCBjZXJ0aWZpY2F0ZURh dGFSZWZlcmVuY2Uuc2l6ZSgpKTsKLSAgICBHUmVmUHRyPEdCeXRlQXJyYXk+IGNlcnRpZmljYXRl Qnl0ZXMgPSBhZG9wdEdSZWYoY2VydGlmaWNhdGVEYXRhKTsKKyAgICAgICAgR0J5dGVBcnJheSog Y2VydGlmaWNhdGVEYXRhID0gZ19ieXRlX2FycmF5X3NpemVkX25ldyhjZXJ0aWZpY2F0ZURhdGFS ZWZlcmVuY2Uuc2l6ZSgpKTsKKyAgICAgICAgY2VydGlmaWNhdGVEYXRhID0gZ19ieXRlX2FycmF5 X2FwcGVuZChjZXJ0aWZpY2F0ZURhdGEsIGNlcnRpZmljYXRlRGF0YVJlZmVyZW5jZS5kYXRhKCks IGNlcnRpZmljYXRlRGF0YVJlZmVyZW5jZS5zaXplKCkpOworICAgICAgICBHUmVmUHRyPEdCeXRl QXJyYXk+IGNlcnRpZmljYXRlQnl0ZXMgPSBhZG9wdEdSZWYoY2VydGlmaWNhdGVEYXRhKTsKIAot ICAgIEdUbHNCYWNrZW5kKiBiYWNrZW5kID0gZ190bHNfYmFja2VuZF9nZXRfZGVmYXVsdCgpOwot ICAgIEdSZWZQdHI8R1Rsc0NlcnRpZmljYXRlPiBjZXJ0aWZpY2F0ZSA9IGFkb3B0R1JlZihHX1RM U19DRVJUSUZJQ0FURShnX2luaXRhYmxlX25ldygKLSAgICAgICAgZ190bHNfYmFja2VuZF9nZXRf Y2VydGlmaWNhdGVfdHlwZShiYWNrZW5kKSwgMCwgMCwgImNlcnRpZmljYXRlIiwgY2VydGlmaWNh dGVCeXRlcy5nZXQoKSwgbnVsbHB0cikpKTsKLSAgICBjZXJ0aWZpY2F0ZUluZm8uc2V0Q2VydGlm aWNhdGUoY2VydGlmaWNhdGUuZ2V0KCkpOworICAgICAgICBjZXJ0aWZpY2F0ZSA9IGFkb3B0R1Jl ZihHX1RMU19DRVJUSUZJQ0FURShnX2luaXRhYmxlX25ldygKKyAgICAgICAgICAgIGdfdGxzX2Jh Y2tlbmRfZ2V0X2NlcnRpZmljYXRlX3R5cGUoYmFja2VuZCksIDAsIDAsICJjZXJ0aWZpY2F0ZSIs IGNlcnRpZmljYXRlQnl0ZXMuZ2V0KCksICJpc3N1ZXIiLCBpc3N1ZXIsIG51bGxwdHIpKSk7CisK KyAgICAgICAgaXNzdWVyID0gY2VydGlmaWNhdGUuZ2V0KCk7CisgICAgfQogCiAgICAgdWludDMy X3QgdGxzRXJyb3JzOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGxzRXJyb3JzKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgY2VydGlmaWNhdGVJbmZvLnNldENlcnRpZmljYXRlKGNl cnRpZmljYXRlLmdldCgpKTsKICAgICBjZXJ0aWZpY2F0ZUluZm8uc2V0VExTRXJyb3JzKHN0YXRp Y19jYXN0PEdUbHNDZXJ0aWZpY2F0ZUZsYWdzPih0bHNFcnJvcnMpKTsKIAogICAgIHJldHVybiB0 cnVlOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDZkYTU4OTY1ZmZhZmQ5ZDg2YzcxMzUwZTU2ZWQ1NjUxNDdiZmRiZWMuLmIzMzNmNzA5NDJkMGYy Y2I5NjA1MWE4OGU3ZGQ1NmIyYjc0N2IxYWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOC0xMC0yMyAgQ2xhdWRp byBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdW0dUS10g UGFzcyBmdWxsIGNlcnRpZmljYXRlIGNoYWluIGluIENlcnRpZmljYXRlSW5mbyBjb2RlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNzg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB0aGUgbmV0 d29yayBwcm9jZXNzIHNlcmlhbGl6ZXMgY2VydGlmaWNhdGUgZGF0YSB0byBvdGhlcgorICAgICAg ICBwcm9jZXNzZXMgdGhyb3VnaCB0aGUgYXJndW1lbnQgY29kZXJzLCB0aGUgY2VydGlmaWNhdGUg Y2hhaW4sIGlmCisgICAgICAgIHByZXNlbnQsIGlzIGxvc3QuIEluIHByYWN0aWNlIHRoaXMgbWVh bnMgdGhhdCBhcHBsaWNhdGlvbnMgdXNpbmcKKyAgICAgICAgdGhlIHB1YmxpYyBBUEkgdG8gcHJv Y2VzcyBjZXJ0aWZpY2F0ZSBpbmZvIGhhdmUgbm8gZGV0YWlscyBvbiB0aGUKKyAgICAgICAgY2Vy dGlmaWNhdGUgY2hhaW4sIG90aGVyIHRoYW4gdGhlIHZlcnkgYmFzaWNzIGluY2x1ZGVkIGluIHRo ZQorICAgICAgICBjZXJ0aWZpY2F0ZS4gU2VyaWFsaXplIHRoZSBlbnRpcmUgY2hhaW4gaWYgYXZh aWxhYmxlIGluIHRoZQorICAgICAgICBjZXJ0aWZpY2F0ZS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0U1NMLmNwcDoKKyAgICAgICAgKHRlc3RTU0wpOiBU ZXN0IHRoYXQgdGhlIHNlbGYtc2lnbmVkIGNlcnRpZmljYXRlIGhhcyBubyBib2d1cworICAgICAg ICBpc3N1ZXIgY2VydGlmaWNhdGUuCisKIDIwMTgtMTAtMTkgIERhbiBCZXJuc3RlaW4gIDxtaXR6 QGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIE1pbmlCcm93c2VyIGhhcyBhbiB1bnVzZWQg aW5qZWN0ZWQgYnVuZGxlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdEdMaWIvVGVzdFNTTC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdM aWIvVGVzdFNTTC5jcHAKaW5kZXggMTRlMTlmZGFjZTJhYmQ2MmE1YWRmMWY0YTQ3Yzk4YWIzMGQw ZDk4Yi4uNzBlNjA2Yjk4NzIxMDZiYTdjMDNjNGE5YzdhODA1MmNlNjZjY2I2MyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0U1NMLmNwcApAQCAtNzMs NiArNzMsOCBAQCBzdGF0aWMgdm9pZCB0ZXN0U1NMKFNTTFRlc3QqIHRlc3QsIGdjb25zdHBvaW50 ZXIpCiAgICAgdGVzdC0+bG9hZFVSSShrSHR0cHNTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi8iKS5k YXRhKCkpOwogICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogICAgIGdfYXNzZXJ0 KHRlc3QtPm1fY2VydGlmaWNhdGUpOworICAgIC8vIFNlbGYtc2lnbmVkIGNlcnRpZmljYXRlIGhh cyBhIG51bGxwdHIgaXNzdWVyLgorICAgIGdfYXNzZXJ0KCFnX3Rsc19jZXJ0aWZpY2F0ZV9nZXRf aXNzdWVyKHRlc3QtPm1fY2VydGlmaWNhdGUuZ2V0KCkpKTsKICAgICAvLyBXZSBhbHdheXMgZXhw ZWN0IGVycm9ycyBiZWNhdXNlIHdlIGFyZSB1c2luZyBhIHNlbGYtc2lnbmVkIGNlcnRpZmljYXRl LAogICAgIC8vIGJ1dCBvbmx5IEdfVExTX0NFUlRJRklDQVRFX1VOS05PV05fQ0EgZmxhZ3Mgc2hv dWxkIGJlIHByZXNlbnQuCiAgICAgZ19hc3NlcnQodGVzdC0+bV90bHNFcnJvcnMpOwo= 352964 2018-10-23 02:31:38 -0700 2018-10-23 08:52:18 -0700 Patch bug-190789-20181023123137.patch text/plain 7536 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjMmY2ZDg2NmNjYmFlNThk YWI0ZDUzNDg1YzMwNDEyNTBhZTczY2EuLjkyNjUwZWZlZTUwZDQ2NzMyN2VhN2JkNWU4N2JiNWFm MGFmNDU2MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMTAtMjMgIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtHVEtdIFBh c3MgZnVsbCBjZXJ0aWZpY2F0ZSBjaGFpbiBpbiBDZXJ0aWZpY2F0ZUluZm8gY29kZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDc4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIG5ldHdv cmsgcHJvY2VzcyBzZXJpYWxpemVzIGNlcnRpZmljYXRlIGRhdGEgdG8gb3RoZXIKKyAgICAgICAg cHJvY2Vzc2VzIHRocm91Z2ggdGhlIGFyZ3VtZW50IGNvZGVycywgdGhlIGNlcnRpZmljYXRlIGNo YWluLCBpZgorICAgICAgICBwcmVzZW50LCBpcyBsb3N0LiBJbiBwcmFjdGljZSB0aGlzIG1lYW5z IHRoYXQgYXBwbGljYXRpb25zIHVzaW5nCisgICAgICAgIHRoZSBwdWJsaWMgQVBJIHRvIHByb2Nl c3MgY2VydGlmaWNhdGUgaW5mbyBoYXZlIG5vIGRldGFpbHMgb24gdGhlCisgICAgICAgIGNlcnRp ZmljYXRlIGNoYWluLCBvdGhlciB0aGFuIHRoZSB2ZXJ5IGJhc2ljcyBpbmNsdWRlZCBpbiB0aGUK KyAgICAgICAgY2VydGlmaWNhdGUuIFNlcmlhbGl6ZSB0aGUgZW50aXJlIGNoYWluIGlmIGF2YWls YWJsZSBpbiB0aGUKKyAgICAgICAgY2VydGlmaWNhdGUuCisKKyAgICAgICAgKiBTaGFyZWQvc291 cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRD b2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjplbmNvZGUpOiBFbmNvZGUgdGhlCisgICAgICAgIGNlcnRp ZmljYXRlIGNoYWluIGlmIHByZXNlbnQuCisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8Q2Vy dGlmaWNhdGVJbmZvPjo6ZGVjb2RlKTogRGVjb2RlIHRoZQorICAgICAgICBlbnRpcmUgY2VydGlm aWNhdGUgY2hhaW4gYW5kIHJlYnVpbGQgaXQuCisKIDIwMTgtMTAtMTkgIEJyZW50IEZ1bGdoYW0g IDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgV2ViQ29udGVudCBwcm9jZXNz IHRvIGNoZWNrIHNvbWUgZmlsZSBzeXN0ZW0gZmVhdHVyZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCmluZGV4IGJk OWJhMDlmY2IwZWJiYTQ1Njc4ZjBjOTM4MDNjY2UwNTJkNGVmZDQuLmUxMTA5MjAzYmRhYzg0ZGRj NTYzOGVjOWJjOTViZDJhMTJhNzY0NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcApAQCAtNTIsNDggKzUyLDcz IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+OjpkZWNvZGVQbGF0Zm9ybURh dGEoRGVjb2RlciYgZGVjb2RlciwgUmVzb3VyCiB2b2lkIEFyZ3VtZW50Q29kZXI8Q2VydGlmaWNh dGVJbmZvPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IENlcnRpZmljYXRlSW5mbyYg Y2VydGlmaWNhdGVJbmZvKQogewogICAgIGlmICghY2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRl KCkpIHsKLSAgICAgICAgZW5jb2RlciA8PCBmYWxzZTsKKyAgICAgICAgZW5jb2RlciA8PCAwOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgdWludDMyX3QgY2hhaW5MZW5ndGggPSAwOwor ICAgIEdUbHNDZXJ0aWZpY2F0ZSogY2VydGlmaWNhdGUgPSBjZXJ0aWZpY2F0ZUluZm8uY2VydGlm aWNhdGUoKTsKICAgICBHQnl0ZUFycmF5KiBjZXJ0aWZpY2F0ZURhdGEgPSAwOwotICAgIGdfb2Jq ZWN0X2dldChHX09CSkVDVChjZXJ0aWZpY2F0ZUluZm8uY2VydGlmaWNhdGUoKSksICJjZXJ0aWZp Y2F0ZSIsICZjZXJ0aWZpY2F0ZURhdGEsIE5VTEwpOwotICAgIGlmICghY2VydGlmaWNhdGVEYXRh KSB7Ci0gICAgICAgIGVuY29kZXIgPDwgZmFsc2U7CisgICAgVmVjdG9yPEdCeXRlQXJyYXkqPiBj ZXJ0aWZpY2F0ZXNEYXRhTGlzdDsKKworICAgIGRvIHsKKyAgICAgICAgZ19vYmplY3RfZ2V0KEdf T0JKRUNUKGNlcnRpZmljYXRlKSwgImNlcnRpZmljYXRlIiwgJmNlcnRpZmljYXRlRGF0YSwgTlVM TCk7CisKKyAgICAgICAgaWYgKCFjZXJ0aWZpY2F0ZURhdGEpCisgICAgICAgICAgICBicmVhazsK KworICAgICAgICBjZXJ0aWZpY2F0ZXNEYXRhTGlzdC5hcHBlbmQoY2VydGlmaWNhdGVEYXRhKTsK KyAgICAgICAgY2hhaW5MZW5ndGgrKzsKKworICAgICAgICBjZXJ0aWZpY2F0ZSA9IGdfdGxzX2Nl cnRpZmljYXRlX2dldF9pc3N1ZXIoY2VydGlmaWNhdGUpOworICAgIH0gd2hpbGUgKGNlcnRpZmlj YXRlKTsKKworICAgIGVuY29kZXIgPDwgY2hhaW5MZW5ndGg7CisKKyAgICBpZiAoIWNoYWluTGVu Z3RoKQogICAgICAgICByZXR1cm47CisKKyAgICAvLyBFbmNvZGUgc3RhcnRpbmcgZnJvbSB0aGUg cm9vdCBjZXJ0aWZpY2F0ZS4KKyAgICBmb3IgKHVpbnQzMl90IGkgPSBjaGFpbkxlbmd0aDsgaSA+ IDA7IGktLSkgeworICAgICAgICBHUmVmUHRyPEdCeXRlQXJyYXk+IGNlcnRpZmljYXRlID0gYWRv cHRHUmVmKGNlcnRpZmljYXRlc0RhdGFMaXN0W2kgLSAxXSk7CisgICAgICAgIGVuY29kZXIuZW5j b2RlVmFyaWFibGVMZW5ndGhCeXRlQXJyYXkoSVBDOjpEYXRhUmVmZXJlbmNlKGNlcnRpZmljYXRl LT5kYXRhLCBjZXJ0aWZpY2F0ZS0+bGVuKSk7CiAgICAgfQogCi0gICAgZW5jb2RlciA8PCB0cnVl OwotICAgIEdSZWZQdHI8R0J5dGVBcnJheT4gY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoY2VydGlm aWNhdGVEYXRhKTsKLSAgICBlbmNvZGVyLmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KElQ Qzo6RGF0YVJlZmVyZW5jZShjZXJ0aWZpY2F0ZS0+ZGF0YSwgY2VydGlmaWNhdGUtPmxlbikpOwog ICAgIGVuY29kZXIgPDwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGNlcnRpZmljYXRlSW5mby50bHNF cnJvcnMoKSk7CiB9CiAKIGJvb2wgQXJndW1lbnRDb2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjpkZWNv ZGUoRGVjb2RlciYgZGVjb2RlciwgQ2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8pCiB7 Ci0gICAgYm9vbCBoYXNDZXJ0aWZpY2F0ZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhc0Nl cnRpZmljYXRlKSkKKyAgICB1aW50MzJfdCBjaGFpbkxlbmd0aDsKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKGNoYWluTGVuZ3RoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFo YXNDZXJ0aWZpY2F0ZSkKKyAgICBpZiAoIWNoYWluTGVuZ3RoKQogICAgICAgICByZXR1cm4gdHJ1 ZTsKIAotICAgIElQQzo6RGF0YVJlZmVyZW5jZSBjZXJ0aWZpY2F0ZURhdGFSZWZlcmVuY2U7Ci0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KGNlcnRpZmljYXRl RGF0YVJlZmVyZW5jZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBHVGxzQ2VydGlmaWNh dGUqIGlzc3VlciA9IG51bGxwdHI7CisgICAgR1Rsc0JhY2tlbmQqIGJhY2tlbmQgPSBnX3Rsc19i YWNrZW5kX2dldF9kZWZhdWx0KCk7CisgICAgR1JlZlB0cjxHVGxzQ2VydGlmaWNhdGU+IGNlcnRp ZmljYXRlOworICAgIGZvciAodWludDMyX3QgaSA9IDA7IGkgPCBjaGFpbkxlbmd0aDsgaSsrKSB7 CisgICAgICAgIElQQzo6RGF0YVJlZmVyZW5jZSBjZXJ0aWZpY2F0ZURhdGFSZWZlcmVuY2U7Cisg ICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheShjZXJ0aWZp Y2F0ZURhdGFSZWZlcmVuY2UpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgR0J5 dGVBcnJheSogY2VydGlmaWNhdGVEYXRhID0gZ19ieXRlX2FycmF5X3NpemVkX25ldyhjZXJ0aWZp Y2F0ZURhdGFSZWZlcmVuY2Uuc2l6ZSgpKTsKLSAgICBjZXJ0aWZpY2F0ZURhdGEgPSBnX2J5dGVf YXJyYXlfYXBwZW5kKGNlcnRpZmljYXRlRGF0YSwgY2VydGlmaWNhdGVEYXRhUmVmZXJlbmNlLmRh dGEoKSwgY2VydGlmaWNhdGVEYXRhUmVmZXJlbmNlLnNpemUoKSk7Ci0gICAgR1JlZlB0cjxHQnl0 ZUFycmF5PiBjZXJ0aWZpY2F0ZUJ5dGVzID0gYWRvcHRHUmVmKGNlcnRpZmljYXRlRGF0YSk7Cisg ICAgICAgIEdCeXRlQXJyYXkqIGNlcnRpZmljYXRlRGF0YSA9IGdfYnl0ZV9hcnJheV9zaXplZF9u ZXcoY2VydGlmaWNhdGVEYXRhUmVmZXJlbmNlLnNpemUoKSk7CisgICAgICAgIGNlcnRpZmljYXRl RGF0YSA9IGdfYnl0ZV9hcnJheV9hcHBlbmQoY2VydGlmaWNhdGVEYXRhLCBjZXJ0aWZpY2F0ZURh dGFSZWZlcmVuY2UuZGF0YSgpLCBjZXJ0aWZpY2F0ZURhdGFSZWZlcmVuY2Uuc2l6ZSgpKTsKKyAg ICAgICAgR1JlZlB0cjxHQnl0ZUFycmF5PiBjZXJ0aWZpY2F0ZUJ5dGVzID0gYWRvcHRHUmVmKGNl cnRpZmljYXRlRGF0YSk7CiAKLSAgICBHVGxzQmFja2VuZCogYmFja2VuZCA9IGdfdGxzX2JhY2tl bmRfZ2V0X2RlZmF1bHQoKTsKLSAgICBHUmVmUHRyPEdUbHNDZXJ0aWZpY2F0ZT4gY2VydGlmaWNh dGUgPSBhZG9wdEdSZWYoR19UTFNfQ0VSVElGSUNBVEUoZ19pbml0YWJsZV9uZXcoCi0gICAgICAg IGdfdGxzX2JhY2tlbmRfZ2V0X2NlcnRpZmljYXRlX3R5cGUoYmFja2VuZCksIDAsIDAsICJjZXJ0 aWZpY2F0ZSIsIGNlcnRpZmljYXRlQnl0ZXMuZ2V0KCksIG51bGxwdHIpKSk7Ci0gICAgY2VydGlm aWNhdGVJbmZvLnNldENlcnRpZmljYXRlKGNlcnRpZmljYXRlLmdldCgpKTsKKyAgICAgICAgY2Vy dGlmaWNhdGUgPSBhZG9wdEdSZWYoR19UTFNfQ0VSVElGSUNBVEUoZ19pbml0YWJsZV9uZXcoCisg ICAgICAgICAgICBnX3Rsc19iYWNrZW5kX2dldF9jZXJ0aWZpY2F0ZV90eXBlKGJhY2tlbmQpLCAw LCAwLCAiY2VydGlmaWNhdGUiLCBjZXJ0aWZpY2F0ZUJ5dGVzLmdldCgpLCAiaXNzdWVyIiwgaXNz dWVyLCBudWxscHRyKSkpOworCisgICAgICAgIGlzc3VlciA9IGNlcnRpZmljYXRlLmdldCgpOwor ICAgIH0KIAogICAgIHVpbnQzMl90IHRsc0Vycm9yczsKICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KHRsc0Vycm9ycykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGNlcnRpZmljYXRlSW5m by5zZXRDZXJ0aWZpY2F0ZShjZXJ0aWZpY2F0ZS5nZXQoKSk7CiAgICAgY2VydGlmaWNhdGVJbmZv LnNldFRMU0Vycm9ycyhzdGF0aWNfY2FzdDxHVGxzQ2VydGlmaWNhdGVGbGFncz4odGxzRXJyb3Jz KSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCA2ZGE1ODk2NWZmYWZkOWQ4NmM3MTM1MGU1NmVkNTY1MTQ3YmZk YmVjLi5iMzMzZjcwOTQyZDBmMmNiOTYwNTFhODhlN2RkNTZiMmI3NDdiMWFjIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTgtMTAtMjMgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbV1BFXVtHVEtdIFBhc3MgZnVsbCBjZXJ0aWZpY2F0ZSBjaGFpbiBpbiBDZXJ0aWZp Y2F0ZUluZm8gY29kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5MDc4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBzZXJpYWxpemVzIGNlcnRpZmljYXRlIGRh dGEgdG8gb3RoZXIKKyAgICAgICAgcHJvY2Vzc2VzIHRocm91Z2ggdGhlIGFyZ3VtZW50IGNvZGVy cywgdGhlIGNlcnRpZmljYXRlIGNoYWluLCBpZgorICAgICAgICBwcmVzZW50LCBpcyBsb3N0LiBJ biBwcmFjdGljZSB0aGlzIG1lYW5zIHRoYXQgYXBwbGljYXRpb25zIHVzaW5nCisgICAgICAgIHRo ZSBwdWJsaWMgQVBJIHRvIHByb2Nlc3MgY2VydGlmaWNhdGUgaW5mbyBoYXZlIG5vIGRldGFpbHMg b24gdGhlCisgICAgICAgIGNlcnRpZmljYXRlIGNoYWluLCBvdGhlciB0aGFuIHRoZSB2ZXJ5IGJh c2ljcyBpbmNsdWRlZCBpbiB0aGUKKyAgICAgICAgY2VydGlmaWNhdGUuIFNlcmlhbGl6ZSB0aGUg ZW50aXJlIGNoYWluIGlmIGF2YWlsYWJsZSBpbiB0aGUKKyAgICAgICAgY2VydGlmaWNhdGUuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFNTTC5jcHA6Cisg ICAgICAgICh0ZXN0U1NMKTogVGVzdCB0aGF0IHRoZSBzZWxmLXNpZ25lZCBjZXJ0aWZpY2F0ZSBo YXMgbm8gYm9ndXMKKyAgICAgICAgaXNzdWVyIGNlcnRpZmljYXRlLgorCiAyMDE4LTEwLTE5ICBE YW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBNaW5pQnJv d3NlciBoYXMgYW4gdW51c2VkIGluamVjdGVkIGJ1bmRsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RTU0wuY3BwCmluZGV4IDE0ZTE5ZmRhY2UyYWJkNjJh NWFkZjFmNGE0N2M5OGFiMzBkMGQ5OGIuLjcwZTYwNmI5ODcyMTA2YmE3YzAzYzRhOWM3YTgwNTJj ZTY2Y2NiNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xp Yi9UZXN0U1NMLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIv VGVzdFNTTC5jcHAKQEAgLTczLDYgKzczLDggQEAgc3RhdGljIHZvaWQgdGVzdFNTTChTU0xUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIHRlc3QtPmxvYWRVUkkoa0h0dHBzU2VydmVyLT5n ZXRVUklGb3JQYXRoKCIvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNo ZWQoKTsKICAgICBnX2Fzc2VydCh0ZXN0LT5tX2NlcnRpZmljYXRlKTsKKyAgICAvLyBTZWxmLXNp Z25lZCBjZXJ0aWZpY2F0ZSBoYXMgYSBudWxscHRyIGlzc3Vlci4KKyAgICBnX2Fzc2VydCghZ190 bHNfY2VydGlmaWNhdGVfZ2V0X2lzc3Vlcih0ZXN0LT5tX2NlcnRpZmljYXRlLmdldCgpKSk7CiAg ICAgLy8gV2UgYWx3YXlzIGV4cGVjdCBlcnJvcnMgYmVjYXVzZSB3ZSBhcmUgdXNpbmcgYSBzZWxm LXNpZ25lZCBjZXJ0aWZpY2F0ZSwKICAgICAvLyBidXQgb25seSBHX1RMU19DRVJUSUZJQ0FURV9V TktOT1dOX0NBIGZsYWdzIHNob3VsZCBiZSBwcmVzZW50LgogICAgIGdfYXNzZXJ0KHRlc3QtPm1f dGxzRXJyb3JzKTsK