215802 2020-08-25 01:49:58 -0700 [SOUP] Initialize HSTS storage directory from network session initialization 2020-08-25 08:08:23 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 215788 1 cgarcia webkit-unassigned achristensen berto bugs-noreply csaavedra ews-watchlist gustavo webkit-bug-importer oldest_to_newest 1682609 0 cgarcia 2020-08-25 01:49:58 -0700 Instead of network process initialization, since it's not actually a global setting. 1682611 1 407180 cgarcia 2020-08-25 01:56:39 -0700 Created attachment 407180 Patch 1682612 2 ews-watchlist 2020-08-25 01:57:33 -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 1682636 3 ews-feeder 2020-08-25 08:07:26 -0700 Committed r266112: <https://trac.webkit.org/changeset/266112> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407180. 1682637 4 webkit-bug-importer 2020-08-25 08:08:23 -0700 <rdar://problem/67738265> 407180 2020-08-25 01:56:39 -0700 2020-08-25 08:07:27 -0700 Patch wk2-soup-hsts-init.diff text/plain 14673 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNWQ0OTI4ODQ5MTIuLmUxMGY0ZTZjZGY4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI1IEBACisyMDIwLTA4LTI1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0gSW5pdGlhbGl6ZSBIU1RTIHN0b3JhZ2UgZGly ZWN0b3J5IGZyb20gbmV0d29yayBzZXNzaW9uIGluaXRpYWxpemF0aW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU4MDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9wIGhhbmRsaW5nIEhTVFMgcGVy c2lzdGVudCBzdG9yYWdlIGFzIGEgZ2xvYmFsIHNldHRpbmcuIFNvdXBOZXR3b3JrU2Vzc2lvbjo6 c2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdlKCkgaXMgbm8KKyAgICAgICAgbG9uZ2VyIHN0YXRpYyBh bmQgaXQgZG9lcyB3aGF0IHNldHVwSFNUU0VuZm9yY2VyKCkgZGlkIGJ1dCBzaW1wbGlmaWVkLiBU aGUgc2Vzc2lvbiBpcyBub3cgYWx3YXlzIGNyZWF0ZWQgd2l0aCBhCisgICAgICAgIG1lbW9yeSBl bmZvcmNlciB0aGF0IGlzIG9ubHkgcmVwbGFjZWQgYnkgYSBwZXJzaXN0ZW50IG9uZSB3aGVuIHNl dEhTVFNQZXJzaXN0ZW50U3RvcmFnZSgpIGlzIGNhbGxlZCBvbgorICAgICAgICBub24tZXBoZW1l cmFsIHNlc3Npb25zLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3 b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nlc3Npb246OlNv dXBOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nlc3Npb246 OnNldEhTVFNQZXJzaXN0ZW50U3RvcmFnZSk6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29y a1Nlc3Npb246OmdldEhvc3ROYW1lc1dpdGhIU1RTQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6 U291cE5ldHdvcmtTZXNzaW9uOjpkZWxldGVIU1RTQ2FjaGVGb3JIb3N0TmFtZXMpOgorICAgICAg ICAoV2ViQ29yZTo6U291cE5ldHdvcmtTZXNzaW9uOjpjbGVhckhTVFNDYWNoZSk6CisgICAgICAg IChXZWJDb3JlOjpoc3RzU3RvcmFnZURpcmVjdG9yeSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpTb3VwTmV0d29ya1Nlc3Npb246OnNldHVwSFNUU0VuZm9yY2VyKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNzaW9uLmg6CisKIDIw MjAtMDgtMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuIEZpeCBHVEsvV1BFIGJ1aWxkIGFmdGVyIHIyNjYxMDMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nl c3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3 b3JrU2Vzc2lvbi5jcHAKaW5kZXggNmY1MjBjNGRhNTllLi40OThkMWFjNTcyNzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Np b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0 d29ya1Nlc3Npb24uY3BwCkBAIC01OCwxMiArNTgsNiBAQCBzdGF0aWMgU291cE5ldHdvcmtQcm94 eVNldHRpbmdzJiBwcm94eVNldHRpbmdzKCkKICAgICByZXR1cm4gc2V0dGluZ3MuZ2V0KCk7CiB9 CiAKLXN0YXRpYyBDU3RyaW5nJiBoc3RzU3RvcmFnZURpcmVjdG9yeSgpCi17Ci0gICAgc3RhdGlj IE5ldmVyRGVzdHJveWVkPENTdHJpbmc+IGRpcmVjdG9yeTsKLSAgICByZXR1cm4gZGlyZWN0b3J5 LmdldCgpOwotfQotCiAjaWYgIUxPR19ESVNBQkxFRCB8fCAhUkVMRUFTRV9MT0dfRElTQUJMRUQK IGlubGluZSBzdGF0aWMgdm9pZCBzb3VwTG9nUHJpbnRlcihTb3VwTG9nZ2VyKiwgU291cExvZ2dl ckxvZ0xldmVsLCBjaGFyIGRpcmVjdGlvbiwgY29uc3QgY2hhciogZGF0YSwgZ3BvaW50ZXIpCiB7 CkBAIC0xMzIsNiArMTI2LDkgQEAgU291cE5ldHdvcmtTZXNzaW9uOjpTb3VwTmV0d29ya1Nlc3Np b24oUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgICAgICBTT1VQX1NFU1NJT05fVElNRU9V VCwgMCwKICAgICAgICAgU09VUF9TRVNTSU9OX0lETEVfVElNRU9VVCwgMCwKICAgICAgICAgU09V UF9TRVNTSU9OX0FERF9GRUFUVVJFX0JZX1RZUEUsIFNPVVBfVFlQRV9DT05URU5UX1NOSUZGRVIs CisjaWYgU09VUF9DSEVDS19WRVJTSU9OKDIsIDY3LCAxKQorICAgICAgICBTT1VQX1NFU1NJT05f QUREX0ZFQVRVUkVfQllfVFlQRSwgU09VUF9UWVBFX0hTVFNfRU5GT1JDRVIsCisjZW5kaWYKICNp ZiBTT1VQX0NIRUNLX1ZFUlNJT04oMiwgNjcsIDkwKQogICAgICAgICBTT1VQX1NFU1NJT05fQURE X0ZFQVRVUkVfQllfVFlQRSwgU09VUF9UWVBFX1dFQlNPQ0tFVF9FWFRFTlNJT05fTUFOQUdFUiwK ICNlbmRpZgpAQCAtMTQ5LDcgKzE0Niw2IEBAIFNvdXBOZXR3b3JrU2Vzc2lvbjo6U291cE5ldHdv cmtTZXNzaW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICBpZiAocHJveHlTZXR0aW5n cygpLm1vZGUgIT0gU291cE5ldHdvcmtQcm94eVNldHRpbmdzOjpNb2RlOjpEZWZhdWx0KQogICAg ICAgICBzZXR1cFByb3h5KCk7CiAgICAgc2V0dXBMb2dnZXIoKTsKLSAgICBzZXR1cEhTVFNFbmZv cmNlcigpOwogfQogCiBTb3VwTmV0d29ya1Nlc3Npb246On5Tb3VwTmV0d29ya1Nlc3Npb24oKSA9 IGRlZmF1bHQ7CkBAIC0xNzgsNDAgKzE3NCwzMiBAQCBTb3VwQ29va2llSmFyKiBTb3VwTmV0d29y a1Nlc3Npb246OmNvb2tpZUphcigpIGNvbnN0CiAgICAgcmV0dXJuIFNPVVBfQ09PS0lFX0pBUihz b3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUobV9zb3VwU2Vzc2lvbi5nZXQoKSwgU09VUF9UWVBFX0NP T0tJRV9KQVIpKTsKIH0KIAotdm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OnNldEhTVFNQZXJzaXN0 ZW50U3RvcmFnZShjb25zdCBDU3RyaW5nJiBkaXJlY3RvcnkpCit2b2lkIFNvdXBOZXR3b3JrU2Vz c2lvbjo6c2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5KQog ewotICAgIGhzdHNTdG9yYWdlRGlyZWN0b3J5KCkgPSBkaXJlY3Rvcnk7Ci19CisgICAgaWYgKG1f c2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpCisgICAgICAgIHJldHVybjsKIAotdm9pZCBTb3VwTmV0 d29ya1Nlc3Npb246OnNldHVwSFNUU0VuZm9yY2VyKCkKLXsKICNpZiBTT1VQX0NIRUNLX1ZFUlNJ T04oMiwgNjcsIDEpCi0gICAgaWYgKHNvdXBfc2Vzc2lvbl9oYXNfZmVhdHVyZShtX3NvdXBTZXNz aW9uLmdldCgpLCBTT1VQX1RZUEVfSFNUU19FTkZPUkNFUikpCi0gICAgICAgIHNvdXBfc2Vzc2lv bl9yZW1vdmVfZmVhdHVyZV9ieV90eXBlKG1fc291cFNlc3Npb24uZ2V0KCksIFNPVVBfVFlQRV9I U1RTX0VORk9SQ0VSKTsKLQotICAgIEdSZWZQdHI8U291cEhTVFNFbmZvcmNlcj4gZW5mb3JjZXI7 Ci0gICAgaWYgKG1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkgfHwgaHN0c1N0b3JhZ2VEaXJlY3Rv cnkoKS5pc051bGwoKSkKLSAgICAgICAgZW5mb3JjZXIgPSBhZG9wdEdSZWYoc291cF9oc3RzX2Vu Zm9yY2VyX25ldygpKTsKLSAgICBlbHNlIHsKLSAgICAgICAgaWYgKEZpbGVTeXN0ZW06Om1ha2VB bGxEaXJlY3Rvcmllcyhoc3RzU3RvcmFnZURpcmVjdG9yeSgpLmRhdGEoKSkpIHsKLSAgICAgICAg ICAgIENTdHJpbmcgc3RvcmFnZVBhdGggPSBGaWxlU3lzdGVtOjpmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb24oaHN0c1N0b3JhZ2VEaXJlY3RvcnkoKS5kYXRhKCkpOwotICAgICAgICAgICAgR1VuaXF1 ZVB0cjxjaGFyPiBkYkZpbGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoc3RvcmFnZVBhdGguZGF0YSgp LCAiaHN0cy1zdG9yYWdlLnNxbGl0ZSIsIG51bGxwdHIpKTsKLSAgICAgICAgICAgIGVuZm9yY2Vy ID0gYWRvcHRHUmVmKHNvdXBfaHN0c19lbmZvcmNlcl9kYl9uZXcoZGJGaWxlbmFtZS5nZXQoKSkp OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTmV0d29y aywgIlVuYWJsZSB0byBjcmVhdGUgdGhlIEhTVFMgc3RvcmFnZSBkaXJlY3RvcnkgXCIlc1wiLiBV c2luZyBhIG1lbW9yeSBlbmZvcmNlciBpbnN0ZWFkLiIsIGhzdHNTdG9yYWdlRGlyZWN0b3J5KCku ZGF0YSgpKTsKLSAgICAgICAgICAgIGVuZm9yY2VyID0gYWRvcHRHUmVmKHNvdXBfaHN0c19lbmZv cmNlcl9uZXcoKSk7Ci0gICAgICAgIH0KKyAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VBbGxEaXJl Y3RvcmllcyhkaXJlY3RvcnkpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKE5ldHdvcmss ICJVbmFibGUgdG8gY3JlYXRlIHRoZSBIU1RTIHN0b3JhZ2UgZGlyZWN0b3J5IFwiJXNcIi4gVXNp bmcgYSBtZW1vcnkgZW5mb3JjZXIgaW5zdGVhZC4iLCBkaXJlY3RvcnkudXRmOCgpLmRhdGEoKSk7 CisgICAgICAgIHJldHVybjsKICAgICB9CisKKyAgICBDU3RyaW5nIHN0b3JhZ2VQYXRoID0gRmls ZVN5c3RlbTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGRpcmVjdG9yeSk7CisgICAgR1VuaXF1 ZVB0cjxjaGFyPiBkYkZpbGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoc3RvcmFnZVBhdGguZGF0YSgp LCAiaHN0cy1zdG9yYWdlLnNxbGl0ZSIsIG51bGxwdHIpKTsKKyAgICBHUmVmUHRyPFNvdXBIU1RT RW5mb3JjZXI+IGVuZm9yY2VyID0gYWRvcHRHUmVmKHNvdXBfaHN0c19lbmZvcmNlcl9kYl9uZXco ZGJGaWxlbmFtZS5nZXQoKSkpOworICAgIHNvdXBfc2Vzc2lvbl9yZW1vdmVfZmVhdHVyZV9ieV90 eXBlKG1fc291cFNlc3Npb24uZ2V0KCksIFNPVVBfVFlQRV9IU1RTX0VORk9SQ0VSKTsKICAgICBz b3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUobV9zb3VwU2Vzc2lvbi5nZXQoKSwgU09VUF9TRVNTSU9O X0ZFQVRVUkUoZW5mb3JjZXIuZ2V0KCkpKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGRpcmVj dG9yeSk7CiAjZW5kaWYKIH0KIAogdm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OmdldEhvc3ROYW1l c1dpdGhIU1RTQ2FjaGUoSGFzaFNldDxTdHJpbmc+JiBob3N0TmFtZXMpCiB7CiAjaWYgU09VUF9D SEVDS19WRVJTSU9OKDIsIDY3LCA5MSkKLSAgICBTb3VwSFNUU0VuZm9yY2VyKiBlbmZvcmNlciA9 IFNPVVBfSFNUU19FTkZPUkNFUihzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUobV9zb3VwU2Vzc2lv bi5nZXQoKSwgU09VUF9UWVBFX0hTVFNfRU5GT1JDRVIpKTsKLSAgICBpZiAoIWVuZm9yY2VyKQot ICAgICAgICByZXR1cm47CisgICAgYXV0byogZW5mb3JjZXIgPSBTT1VQX0hTVFNfRU5GT1JDRVIo c291cF9zZXNzaW9uX2dldF9mZWF0dXJlKG1fc291cFNlc3Npb24uZ2V0KCksIFNPVVBfVFlQRV9I U1RTX0VORk9SQ0VSKSk7CisgICAgQVNTRVJUKGVuZm9yY2VyKTsKIAogICAgIEdVbmlxdWVQdHI8 R0xpc3Q+IGRvbWFpbnMoc291cF9oc3RzX2VuZm9yY2VyX2dldF9kb21haW5zKGVuZm9yY2VyLCBG QUxTRSkpOwogICAgIGZvciAoR0xpc3QqIGl0ZXIgPSBkb21haW5zLmdldCgpOyBpdGVyOyBpdGVy ID0gaXRlci0+bmV4dCkgewpAQCAtMjI2LDkgKzIxNCw4IEBAIHZvaWQgU291cE5ldHdvcmtTZXNz aW9uOjpnZXRIb3N0TmFtZXNXaXRoSFNUU0NhY2hlKEhhc2hTZXQ8U3RyaW5nPiYgaG9zdE5hbWVz KQogdm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OmRlbGV0ZUhTVFNDYWNoZUZvckhvc3ROYW1lcyhj b25zdCBWZWN0b3I8U3RyaW5nPiYgaG9zdE5hbWVzKQogewogI2lmIFNPVVBfQ0hFQ0tfVkVSU0lP TigyLCA2NywgMSkKLSAgICBTb3VwSFNUU0VuZm9yY2VyKiBlbmZvcmNlciA9IFNPVVBfSFNUU19F TkZPUkNFUihzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUobV9zb3VwU2Vzc2lvbi5nZXQoKSwgU09V UF9UWVBFX0hTVFNfRU5GT1JDRVIpKTsKLSAgICBpZiAoIWVuZm9yY2VyKQotICAgICAgICByZXR1 cm47CisgICAgYXV0byogZW5mb3JjZXIgPSBTT1VQX0hTVFNfRU5GT1JDRVIoc291cF9zZXNzaW9u X2dldF9mZWF0dXJlKG1fc291cFNlc3Npb24uZ2V0KCksIFNPVVBfVFlQRV9IU1RTX0VORk9SQ0VS KSk7CisgICAgQVNTRVJUKGVuZm9yY2VyKTsKIAogICAgIGZvciAoY29uc3QgYXV0byYgaG9zdE5h bWUgOiBob3N0TmFtZXMpIHsKICAgICAgICAgR1VuaXF1ZVB0cjxTb3VwSFNUU1BvbGljeT4gcG9s aWN5KHNvdXBfaHN0c19wb2xpY3lfbmV3KGhvc3ROYW1lLnV0ZjgoKS5kYXRhKCksIFNPVVBfSFNU U19QT0xJQ1lfTUFYX0FHRV9QQVNULCBGQUxTRSkpOwpAQCAtMjQyLDkgKzIyOSw4IEBAIHZvaWQg U291cE5ldHdvcmtTZXNzaW9uOjpkZWxldGVIU1RTQ2FjaGVGb3JIb3N0TmFtZXMoY29uc3QgVmVj dG9yPFN0cmluZz4mIGhvc3ROCiB2b2lkIFNvdXBOZXR3b3JrU2Vzc2lvbjo6Y2xlYXJIU1RTQ2Fj aGUoV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSkKIHsKICNpZiBTT1VQX0NIRUNLX1ZFUlNJT04oMiwg NjcsIDkxKQotICAgIFNvdXBIU1RTRW5mb3JjZXIqIGVuZm9yY2VyID0gU09VUF9IU1RTX0VORk9S Q0VSKHNvdXBfc2Vzc2lvbl9nZXRfZmVhdHVyZShtX3NvdXBTZXNzaW9uLmdldCgpLCBTT1VQX1RZ UEVfSFNUU19FTkZPUkNFUikpOwotICAgIGlmICghZW5mb3JjZXIpCi0gICAgICAgIHJldHVybjsK KyAgICBhdXRvKiBlbmZvcmNlciA9IFNPVVBfSFNUU19FTkZPUkNFUihzb3VwX3Nlc3Npb25fZ2V0 X2ZlYXR1cmUobV9zb3VwU2Vzc2lvbi5nZXQoKSwgU09VUF9UWVBFX0hTVFNfRU5GT1JDRVIpKTsK KyAgICBBU1NFUlQoZW5mb3JjZXIpOwogCiAgICAgR1VuaXF1ZVB0cjxHTGlzdD4gcG9saWNpZXMo c291cF9oc3RzX2VuZm9yY2VyX2dldF9wb2xpY2llcyhlbmZvcmNlciwgRkFMU0UpKTsKICAgICBm b3IgKEdMaXN0KiBpdGVyID0gcG9saWNpZXMuZ2V0KCk7IGl0ZXIgIT0gbnVsbHB0cjsgaXRlciA9 IGl0ZXItPm5leHQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24uaAppbmRleCBjOGQ0ODQyMzE0YWMuLjliOWNi ODc0YjNkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L1NvdXBOZXR3b3JrU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24uaApAQCAtMjMsOCArMjMsNyBAQAogICogT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi0jaWZuZGVmIFNvdXBOZXR3b3JrU2Vzc2lvbl9oCi0jZGVmaW5lIFNvdXBO ZXR3b3JrU2Vzc2lvbl9oCisjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgPGdpby9naW8uaD4KICNp bmNsdWRlIDxnbGliLW9iamVjdC5oPgpAQCAtNTcsOCArNTYsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzZXRDb29raWVKYXIoU291cENvb2tpZUphciopOwogICAgIFNvdXBDb29raWVKYXIqIGNvb2tp ZUphcigpIGNvbnN0OwogCi0gICAgc3RhdGljIHZvaWQgc2V0SFNUU1BlcnNpc3RlbnRTdG9yYWdl KGNvbnN0IENTdHJpbmcmIGhzdHNTdG9yYWdlRGlyZWN0b3J5KTsKLSAgICB2b2lkIHNldHVwSFNU U0VuZm9yY2VyKCk7CisgICAgdm9pZCBzZXRIU1RTUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgU3Ry aW5nJiBoc3RzU3RvcmFnZURpcmVjdG9yeSk7CiAKICAgICBzdGF0aWMgdm9pZCBjbGVhck9sZFNv dXBDYWNoZShjb25zdCBTdHJpbmcmIGNhY2hlRGlyZWN0b3J5KTsKIApAQCAtODQsNSArODIsMyBA QCBwcml2YXRlOgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotCi0jZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggNTIyYzcyZGVhYzhiLi44MDZmOGQ5MTFmNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMjAtMDgtMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBJbml0aWFsaXplIEhTVFMgc3RvcmFnZSBkaXJlY3RvcnkgZnJv bSBuZXR3b3JrIHNlc3Npb24gaW5pdGlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTgwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbmV0d29yayBwcm9jZXNzIGluaXRp YWxpemF0aW9uLCBzaW5jZSBpdCdzIG5vdCBhY3R1YWxseSBhIGdsb2JhbCBzZXR0aW5nLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1NvdXAuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1By b2Nlc3MpOiBSZW1vdmUgY29kZSB0byBpbml0aWFsaXplIEhTVFMgc3RvcmFnZS4KKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9uU291cC5jcHA6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uU291cDo6TmV0d29ya1Nlc3Npb25Tb3VwKTogQ2FsbCBTb3Vw TmV0d29ya1Nlc3Npb246OnNldEhTVFNQZXJzaXN0ZW50U3RvcmFnZSgpIGlmIHRoZQorICAgICAg ICBwYXRoIGlzIG5vdCBtcGV0eS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0 V2ViQ29udGV4dC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQpOiBS ZW1vdmUgdGhlIG9kZSB0byBzZXQgdGhlIEhTVFMgc3RvcmFnZSBkaXJlY3RvcnkgYXMgcHJvY2Vz cyBwb29sIGNvbmZpZ3VyYXRpb24uCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5ldHdvcmtQcm9j ZXNzKTogSW5pdGlhbGl6ZSBoc3RzU3RvcmFnZURpcmVjdG9yeSBpbiBkZWZhdWx0IG5ldHdvcmsg c2Vzc2lvbiBwYXJhbWV0ZXJzLgorCiAyMDIwLTA4LTI0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaFRyYWNlcjogY29tLmFwcGxlLldlYktpdC5XZWJD b250ZW50IGF0IGNvbS5hcHBsZS5XZWJLaXQ6IFdlYktpdDo6UERGUGx1Z2luOjpjcmVhdGVTY3Jv bGxiYXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3 b3JrUHJvY2Vzc1NvdXAuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05l dHdvcmtQcm9jZXNzU291cC5jcHAKaW5kZXggYmFmOWJiOTIyMGYyLi40MWFmZGNjNjFhZGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vz c1NvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3Jr UHJvY2Vzc1NvdXAuY3BwCkBAIC0xMzgsMTIgKzEzOCw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6 OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKGNvbnN0IE5ldHdvcmtQcm9jZXNzQ3Jl YXRpCiAgICAgICAgIHVzZXJQcmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkKHBhcmFtZXRlcnMubGFu Z3VhZ2VzKTsKIAogICAgIHNldElnbm9yZVRMU0Vycm9ycyhwYXJhbWV0ZXJzLmlnbm9yZVRMU0Vy cm9ycyk7Ci0KLSAgICBpZiAoIXBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0 eSgpKQotICAgICAgICBTb3VwTmV0d29ya1Nlc3Npb246OnNldEhTVFNQZXJzaXN0ZW50U3RvcmFn ZShwYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5LnV0ZjgoKSk7Ci0gICAgZm9yRWFjaE5l dHdvcmtTZXNzaW9uKFtdKGNvbnN0IGF1dG8mIHNlc3Npb24pIHsKLSAgICAgICAgc3RhdGljX2Nh c3Q8Y29uc3QgTmV0d29ya1Nlc3Npb25Tb3VwJj4oc2Vzc2lvbikuc291cE5ldHdvcmtTZXNzaW9u KCkuc2V0dXBIU1RTRW5mb3JjZXIoKTsKLSAgICB9KTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPFdl YkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbj4gTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtQ3Jl YXRlRGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9uU291cC5jcHAKaW5kZXggOTA2 MTMzMzVlZmM4Li5mNTc1ZjNiNTkzOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCkBAIC01NSw2ICs1NSw5 IEBAIE5ldHdvcmtTZXNzaW9uU291cDo6TmV0d29ya1Nlc3Npb25Tb3VwKE5ldHdvcmtQcm9jZXNz JiBuZXR3b3JrUHJvY2VzcywgTmV0d29ya1NlCiAgICAgc3RvcmFnZVNlc3Npb24tPnNldENvb2tp ZU9ic2VydmVySGFuZGxlcihbdGhpc10gewogICAgICAgICB0aGlzLT5uZXR3b3JrUHJvY2Vzcygp LnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlcj4oKS0+bm90aWZ5Q29va2llc0RpZENoYW5nZSht X3Nlc3Npb25JRCk7CiAgICAgfSk7CisKKyAgICBpZiAoIXBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VE aXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICBtX25ldHdvcmtTZXNzaW9uLT5zZXRIU1RTUGVy c2lzdGVudFN0b3JhZ2UocGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeSk7CiB9CiAKIE5l dHdvcmtTZXNzaW9uU291cDo6fk5ldHdvcmtTZXNzaW9uU291cCgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IGU4 ZDI1ZjhiY2YyNC4uMjdiNzAwZmVjNWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtNDAyLDkgKzQwMiw2IEBA IHN0YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3Qp CiAgICAgaWYgKCFwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIpCiAgICAgICAgIHByaXYtPndlYnNp dGVEYXRhTWFuYWdlciA9IGFkb3B0R1JlZih3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfbmV3 KCJsb2NhbC1zdG9yYWdlLWRpcmVjdG9yeSIsIHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5k YXRhKCksIG51bGxwdHIpKTsKIAotICAgIGlmICghd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2Vy X2lzX2VwaGVtZXJhbChwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKQotICAgICAgICBj b25maWd1cmF0aW9uLnNldEhTVFNTdG9yYWdlRGlyZWN0b3J5KEZpbGVTeXN0ZW06OnN0cmluZ0Zy b21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24od2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dl dF9oc3RzX2NhY2hlX2RpcmVjdG9yeShwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKSk7 Ci0KICAgICBwcml2LT5wcm9jZXNzUG9vbCA9IFdlYlByb2Nlc3NQb29sOjpjcmVhdGUoY29uZmln dXJhdGlvbik7CiAgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldFByaW1hcnlEYXRhU3RvcmUod2Vi a2l0V2Vic2l0ZURhdGFNYW5hZ2VyR2V0RGF0YVN0b3JlKHByaXYtPndlYnNpdGVEYXRhTWFuYWdl ci5nZXQoKSkpOwogICAgIHByaXYtPnByb2Nlc3NQb29sLT5zZXRVc2VyTWVzc2FnZUhhbmRsZXIo W3dlYkNvbnRleHRdKFVzZXJNZXNzYWdlJiYgbWVzc2FnZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChVc2VyTWVzc2FnZSYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDc0YTM1Nzc4NjZkYy4uOTMyM2M2ZTE4 YjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC02 NTEsNiArNjUxLDEyIEBAIE5ldHdvcmtQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjplbnN1 cmVOZXR3b3JrUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3aXRoCiAgICAgICAgICAgICBwYXJh bWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVy cy5uZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBuZXR3b3JrQ2FjaGVEaXJlY3Rvcnk7CiAgICAgICAg ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUobmV0d29ya0NhY2hlRGlyZWN0b3J5 LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMuZGVmYXVsdERh dGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLm5ldHdvcmtDYWNoZURp cmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgICAgIH0KKworICAgICAgICBjb25zdCBhdXRv JiBoc3RzU3RvcmFnZURpcmVjdG9yeSA9IHdpdGhXZWJzaXRlRGF0YVN0b3JlLT5yZXNvbHZlZEhT VFNTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgICAgIGlmICghaHN0c1N0b3JhZ2VEaXJlY3Rvcnku aXNOdWxsKCkpIHsKKyAgICAgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFt ZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmhzdHNTdG9yYWdlRGlyZWN0b3J5ID0gaHN0 c1N0b3JhZ2VEaXJlY3Rvcnk7CisgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI YW5kbGUoaHN0c1N0b3JhZ2VEaXJlY3RvcnksIFNhbmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRX cml0ZSwgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lv blBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOworICAgICAg ICB9CiAgICAgfSBlbHNlIGlmIChtX3dlYnNpdGVEYXRhU3RvcmUpIHsKICAgICAgICAgZW5hYmxl UmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IG1fd2Vic2l0ZURhdGFTdG9yZS0+cmVzb3VyY2VMb2Fk U3RhdGlzdGljc0VuYWJsZWQoKTsKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNT KQpAQCAtNjc5LDYgKzY4NSwxMiBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9v bDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0aAogICAgICAgICAg ICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3JlUGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBh cmFtZXRlcnMubmV0d29ya0NhY2hlRGlyZWN0b3J5ID0gbmV0d29ya0NhY2hlRGlyZWN0b3J5Owog ICAgICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKG5ldHdvcmtDYWNoZURp cmVjdG9yeSwgU2FuZGJveEV4dGVuc2lvbjo6VHlwZTo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLmRl ZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5uZXR3b3Jr Q2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogICAgICAgICB9CisKKyAgICAgICAgY29u c3QgYXV0byYgaHN0c1N0b3JhZ2VEaXJlY3RvcnkgPSBtX3dlYnNpdGVEYXRhU3RvcmUtPnJlc29s dmVkSFNUU1N0b3JhZ2VEaXJlY3RvcnkoKTsKKyAgICAgICAgaWYgKCFoc3RzU3RvcmFnZURpcmVj dG9yeS5pc051bGwoKSkgeworICAgICAgICAgICAgcGFyYW1ldGVycy5kZWZhdWx0RGF0YVN0b3Jl UGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3Rvcnkg PSBoc3RzU3RvcmFnZURpcmVjdG9yeTsKKyAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNy ZWF0ZUhhbmRsZShoc3RzU3RvcmFnZURpcmVjdG9yeSwgU2FuZGJveEV4dGVuc2lvbjo6VHlwZTo6 UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5oc3RzU3RvcmFnZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Cisg ICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAoV2Vic2l0ZURhdGFTdG9yZTo6ZGVm YXVsdERhdGFTdG9yZUV4aXN0cygpKQogICAgICAgICAgICAgZW5hYmxlUmVzb3VyY2VMb2FkU3Rh dGlzdGljcyA9IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmUoKS0+cmVzb3VyY2VM b2FkU3RhdGlzdGljc0VuYWJsZWQoKTsK