186884 2018-06-21 03:00:16 -0700 [GTK] WebDriver: allow applying host-specific TLS certificates for automated sessions 2018-06-21 04:04:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bburg berto cgarcia ews-watchlist gustavo joepeck keith_miller mark.lam mcatanzaro msaboff saam webkit-bug-importer oldest_to_newest 1435068 0 zan 2018-06-21 03:00:16 -0700 [GTK] WebDriver: allow applying host-specific TLS certificates for automated sessions 1435074 1 343229 zan 2018-06-21 03:17:12 -0700 Created attachment 343229 Patch 1435075 2 ews-watchlist 2018-06-21 03:18:57 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1435080 3 343229 cgarcia 2018-06-21 03:41:19 -0700 Comment on attachment 343229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343229&action=review > Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.cpp:135 > + while (g_variant_iter_loop(certificates.get(), "(ss)", &host, &certificateFile)) You are getting copies here, you need to use "(&s&s)" 1435086 4 zan 2018-06-21 04:04:01 -0700 Committed r233035: <https://trac.webkit.org/changeset/233035> 1435087 5 webkit-bug-importer 2018-06-21 04:04:19 -0700 <rdar://problem/41324941> 343229 2018-06-21 03:17:12 -0700 2018-06-21 03:41:19 -0700 Patch bug-186884-20180621121710.patch text/plain 12929 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzI0ZDkyZDBiMTIyMDg5ZDVmMzliODI3ZTI5MWY0OTJhMTJiMjFkLi5kZWY0NWMyNTgyYjAwMzFj NjVlYzMxNTUwMGQ0ZDI2MTVhMzE2NzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxOC0wNi0yMSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gV2ViRHJpdmVyOiBhbGxvdyBhcHBseWluZyBob3N0LXNwZWNp ZmljIFRMUyBjZXJ0aWZpY2F0ZXMgZm9yIGF1dG9tYXRlZCBzZXNzaW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2ODg0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgdHVwbGUgYXJyYXkgaW5w dXQgcGFyYW1ldGVyIHRvIHRoZSBTdGFydEF1dG9tYXRpb25TZXNzaW9uIERCdXMKKyAgICAgICAg bWVzc2FnZSwgcmVwcmVzZW50aW5nIGEgbGlzdCBvZiBob3N0LWFuZC1jZXJ0aWZpY2F0ZSBwYWly cyB0aGF0IGhhdmUgdG8KKyAgICAgICAgYmUgYWxsb3dlZCBmb3IgYSBnaXZlbiBzZXNzaW9uLiBU aGlzIGFycmF5IGlzIHRoZW4gdW5wYWNrZWQgYW5kIHVzZWQgdG8KKyAgICAgICAgZmlsbCBvdXQg dGhlIGNlcnRpZmljYXRlcyBWZWN0b3Igb2JqZWN0IGluIHRoZSBTZXNzaW9uQ2FwYWJpbGl0aWVz CisgICAgICAgIHN0cnVjdC4KKworICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5z cGVjdG9yLmg6IEFkZCBhIEdMaWItc3BlY2lmaWMgVmVjdG9yIG9mCisgICAgICAgIFN0cmluZyBw YWlycyByZXByZXNlbnRpbmcgaG9zdHMgYW5kIHRoZSBjZXJ0aWZpY2F0ZSBmaWxlIHBhdGhzLgor ICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JTZXJ2ZXIuY3Bw OgorCiAyMDE4LTA2LTIwICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEV4cGFuZCBjb25jdXJyZW50IEdDIGFzc2VydGlvbiB0byBhY2NlcHQgSlNWYWx1 ZSgpIG9yIDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYkRyaXZlci9DaGFuZ2VMb2cKaW5kZXggM2NkNjFjNDlmNjQwMzdiMWQ5Yzk3MjlkM2RkY2Fi MDg5NmY3OThhMC4uODAyNTA4M2E2ZTcxZDc2ZTY2NzExYjc4YWIxMTNiZDRmZTQ2MzA5NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxOC0wNi0yMSAgWmFuIERvYmVyc2VrICA8 emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gV2ViRHJpdmVyOiBhbGxvdyBh cHBseWluZyBob3N0LXNwZWNpZmljIFRMUyBjZXJ0aWZpY2F0ZXMgZm9yIGF1dG9tYXRlZCBzZXNz aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2 ODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3Rh cnQgaGFuZGxpbmcgdGhlICdjZXJ0aWZpY2F0ZXMnIGNhcGFiaWxpdHkgZm9yIHRoZSBHVEsrIHBv cnQuIFRoaXMgaXMKKyAgICAgICAgYSBsaXN0IG9mIGhvc3QtY2VydGlmaWNhdGUgcGFpcnMgdGhh dCBzaG91bGQgYmUgbWFya2VkIGFzIGFsbG93ZWQgZm9yIGEKKyAgICAgICAgZ2l2ZW4gYXV0b21h dGlvbiBzZXNzaW9uLiBUaGlzIG9iamVjdCBzaG91bGQgYmUgcG9zaXRpb25lZCBpbnNpZGUgdGhl CisgICAgICAgICd3ZWJraXRndGs6YnJvd3Nlck9wdGlvbnMnIGRpY3Rpb25hcnkgaW4gdGhlIGNh cGFiaWxpdGllcyBKU09OLgorCisgICAgICAgICogQ2FwYWJpbGl0aWVzLmg6CisgICAgICAgICog Z2xpYi9TZXNzaW9uSG9zdEdsaWIuY3BwOgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uSG9z dDo6c3RhcnRBdXRvbWF0aW9uU2Vzc2lvbik6IEluY2x1ZGUgYW55CisgICAgICAgIGhvc3QtY2Vy dGlmaWNhdGUgcGFpcnMgaW4gdGhlIFN0YXJ0QXV0b21hdGlvblNlc3Npb24gREJ1cyBtZXNzYWdl LgorICAgICAgICAqIGd0ay9XZWJEcml2ZXJTZXJ2aWNlR3RrLmNwcDoKKyAgICAgICAgKFdlYkRy aXZlcjo6V2ViRHJpdmVyU2VydmljZTo6cGxhdGZvcm1WYWxpZGF0ZUNhcGFiaWxpdHkgY29uc3Qp OgorICAgICAgICBQcm9wZXJseSB2YWxpZGF0ZSB0aGUgJ2NlcnRpZmljYXRlcycgdmFsdWUsIGlm IHByZXNlbnQuCisgICAgICAgIChXZWJEcml2ZXI6OldlYkRyaXZlclNlcnZpY2U6OnBsYXRmb3Jt UGFyc2VDYXBhYmlsaXRpZXMgY29uc3QpOgorICAgICAgICBQcm9wZXJseSBwYXJzZSB0aGUgJ2Nl cnRpZmljYXRlcycgdmFsdWUsIGlmIHByZXNlbnQsIGFuZCBleHRyYWN0IHRoZQorICAgICAgICBo b3N0LWNlcnRpZmljYXRlIHBhaXJzLgorCiAyMDE4LTA2LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIFdlYkRyaXZlcjog aGFuZGxlIGFjY2VwdEluc2VjdXJlQ2VydGlmaWNhdGVzIGNhcGFiaWxpdHkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg NzhhYTFjMTJiMzc4NTFmZDQwMmU3YmE4OWMwY2Y5Njc2ZmM0MzhjOS4uNDY1YjRiYjVhN2ZhNzFm YmIxNjY2YTAzYjRjMjM3NTRmNzkzYWIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx OC0wNi0yMSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dUS10gV2ViRHJpdmVyOiBhbGxvdyBhcHBseWluZyBob3N0LXNwZWNpZmljIFRMUyBjZXJ0aWZp Y2F0ZXMgZm9yIGF1dG9tYXRlZCBzZXNzaW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2ODg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0QXV0b21hdGlv blNlc3Npb24uY3BwOgorICAgICAgICAod2Via2l0QXV0b21hdGlvblNlc3Npb25DcmVhdGUpOiBI YW5kbGUgYW55IGhvc3QtY2VydGlmaWNhdGUgcGFpciB0aGF0J3MKKyAgICAgICAgYmVlbiBzZXQg Zm9yIHRoaXMgc2Vzc2lvbiwgY3JlYXRpbmcgYSBHVGxzQ2VydGlmaWNhdGUgb2JqZWN0IHRocm91 Z2gKKyAgICAgICAgbG9hZGluZyBmcm9tIHRoZSBzcGVjaWZpZWQgY2VydGlmaWNhdGUgcGF0aCBh bmQgbWFya2luZyB0aGF0IGNlcnRpZmljYXRlCisgICAgICAgIGFzIGFsbG93ZWQgZm9yIHRoZSBz cGVjaWZpZWQgaG9zdCB0aHJvdWdoIHRoZQorICAgICAgICB3ZWJraXRfd2ViX2NvbnRleHRfYWxs b3dfdGxzX2NlcnRpZmljYXRlX2Zvcl9ob3N0KCkgQVBJLgorCiAyMDE4LTA2LTIwICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJLaXQgb24gd2F0 Y2hPU10gRml4ZWQgcG9zaXRpb24gZWxlbWVudHMgc29tZXRpbWVzIGZsaWNrZXIgd2hlbiBzY3Jv bGxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggOWNjNThmNzE5NjFjMjEwNTk3MzQ4ZGQzNWFlNWI1 ZDU0Mzk5YTQ2NS4uYmM4MDk1ZjVlY2IxYmEwNDIwYWE4MzA5YTY1M2E5N2RjOWIxMmYzNSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5z cGVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yLmgKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5T UEVDVE9SKQogCisjaW5jbHVkZSA8dXRpbGl0eT4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgog I2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL0xvY2suaD4KQEAgLTc0LDYg Kzc1LDkgQEAgcHVibGljOgogCiAgICAgICAgIHN0cnVjdCBTZXNzaW9uQ2FwYWJpbGl0aWVzIHsK ICAgICAgICAgICAgIGJvb2wgYWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0ZXMgeyBmYWxzZSB9Owor I2lmIFVTRShHTElCKQorICAgICAgICAgICAgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmlu Zz4+IGNlcnRpZmljYXRlczsKKyNlbmRpZgogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICAg ICAgc3RkOjpvcHRpb25hbDxib29sPiBhbGxvd0luc2VjdXJlTWVkaWFDYXB0dXJlOwogICAgICAg ICAgICAgc3RkOjpvcHRpb25hbDxib29sPiBzdXBwcmVzc0lDRUNhbmRpZGF0ZUZpbHRlcmluZzsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIv UmVtb3RlSW5zcGVjdG9yU2VydmVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yU2VydmVyLmNwcAppbmRleCBkMTU5OTBjYjJi NWM1ZmI5NzM3OWJlMzYyMjcwNjlhM2VkZmU5MGNlLi42NzMyNzZiYjM4MzBkM2UxOTEzZGM5ZmZm ZTllZjQ2NzAyNjhiMDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvclNlcnZlci5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xpYi9SZW1vdGVJbnNwZWN0b3JTZXJ2ZXIu Y3BwCkBAIC04MCw2ICs4MCw3IEBAIHN0YXRpYyBjb25zdCBjaGFyIGludHJvc3BlY3Rpb25YTUxb XSA9CiAgICAgIiAgICA8bWV0aG9kIG5hbWU9J1N0YXJ0QXV0b21hdGlvblNlc3Npb24nPiIKICAg ICAiICAgICAgPGFyZyB0eXBlPSdzJyBuYW1lPSdzZXNzaW9uSUQnIGRpcmVjdGlvbj0naW4nLz4i CiAgICAgIiAgICAgIDxhcmcgdHlwZT0nYicgbmFtZT0nYWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0 ZXMnIGRpcmVjdGlvbj0naW4nLz4iCisgICAgIiAgICAgIDxhcmcgdHlwZT0nYShzcyknIG5hbWU9 J2NlcnRpZmljYXRlcycgZGlyZWN0aW9uPSdpbicvPiIKICAgICAiICAgICAgPGFyZyB0eXBlPSdz JyBuYW1lPSdicm93c2VyTmFtZScgZGlyZWN0aW9uPSdvdXQnLz4iCiAgICAgIiAgICAgIDxhcmcg dHlwZT0ncycgbmFtZT0nYnJvd3NlclZlcnNpb24nIGRpcmVjdGlvbj0nb3V0Jy8+IgogICAgICIg ICAgPC9tZXRob2Q+IgpAQCAtMTI0LDkgKzEyNSwxNSBAQCBjb25zdCBHREJ1c0ludGVyZmFjZVZU YWJsZSBSZW1vdGVJbnNwZWN0b3JTZXJ2ZXI6OnNfaW50ZXJmYWNlVlRhYmxlID0gewogICAgICAg ICB9IGVsc2UgaWYgKCFnX3N0cmNtcDAobWV0aG9kTmFtZSwgIlN0YXJ0QXV0b21hdGlvblNlc3Np b24iKSkgewogICAgICAgICAgICAgY29uc3QgY2hhciogc2Vzc2lvbklEOwogICAgICAgICAgICAg Z2Jvb2xlYW4gYWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0ZXM7Ci0gICAgICAgICAgICBnX3Zhcmlh bnRfZ2V0KHBhcmFtZXRlcnMsICIoJnNiKSIsICZzZXNzaW9uSUQsICZhY2NlcHRJbnNlY3VyZUNl cnRpZmljYXRlcyk7CisgICAgICAgICAgICBHVW5pcXVlT3V0UHRyPEdWYXJpYW50SXRlcj4gY2Vy dGlmaWNhdGVzOworICAgICAgICAgICAgZ192YXJpYW50X2dldChwYXJhbWV0ZXJzLCAiKCZzYmEo c3MpKSIsICZzZXNzaW9uSUQsICZhY2NlcHRJbnNlY3VyZUNlcnRpZmljYXRlcywgJmNlcnRpZmlj YXRlcy5vdXRQdHIoKSk7CiAgICAgICAgICAgICBSZW1vdGVJbnNwZWN0b3I6OkNsaWVudDo6U2Vz c2lvbkNhcGFiaWxpdGllcyBjYXBhYmlsaXRpZXM7CiAgICAgICAgICAgICBjYXBhYmlsaXRpZXMu YWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0ZXMgPSBhY2NlcHRJbnNlY3VyZUNlcnRpZmljYXRlczsK KyAgICAgICAgICAgIGNhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMucmVzZXJ2ZUNhcGFjaXR5KGdf dmFyaWFudF9pdGVyX25fY2hpbGRyZW4oY2VydGlmaWNhdGVzLmdldCgpKSk7CisgICAgICAgICAg ICBjb25zdCBjaGFyKiBob3N0OworICAgICAgICAgICAgY29uc3QgY2hhciogY2VydGlmaWNhdGVG aWxlOworICAgICAgICAgICAgd2hpbGUgKGdfdmFyaWFudF9pdGVyX2xvb3AoY2VydGlmaWNhdGVz LmdldCgpLCAiKHNzKSIsICZob3N0LCAmY2VydGlmaWNhdGVGaWxlKSkKKyAgICAgICAgICAgICAg ICBjYXBhYmlsaXRpZXMuY2VydGlmaWNhdGVzLnVuY2hlY2tlZEFwcGVuZCh7IFN0cmluZzo6ZnJv bVVURjgoaG9zdCksIFN0cmluZzo6ZnJvbVVURjgoY2VydGlmaWNhdGVGaWxlKSB9KTsKICAgICAg ICAgICAgIGluc3BlY3RvclNlcnZlci0+c3RhcnRBdXRvbWF0aW9uU2Vzc2lvbihjb25uZWN0aW9u LCBzZXNzaW9uSUQsIGNhcGFiaWxpdGllcyk7CiAgICAgICAgICAgICBhdXRvIGNsaWVudENhcGFi aWxpdGllcyA9IFJlbW90ZUluc3BlY3Rvcjo6c2luZ2xldG9uKCkuY2xpZW50Q2FwYWJpbGl0aWVz KCk7CiAgICAgICAgICAgICBnX2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGlu dm9jYXRpb24sIGdfdmFyaWFudF9uZXcoIihzcykiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRy aXZlci9DYXBhYmlsaXRpZXMuaCBiL1NvdXJjZS9XZWJEcml2ZXIvQ2FwYWJpbGl0aWVzLmgKaW5k ZXggMWQyMjA2N2NmZTAxZGQ3ZGRhOGJlNjI4MzM2MDQ4ZmQwZmZkYjFmYS4uODE1MTE1YTcwZGM0 OGQ0NzE5NTBmZmYzZmE3ZGUwNTljZWEwNjdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZl ci9DYXBhYmlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NhcGFiaWxpdGllcy5oCkBA IC0yNSw2ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSA8dXRpbGl0eT4KICNp bmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9TZWNvbmRzLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgpAQCAtNjQsNiArNjUsNyBAQCBzdHJ1Y3QgQ2FwYWJpbGl0aWVzIHsK ICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkKICAgICBzdGQ6Om9wdGlvbmFsPFN0 cmluZz4gYnJvd3NlckJpbmFyeTsKICAgICBzdGQ6Om9wdGlvbmFsPFZlY3RvcjxTdHJpbmc+PiBi cm93c2VyQXJndW1lbnRzOworICAgIHN0ZDo6b3B0aW9uYWw8VmVjdG9yPHN0ZDo6cGFpcjxTdHJp bmcsIFN0cmluZz4+PiBjZXJ0aWZpY2F0ZXM7CiAjZW5kaWYKICNpZiBQTEFURk9STShHVEspCiAg ICAgc3RkOjpvcHRpb25hbDxib29sPiB1c2VPdmVybGF5U2Nyb2xsYmFyczsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJEcml2ZXIvZ2xpYi9TZXNzaW9uSG9zdEdsaWIuY3BwIGIvU291cmNlL1dlYkRy aXZlci9nbGliL1Nlc3Npb25Ib3N0R2xpYi5jcHAKaW5kZXggNzhmODQ5YjY0MzZiMzRmZDZjMjkw MDQ4M2Y3ZjZlYzU0YTI2ZmNiNi4uYjc4ZTllMWQwMWI4ZTRkYmQ3M2U5YjQzNGUyMGViNWYxZDFk NTcxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9nbGliL1Nlc3Npb25Ib3N0R2xpYi5j cHAKKysrIGIvU291cmNlL1dlYkRyaXZlci9nbGliL1Nlc3Npb25Ib3N0R2xpYi5jcHAKQEAgLTI2 NywxMSArMjY3LDE5IEBAIHZvaWQgU2Vzc2lvbkhvc3Q6OnN0YXJ0QXV0b21hdGlvblNlc3Npb24o RnVuY3Rpb248dm9pZCAoYm9vbCwgc3RkOjpvcHRpb25hbDxTdHJpCiAgICAgQVNTRVJUKCFtX3N0 YXJ0U2Vzc2lvbkNvbXBsZXRpb25IYW5kbGVyKTsKICAgICBtX3N0YXJ0U2Vzc2lvbkNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcik7CiAgICAgbV9zZXNzaW9uSUQg PSBjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCk7CisgICAgR1ZhcmlhbnRCdWlsZGVyIGJ1aWxk ZXI7CisgICAgZ192YXJpYW50X2J1aWxkZXJfaW5pdCgmYnVpbGRlciwgR19WQVJJQU5UX1RZUEUo ImEoc3MpIikpOworICAgIGlmIChtX2NhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMpIHsKKyAgICAg ICAgZm9yIChhdXRvJiBjZXJ0aWZpY2F0ZSA6ICptX2NhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMp IHsKKyAgICAgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZF92YWx1ZSgmYnVpbGRlciwgZ192 YXJpYW50X25ldygiKHNzKSIsCisgICAgICAgICAgICAgICAgY2VydGlmaWNhdGUuZmlyc3QudXRm OCgpLmRhdGEoKSwgY2VydGlmaWNhdGUuc2Vjb25kLnV0ZjgoKS5kYXRhKCkpKTsKKyAgICAgICAg fQorICAgIH0KICAgICBnX2RidXNfY29ubmVjdGlvbl9jYWxsKG1fZGJ1c0Nvbm5lY3Rpb24uZ2V0 KCksIG51bGxwdHIsCiAgICAgICAgIElOU1BFQ1RPUl9EQlVTX09CSkVDVF9QQVRILAogICAgICAg ICBJTlNQRUNUT1JfREJVU19JTlRFUkZBQ0UsCiAgICAgICAgICJTdGFydEF1dG9tYXRpb25TZXNz aW9uIiwKLSAgICAgICAgZ192YXJpYW50X25ldygiKHNiKSIsIG1fc2Vzc2lvbklELnV0ZjgoKS5k YXRhKCksIG1fY2FwYWJpbGl0aWVzLmFjY2VwdEluc2VjdXJlQ2VydHMudmFsdWVfb3IoZmFsc2Up KSwKKyAgICAgICAgZ192YXJpYW50X25ldygiKHNiYShzcykpIiwgbV9zZXNzaW9uSUQudXRmOCgp LmRhdGEoKSwgbV9jYXBhYmlsaXRpZXMuYWNjZXB0SW5zZWN1cmVDZXJ0cy52YWx1ZV9vcihmYWxz ZSksICZidWlsZGVyKSwKICAgICAgICAgbnVsbHB0ciwgR19EQlVTX0NBTExfRkxBR1NfTk9fQVVU T19TVEFSVCwKICAgICAgICAgLTEsIG1fY2FuY2VsbGFibGUuZ2V0KCksIFtdKEdPYmplY3QqIHNv dXJjZSwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIHVzZXJEYXRhKSB7CiAgICAgICAg ICAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4gZXJyb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi RHJpdmVyL2d0ay9XZWJEcml2ZXJTZXJ2aWNlR3RrLmNwcCBiL1NvdXJjZS9XZWJEcml2ZXIvZ3Rr L1dlYkRyaXZlclNlcnZpY2VHdGsuY3BwCmluZGV4IDFlNWE5YzJlMWE4N2RjYmE5YTJjYjQ5OTRl NDgzYTAwYjFiMDBhYTkuLjQxZDdiNDM4MjZjNWRlMGYzOGRhMzdlNTAxM2U2OWJhNzQ1YzE1ZDYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvZ3RrL1dlYkRyaXZlclNlcnZpY2VHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvZ3RrL1dlYkRyaXZlclNlcnZpY2VHdGsuY3BwCkBAIC03 Nyw2ICs3NywzMSBAQCBib29sIFdlYkRyaXZlclNlcnZpY2U6OnBsYXRmb3JtVmFsaWRhdGVDYXBh YmlsaXR5KGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgUmVmUAogICAgICAgICB9CiAgICAgfQog CisgICAgUmVmUHRyPEpTT046OlZhbHVlPiBjZXJ0aWZpY2F0ZXNWYWx1ZTsKKyAgICBpZiAoYnJv d3Nlck9wdGlvbnMtPmdldFZhbHVlKEFTQ0lJTGl0ZXJhbCgiY2VydGlmaWNhdGVzIiksIGNlcnRp ZmljYXRlc1ZhbHVlKSkgeworICAgICAgICBSZWZQdHI8SlNPTjo6QXJyYXk+IGNlcnRpZmljYXRl czsKKyAgICAgICAgaWYgKCFjZXJ0aWZpY2F0ZXNWYWx1ZS0+YXNBcnJheShjZXJ0aWZpY2F0ZXMp KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIHVuc2lnbmVkIGNlcnRpZmlj YXRlc0xlbmd0aCA9IGNlcnRpZmljYXRlcy0+bGVuZ3RoKCk7CisgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBjZXJ0aWZpY2F0ZXNMZW5ndGg7ICsraSkgeworICAgICAgICAgICAgUmVm UHRyPEpTT046OlZhbHVlPiBjZXJ0aWZpY2F0ZVZhbHVlID0gY2VydGlmaWNhdGVzLT5nZXQoaSk7 CisgICAgICAgICAgICBSZWZQdHI8SlNPTjo6T2JqZWN0PiBjZXJ0aWZpY2F0ZTsKKyAgICAgICAg ICAgIGlmICghY2VydGlmaWNhdGVWYWx1ZS0+YXNPYmplY3QoY2VydGlmaWNhdGUpKQorICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgUmVmUHRyPEpTT046OlZhbHVl PiBob3N0VmFsdWU7CisgICAgICAgICAgICBTdHJpbmcgaG9zdDsKKyAgICAgICAgICAgIGlmICgh Y2VydGlmaWNhdGUtPmdldFZhbHVlKEFTQ0lJTGl0ZXJhbCgiaG9zdCIpLCBob3N0VmFsdWUpIHx8 ICFob3N0VmFsdWUtPmFzU3RyaW5nKGhvc3QpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgICAgICAgICAgUmVmUHRyPEpTT046OlZhbHVlPiBjZXJ0aWZpY2F0ZUZpbGVWYWx1 ZTsKKyAgICAgICAgICAgIFN0cmluZyBjZXJ0aWZpY2F0ZUZpbGU7CisgICAgICAgICAgICBpZiAo IWNlcnRpZmljYXRlLT5nZXRWYWx1ZShBU0NJSUxpdGVyYWwoImNlcnRpZmljYXRlRmlsZSIpLCBj ZXJ0aWZpY2F0ZUZpbGVWYWx1ZSkgfHwgIWNlcnRpZmljYXRlRmlsZVZhbHVlLT5hc1N0cmluZyhj ZXJ0aWZpY2F0ZUZpbGUpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg fQorICAgIH0KKwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0xMTgsNiArMTQzLDI5IEBAIHZv aWQgV2ViRHJpdmVyU2VydmljZTo6cGxhdGZvcm1QYXJzZUNhcGFiaWxpdGllcyhjb25zdCBKU09O OjpPYmplY3QmIG1hdGNoZWRDYXBhCiAgICAgICAgIGNhcGFiaWxpdGllcy51c2VPdmVybGF5U2Ny b2xsYmFycyA9IHVzZU92ZXJsYXlTY3JvbGxiYXJzOwogICAgIGVsc2UKICAgICAgICAgY2FwYWJp bGl0aWVzLnVzZU92ZXJsYXlTY3JvbGxiYXJzID0gdHJ1ZTsKKworICAgIFJlZlB0cjxKU09OOjpB cnJheT4gY2VydGlmaWNhdGVzOworICAgIGlmIChicm93c2VyT3B0aW9ucy0+Z2V0QXJyYXkoQVND SUlMaXRlcmFsKCJjZXJ0aWZpY2F0ZXMiKSwgY2VydGlmaWNhdGVzKSAmJiBjZXJ0aWZpY2F0ZXMt Pmxlbmd0aCgpKSB7CisgICAgICAgIHVuc2lnbmVkIGNlcnRpZmljYXRlc0xlbmd0aCA9IGNlcnRp ZmljYXRlcy0+bGVuZ3RoKCk7CisgICAgICAgIGNhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMgPSBW ZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4oKTsKKyAgICAgICAgY2FwYWJpbGl0aWVz LmNlcnRpZmljYXRlcy0+cmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShjZXJ0aWZpY2F0ZXNMZW5ndGgp OworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2VydGlmaWNhdGVzTGVuZ3RoOyAr K2kpIHsKKyAgICAgICAgICAgIFJlZlB0cjxKU09OOjpWYWx1ZT4gdmFsdWUgPSBjZXJ0aWZpY2F0 ZXMtPmdldChpKTsKKyAgICAgICAgICAgIFJlZlB0cjxKU09OOjpPYmplY3Q+IGNlcnRpZmljYXRl OworICAgICAgICAgICAgdmFsdWUtPmFzT2JqZWN0KGNlcnRpZmljYXRlKTsKKyAgICAgICAgICAg IEFTU0VSVChjZXJ0aWZpY2F0ZSk7CisKKyAgICAgICAgICAgIFN0cmluZyBob3N0OworICAgICAg ICAgICAgY2VydGlmaWNhdGUtPmdldFN0cmluZyhBU0NJSUxpdGVyYWwoImhvc3QiKSwgaG9zdCk7 CisgICAgICAgICAgICBBU1NFUlQoIWhvc3QuaXNOdWxsKCkpOworCisgICAgICAgICAgICBTdHJp bmcgY2VydGlmaWNhdGVGaWxlOworICAgICAgICAgICAgY2VydGlmaWNhdGUtPmdldFN0cmluZyhB U0NJSUxpdGVyYWwoImNlcnRpZmljYXRlRmlsZSIpLCBjZXJ0aWZpY2F0ZUZpbGUpOworICAgICAg ICAgICAgQVNTRVJUKCFjZXJ0aWZpY2F0ZUZpbGUuaXNOdWxsKCkpOworCisgICAgICAgICAgICBj YXBhYmlsaXRpZXMuY2VydGlmaWNhdGVzLT51bmNoZWNrZWRBcHBlbmQoeyBXVEZNb3ZlKGhvc3Qp LCBXVEZNb3ZlKGNlcnRpZmljYXRlRmlsZSkgfSk7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkRyaXZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2dsaWIvV2ViS2l0QXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0QXV0b21hdGlvblNlc3Npb24uY3BwCmluZGV4IDgzZDQ0 NWExZWEwMjA5ODJmMGJhNGFiN2RlODM1OTM4N2NjOGExZDcuLjdlYjk1ZTkyOThmOTA4ODUxN2E3 ZmQwOTExMDAxYjQ2MDM4ZDZiN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9nbGliL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTI5NCw2 ICsyOTQsMTEgQEAgV2ViS2l0QXV0b21hdGlvblNlc3Npb24qIHdlYmtpdEF1dG9tYXRpb25TZXNz aW9uQ3JlYXRlKFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnQKICAgICBzZXNzaW9uLT5wcml2LT53 ZWJDb250ZXh0ID0gd2ViQ29udGV4dDsKICAgICBpZiAoY2FwYWJpbGl0aWVzLmFjY2VwdEluc2Vj dXJlQ2VydGlmaWNhdGVzKQogICAgICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Rsc19lcnJv cnNfcG9saWN5KHdlYkNvbnRleHQsIFdFQktJVF9UTFNfRVJST1JTX1BPTElDWV9JR05PUkUpOwor ICAgIGZvciAoYXV0byYgY2VydGlmaWNhdGUgOiBjYXBhYmlsaXRpZXMuY2VydGlmaWNhdGVzKSB7 CisgICAgICAgIEdSZWZQdHI8R1Rsc0NlcnRpZmljYXRlPiB0bHNDZXJ0aWZpY2F0ZSA9IGFkb3B0 R1JlZihnX3Rsc19jZXJ0aWZpY2F0ZV9uZXdfZnJvbV9maWxlKGNlcnRpZmljYXRlLnNlY29uZC51 dGY4KCkuZGF0YSgpLCBudWxscHRyKSk7CisgICAgICAgIGlmICh0bHNDZXJ0aWZpY2F0ZSkKKyAg ICAgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9hbGxvd190bHNfY2VydGlmaWNhdGVfZm9yX2hv c3Qod2ViQ29udGV4dCwgdGxzQ2VydGlmaWNhdGUuZ2V0KCksIGNlcnRpZmljYXRlLmZpcnN0LnV0 ZjgoKS5kYXRhKCkpOworICAgIH0KICAgICByZXR1cm4gc2Vzc2lvbjsKIH0KIAo=