167413 2017-01-25 02:43:18 -0800 [GTK] Add a private browsing mode to MiniBrowser 2017-01-25 08:57:28 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply lforschler oldest_to_newest 1269767 0 cgarcia 2017-01-25 02:43:18 -0800 Using the new API instead of the legacy setting. 1269768 1 299686 cgarcia 2017-01-25 02:50:14 -0800 Created attachment 299686 Patch 1269836 2 cgarcia 2017-01-25 08:57:28 -0800 Committed r211146: <http://trac.webkit.org/changeset/211146> 299686 2017-01-25 02:50:14 -0800 2017-01-25 08:44:36 -0800 Patch mb-private.diff text/plain 15099 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3Mzlh MGYzOWQ5Ny4uZDlhYTljY2Y5NTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxNy0wMS0yNSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQWRkIGEgcHJp dmF0ZSBicm93c2luZyBtb2RlIHRvIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc0MTMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgLXAvLS1wcml2YXRlIGNvbW1hbmQgbGluZSBv cHRpb24gdG8gY3JlYXRlIGEgcHJpdmF0ZSBpbnN0YW5jZS4gQWxzbyBhZGQgQ1RSTCtTSElGVCtQ IHNob3J0Y3V0IHRvIGNyZWF0ZQorICAgICAgICBwcml2YXRlIHdpbmRvd3MsIGV2ZW4gb24gbm9u LXByaXZhdGUgaW5zdGFuY2VzLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJX aW5kb3cuYzoKKyAgICAgICAgKHdlYlZpZXdUaXRsZUNoYW5nZWQpOiBBZGQgW1ByaXZhdGVdIHRv IHRpdGxlIHdpbmRvdyBmb3IgcHJpdmF0ZSB3aW5kb3dzLgorICAgICAgICAod2ViVmlld0NyZWF0 ZSk6IFBhc3Mgd2ViIGNvbnRleHQgdG8gYnJvd3Nlcl93aW5kb3dfbmV3LgorICAgICAgICAob3Bl blByaXZhdGVXaW5kb3cpOiBDcmVhdGUgYSBuZXcgZXBoZW1lcmFsIHdlYiB2aWV3IGFuZCBhZGQg aXQgdG8gYSBuZXcgd2luZG93LgorICAgICAgICAoYnJvd3NlcldpbmRvd0ZpbmFsaXplKTogRGlz Y29ubmVjdCB3ZWIgY29udGV4dCBzaWduYWwgaGFuZGxlcnMuCisgICAgICAgIChicm93c2VyX3dp bmRvd19pbml0KTogQWRkIHNob3J0Y3V0IGZvciBvcGVuaW5nIHByaXZhdGUgd2luZG93LgorICAg ICAgICAoYnJvd3Nlcl93aW5kb3dfbmV3KTogSXQgbm93IHJlY2VpdmVzIHRoZSBjb250ZXh0IGFu ZCBjb25uZWN0IHRvIGRvd25sb2FkLXN0YXJ0ZWQgaGVyZS4KKyAgICAgICAgKGJyb3dzZXJfd2lu ZG93X2dldF93ZWJfY29udGV4dCk6IFJldHVybiB0aGUgY29udGV4dC4KKyAgICAgICAgKiBNaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9t YWluLmM6CisgICAgICAgIChjcmVhdGVCcm93c2VyVGFiKTogQ3JlYXRlIHRoZSB3ZWIgdmlldyBm b3IgdGhlIHdpbmRvdyB3ZWIgY29udGV4dC4KKyAgICAgICAgKGFib3V0RGF0YVNjcmlwdE1lc3Nh Z2VSZWNlaXZlZENhbGxiYWNrKTogRG8gbm90IHVzZSB0aGUgZGVmYXVsdCB3ZWIgY29udGV4dCwg YnV0IHRoZSB3aW5kb3cgb25lLgorICAgICAgICAoYWJvdXREYXRhSGFuZGxlUmVxdWVzdCk6IERp dHRvLgorICAgICAgICAoYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2spOiBEaXR0by4KKyAg ICAgICAgKG1haW4pOiBDcmVhdGUgZXBoZW1lcmFsIHdlYiBjb250ZXh0IGlmIHByaXZhdGUgY29t bWFuZCBsaW5lIG9wdGlvbiBpcyB1c2VkLgorCiAyMDE3LTAxLTI0ICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgQVBJIHRvIGNy ZWF0ZSBlcGhlbWVyYWwgd2ViIHZpZXdzIGFuZCBkZXByZWNhdGUgdGhlIHByaXZhdGUgYnJvd3Np bmcgc2V0dGluZwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5k b3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggZjQzMjZk ZGE1OGUuLjZkMTI5NzVhYWQzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJv d3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMK QEAgLTQwLDYgKzQwLDggQEAKIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgR3RrV2luZG93 IHBhcmVudDsKIAorICAgIFdlYktpdFdlYkNvbnRleHQgKndlYkNvbnRleHQ7CisKICAgICBHdGtB Y2NlbEdyb3VwICphY2NlbEdyb3VwOwogICAgIEd0a1dpZGdldCAqbWFpbkJveDsKICAgICBHdGtX aWRnZXQgKnRvb2xiYXI7CkBAIC0xNTAsNyArMTUyLDEzIEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdV UklDaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMgKnBzcGVjLCBCcm93 c2VyCiBzdGF0aWMgdm9pZCB3ZWJWaWV3VGl0bGVDaGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZp ZXcsIEdQYXJhbVNwZWMgKnBzcGVjLCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7CiAgICAgY29u c3QgY2hhciAqdGl0bGUgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RpdGxlKHdlYlZpZXcpOwotICAg IGd0a193aW5kb3dfc2V0X3RpdGxlKEdUS19XSU5ET1cod2luZG93KSwgdGl0bGUgPyB0aXRsZSA6 IGRlZmF1bHRXaW5kb3dUaXRsZSk7CisgICAgaWYgKCF0aXRsZSkKKyAgICAgICAgdGl0bGUgPSBk ZWZhdWx0V2luZG93VGl0bGU7CisgICAgY2hhciAqcHJpdmF0ZVRpdGxlID0gTlVMTDsKKyAgICBp ZiAod2Via2l0X3dlYl92aWV3X2lzX2VwaGVtZXJhbCh3ZWJWaWV3KSkKKyAgICAgICAgcHJpdmF0 ZVRpdGxlID0gZ19zdHJkdXBfcHJpbnRmKCJbUHJpdmF0ZV0gJXMiLCB0aXRsZSk7CisgICAgZ3Rr X3dpbmRvd19zZXRfdGl0bGUoR1RLX1dJTkRPVyh3aW5kb3cpLCBwcml2YXRlVGl0bGUgPyBwcml2 YXRlVGl0bGUgOiB0aXRsZSk7CisgICAgZ19mcmVlKHByaXZhdGVUaXRsZSk7CiB9CiAKIHN0YXRp YyBnYm9vbGVhbiByZXNldEVudHJ5UHJvZ3Jlc3MoQnJvd3NlcldpbmRvdyAqd2luZG93KQpAQCAt Mjg3LDcgKzI5NSw3IEBAIHN0YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdDcmVhdGUoV2ViS2l0V2Vi VmlldyAqd2ViVmlldywgV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiAqCiAgICAgV2ViS2l0V2ViVmll dyAqbmV3V2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhf cmVsYXRlZF92aWV3KHdlYlZpZXcpKTsKICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdz KG5ld1dlYlZpZXcsIHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldykpOwogCi0g ICAgR3RrV2lkZ2V0ICpuZXdXaW5kb3cgPSBicm93c2VyX3dpbmRvd19uZXcoR1RLX1dJTkRPVyh3 aW5kb3cpKTsKKyAgICBHdGtXaWRnZXQgKm5ld1dpbmRvdyA9IGJyb3dzZXJfd2luZG93X25ldyhH VEtfV0lORE9XKHdpbmRvdyksIHdpbmRvdy0+d2ViQ29udGV4dCk7CiAgICAgYnJvd3Nlcl93aW5k b3dfYXBwZW5kX3ZpZXcoQlJPV1NFUl9XSU5ET1cobmV3V2luZG93KSwgbmV3V2ViVmlldyk7CiAg ICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAicmVhZHktdG8tc2hvdyIsIEdfQ0FMTEJB Q0sod2ViVmlld1JlYWR5VG9TaG93KSwgbmV3V2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0 KG5ld1dlYlZpZXcsICJydW4tYXMtbW9kYWwiLCBHX0NBTExCQUNLKHdlYlZpZXdSdW5Bc01vZGFs KSwgbmV3V2luZG93KTsKQEAgLTQ4NCw2ICs0OTIsMjAgQEAgc3RhdGljIHZvaWQgdG9nZ2xlV2Vi SW5zcGVjdG9yKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICBicm93c2VyX3RhYl90b2dnbGVf aW5zcGVjdG9yKHdpbmRvdy0+YWN0aXZlVGFiKTsKIH0KIAorc3RhdGljIHZvaWQgb3BlblByaXZh dGVXaW5kb3coQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAgIFdlYktpdFdlYlZpZXcgKndl YlZpZXcgPSBicm93c2VyX3RhYl9nZXRfd2ViX3ZpZXcod2luZG93LT5hY3RpdmVUYWIpOworICAg IFdlYktpdFdlYlZpZXcgKm5ld1dlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcoZ19vYmplY3RfbmV3 KFdFQktJVF9UWVBFX1dFQl9WSUVXLAorICAgICAgICAid2ViLWNvbnRleHQiLCB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X2NvbnRleHQod2ViVmlldyksCisgICAgICAgICJzZXR0aW5ncyIsIHdlYmtpdF93 ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldyksCisgICAgICAgICJ1c2VyLWNvbnRlbnQtbWFu YWdlciIsIHdlYmtpdF93ZWJfdmlld19nZXRfdXNlcl9jb250ZW50X21hbmFnZXIod2ViVmlldyks CisgICAgICAgICJpcy1lcGhlbWVyYWwiLCBUUlVFLAorICAgICAgICBOVUxMKSk7CisgICAgR3Rr V2lkZ2V0ICpuZXdXaW5kb3cgPSBicm93c2VyX3dpbmRvd19uZXcoR1RLX1dJTkRPVyh3aW5kb3cp LCB3aW5kb3ctPndlYkNvbnRleHQpOworICAgIGJyb3dzZXJfd2luZG93X2FwcGVuZF92aWV3KEJS T1dTRVJfV0lORE9XKG5ld1dpbmRvdyksIG5ld1dlYlZpZXcpOworICAgIGd0a193aWRnZXRfc2hv dyhHVEtfV0lER0VUKG5ld1dpbmRvdykpOworfQorCiBzdGF0aWMgdm9pZCByZWxvYWRQYWdlKEJy b3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gYnJv d3Nlcl90YWJfZ2V0X3dlYl92aWV3KHdpbmRvdy0+YWN0aXZlVGFiKTsKQEAgLTYwOCw2ICs2MzAs OSBAQCBzdGF0aWMgdm9pZCB0eXBpbmdBdHRyaWJ1dGVzQ2hhbmdlZChXZWJLaXRFZGl0b3JTdGF0 ZSAqZWRpdG9yU3RhdGUsIEdQYXJhbVNwZWMgKgogc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0Zp bmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiB7CiAgICAgQnJvd3NlcldpbmRvdyAqd2luZG93ID0g QlJPV1NFUl9XSU5ET1coZ09iamVjdCk7CisKKyAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25u ZWN0X21hdGNoZWQod2luZG93LT53ZWJDb250ZXh0LCBHX1NJR05BTF9NQVRDSF9EQVRBLCAwLCAw LCBOVUxMLCBOVUxMLCB3aW5kb3cpOworCiAgICAgaWYgKHdpbmRvdy0+ZmF2aWNvbikgewogICAg ICAgICBnX29iamVjdF91bnJlZih3aW5kb3ctPmZhdmljb24pOwogICAgICAgICB3aW5kb3ctPmZh dmljb24gPSBOVUxMOwpAQCAtODM5LDYgKzg2NCw4IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2lu ZG93X2luaXQoQnJvd3NlcldpbmRvdyAqd2luZG93KQogICAgICAgICBnX2NjbG9zdXJlX25ld19z d2FwKEdfQ0FMTEJBQ0sodG9nZ2xlV2ViSW5zcGVjdG9yKSwgd2luZG93LCBOVUxMKSk7CiAgICAg Z3RrX2FjY2VsX2dyb3VwX2Nvbm5lY3Qod2luZG93LT5hY2NlbEdyb3VwLCBHREtfS0VZX0YxMiwg MCwgR1RLX0FDQ0VMX1ZJU0lCTEUsCiAgICAgICAgIGdfY2Nsb3N1cmVfbmV3X3N3YXAoR19DQUxM QkFDSyh0b2dnbGVXZWJJbnNwZWN0b3IpLCB3aW5kb3csIE5VTEwpKTsKKyAgICBndGtfYWNjZWxf Z3JvdXBfY29ubmVjdCh3aW5kb3ctPmFjY2VsR3JvdXAsIEdES19LRVlfUCwgR0RLX0NPTlRST0xf TUFTSyB8IEdES19TSElGVF9NQVNLLCBHVEtfQUNDRUxfVklTSUJMRSwKKyAgICAgICAgZ19jY2xv c3VyZV9uZXdfc3dhcChHX0NBTExCQUNLKG9wZW5Qcml2YXRlV2luZG93KSwgd2luZG93LCBOVUxM KSk7CiAKICAgICAvKiBSZWxvYWQgcGFnZSAqLwogICAgIGd0a19hY2NlbF9ncm91cF9jb25uZWN0 KHdpbmRvdy0+YWNjZWxHcm91cCwgR0RLX0tFWV9GNSwgMCwgR1RLX0FDQ0VMX1ZJU0lCTEUsCkBA IC04OTAsOCArOTE3LDYgQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5pdChCcm93c2Vy V2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX2FjY2VsX2dyb3VwX2Nvbm5lY3Qod2luZG93LT5hY2Nl bEdyb3VwLCBHREtfS0VZX1AsIEdES19DT05UUk9MX01BU0ssIEdUS19BQ0NFTF9WSVNJQkxFLAog ICAgICAgICBnX2NjbG9zdXJlX25ld19zd2FwKEdfQ0FMTEJBQ0socHJpbnRQYWdlKSwgd2luZG93 LCBOVUxMKSk7CiAKLSAgICBnX3NpZ25hbF9jb25uZWN0KHdlYmtpdF93ZWJfY29udGV4dF9nZXRf ZGVmYXVsdCgpLCAiZG93bmxvYWQtc3RhcnRlZCIsIEdfQ0FMTEJBQ0soZG93bmxvYWRTdGFydGVk KSwgd2luZG93KTsKLQogICAgIEd0a1dpZGdldCAqdG9vbGJhciA9IGd0a190b29sYmFyX25ldygp OwogICAgIHdpbmRvdy0+dG9vbGJhciA9IHRvb2xiYXI7CiAgICAgZ3RrX29yaWVudGFibGVfc2V0 X29yaWVudGF0aW9uKEdUS19PUklFTlRBQkxFKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9S SVpPTlRBTCk7CkBAIC0xMDE3LDExICsxMDQyLDE1IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJfd2lu ZG93X2NsYXNzX2luaXQoQnJvd3NlcldpbmRvd0NsYXNzICprbGFzcykKIH0KIAogLyogUHVibGlj IEFQSS4gKi8KLUd0a1dpZGdldCAqYnJvd3Nlcl93aW5kb3dfbmV3KEd0a1dpbmRvdyAqcGFyZW50 KQorR3RrV2lkZ2V0ICpicm93c2VyX3dpbmRvd19uZXcoR3RrV2luZG93ICpwYXJlbnQsIFdlYktp dFdlYkNvbnRleHQgKndlYkNvbnRleHQpCiB7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9DT05URVhUKHdlYkNvbnRleHQpLCBOVUxMKTsKKwogICAgIEJyb3dzZXJXaW5k b3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9XKGdfb2JqZWN0X25ldyhCUk9XU0VSX1RZUEVfV0lO RE9XLAogICAgICAgICAidHlwZSIsIEdUS19XSU5ET1dfVE9QTEVWRUwsIE5VTEwpKTsKIAorICAg IHdpbmRvdy0+d2ViQ29udGV4dCA9IHdlYkNvbnRleHQ7CisgICAgZ19zaWduYWxfY29ubmVjdCh3 aW5kb3ctPndlYkNvbnRleHQsICJkb3dubG9hZC1zdGFydGVkIiwgR19DQUxMQkFDSyhkb3dubG9h ZFN0YXJ0ZWQpLCB3aW5kb3cpOwogICAgIGlmIChwYXJlbnQpIHsKICAgICAgICAgd2luZG93LT5w YXJlbnRXaW5kb3cgPSBwYXJlbnQ7CiAgICAgICAgIGdfb2JqZWN0X2FkZF93ZWFrX3BvaW50ZXIo R19PQkpFQ1QocGFyZW50KSwgKGdwb2ludGVyICopJndpbmRvdy0+cGFyZW50V2luZG93KTsKQEAg LTEwMzAsNiArMTA1OSwxMyBAQCBHdGtXaWRnZXQgKmJyb3dzZXJfd2luZG93X25ldyhHdGtXaW5k b3cgKnBhcmVudCkKICAgICByZXR1cm4gR1RLX1dJREdFVCh3aW5kb3cpOwogfQogCitXZWJLaXRX ZWJDb250ZXh0ICpicm93c2VyX3dpbmRvd19nZXRfd2ViX2NvbnRleHQoQnJvd3NlcldpbmRvdyAq d2luZG93KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEJST1dTRVJfSVNfV0lORE9XKHdp bmRvdyksIE5VTEwpOworCisgICAgcmV0dXJuIHdpbmRvdy0+d2ViQ29udGV4dDsKK30KKwogdm9p ZCBicm93c2VyX3dpbmRvd19hcHBlbmRfdmlldyhCcm93c2VyV2luZG93ICp3aW5kb3csIFdlYktp dFdlYlZpZXcgKndlYlZpZXcpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChCUk9XU0VSX0lTX1dJ TkRPVyh3aW5kb3cpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5oCmluZGV4IGVm ZTIzMjcxZjRkLi4xNWFiZDA2MTI5NSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3Rr L0Jyb3dzZXJXaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRv dy5oCkBAIC00NSw3ICs0NSw4IEBAIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyV2luZG93Q2xhc3Mg ICBCcm93c2VyV2luZG93Q2xhc3M7CiAKIEdUeXBlIGJyb3dzZXJfd2luZG93X2dldF90eXBlKHZv aWQpOwogCi1HdGtXaWRnZXQqIGJyb3dzZXJfd2luZG93X25ldyhHdGtXaW5kb3cqKTsKK0d0a1dp ZGdldCogYnJvd3Nlcl93aW5kb3dfbmV3KEd0a1dpbmRvdyosIFdlYktpdFdlYkNvbnRleHQqKTsK K1dlYktpdFdlYkNvbnRleHQqIGJyb3dzZXJfd2luZG93X2dldF93ZWJfY29udGV4dChCcm93c2Vy V2luZG93Kik7CiB2b2lkIGJyb3dzZXJfd2luZG93X2FwcGVuZF92aWV3KEJyb3dzZXJXaW5kb3cq LCBXZWJLaXRXZWJWaWV3Kik7CiB2b2lkIGJyb3dzZXJfd2luZG93X2xvYWRfdXJpKEJyb3dzZXJX aW5kb3cqLCBjb25zdCBjaGFyICp1cmkpOwogdm9pZCBicm93c2VyX3dpbmRvd19sb2FkX3Nlc3Np b24oQnJvd3NlcldpbmRvdyAqLCBjb25zdCBjaGFyICpzZXNzaW9uRmlsZSk7CmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21h aW4uYwppbmRleCA4YmI4N2I2NGQ5NC4uODQ0NmI0NjU0NTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwpA QCAtNDEsNiArNDEsNyBAQCBzdGF0aWMgR2RrUkdCQSAqYmFja2dyb3VuZENvbG9yOwogc3RhdGlj IGdib29sZWFuIGVkaXRvck1vZGU7CiBzdGF0aWMgY29uc3QgY2hhciAqc2Vzc2lvbkZpbGU7CiBz dGF0aWMgY2hhciAqZ2VvbWV0cnk7CitzdGF0aWMgZ2Jvb2xlYW4gcHJpdmF0ZU1vZGU7CiAKIHR5 cGVkZWYgZW51bSB7CiAgICAgTUlOSV9CUk9XU0VSX0VSUk9SX0lOVkFMSURfQUJPVVRfUEFUSApA QCAtNjIsOSArNjMsMTIgQEAgc3RhdGljIGdjaGFyICphcmd1bWVudFRvVVJMKGNvbnN0IGNoYXIg KmZpbGVuYW1lKQogCiBzdGF0aWMgV2ViS2l0V2ViVmlldyAqY3JlYXRlQnJvd3NlclRhYihCcm93 c2VyV2luZG93ICp3aW5kb3csIFdlYktpdFNldHRpbmdzICp3ZWJraXRTZXR0aW5ncywgV2ViS2l0 VXNlckNvbnRlbnRNYW5hZ2VyICp1c2VyQ29udGVudE1hbmFnZXIpCiB7Ci0gICAgV2ViS2l0V2Vi VmlldyAqd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhf dXNlcl9jb250ZW50X21hbmFnZXIodXNlckNvbnRlbnRNYW5hZ2VyKSk7Ci0gICAgaWYgKHdlYmtp dFNldHRpbmdzKQotICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKHdlYlZpZXcs IHdlYmtpdFNldHRpbmdzKTsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gV0VCS0lUX1dF Ql9WSUVXKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFVywKKyAgICAgICAgIndlYi1j b250ZXh0IiwgYnJvd3Nlcl93aW5kb3dfZ2V0X3dlYl9jb250ZXh0KHdpbmRvdyksCisgICAgICAg ICJzZXR0aW5ncyIsIHdlYmtpdFNldHRpbmdzLAorICAgICAgICAidXNlci1jb250ZW50LW1hbmFn ZXIiLCB1c2VyQ29udGVudE1hbmFnZXIsCisgICAgICAgIE5VTEwpKTsKKwogICAgIGlmIChlZGl0 b3JNb2RlKQogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X2VkaXRhYmxlKHdlYlZpZXcsIFRS VUUpOwogCkBAIC05MCw2ICs5NCw3IEBAIHN0YXRpYyBjb25zdCBHT3B0aW9uRW50cnkgY29tbWFu ZExpbmVPcHRpb25zW10gPQogICAgIHsgImVkaXRvci1tb2RlIiwgJ2UnLCAwLCBHX09QVElPTl9B UkdfTk9ORSwgJmVkaXRvck1vZGUsICJSdW4gaW4gZWRpdG9yIG1vZGUiLCBOVUxMIH0sCiAgICAg eyAic2Vzc2lvbi1maWxlIiwgJ3MnLCAwLCBHX09QVElPTl9BUkdfRklMRU5BTUUsICZzZXNzaW9u RmlsZSwgIlNlc3Npb24gZmlsZSIsICJGSUxFIiB9LAogICAgIHsgImdlb21ldHJ5IiwgJ2cnLCAw LCBHX09QVElPTl9BUkdfU1RSSU5HLCAmZ2VvbWV0cnksICJTZXQgdGhlIHNpemUgYW5kIHBvc2l0 aW9uIG9mIHRoZSB3aW5kb3cgKFdJRFRIeEhFSUdIVCtYK1kpIiwgIkdFT01FVFJZIiB9LAorICAg IHsgInByaXZhdGUiLCAncCcsIDAsIEdfT1BUSU9OX0FSR19OT05FLCAmcHJpdmF0ZU1vZGUsICJS dW4gaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlIiwgTlVMTCB9LAogICAgIHsgR19PUFRJT05fUkVN QUlOSU5HLCAwLCAwLCBHX09QVElPTl9BUkdfRklMRU5BTUVfQVJSQVksICZ1cmlBcmd1bWVudHMs IDAsICJbVVJM4oCmXSIgfSwKICAgICB7IDAsIDAsIDAsIDAsIDAsIDAsIDAgfQogfTsKQEAgLTI3 OCw3ICsyODMsNyBAQCBzdGF0aWMgdm9pZCB3ZWJzaXRlRGF0YUNsZWFyZWRDYWxsYmFjayhXZWJL aXRXZWJzaXRlRGF0YU1hbmFnZXIgKm1hbmFnZXIsIEdBc3luYwogICAgICAgICB3ZWJraXRfd2Vi X3ZpZXdfcmVsb2FkKHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3dlYl92aWV3KGRhdGFS ZXF1ZXN0LT5yZXF1ZXN0KSk7CiB9CiAKLXN0YXRpYyB2b2lkIGFib3V0RGF0YVNjcmlwdE1lc3Nh Z2VSZWNlaXZlZENhbGxiYWNrKFdlYktpdFVzZXJDb250ZW50TWFuYWdlciAqdXNlckNvbnRlbnRN YW5hZ2VyLCBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0ICptZXNzYWdlKQorc3RhdGljIHZvaWQgYWJv dXREYXRhU2NyaXB0TWVzc2FnZVJlY2VpdmVkQ2FsbGJhY2soV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyICp1c2VyQ29udGVudE1hbmFnZXIsIFdlYktpdEphdmFzY3JpcHRSZXN1bHQgKm1lc3NhZ2Us IFdlYktpdFdlYkNvbnRleHQgKndlYkNvbnRleHQpCiB7CiAgICAgSlNWYWx1ZVJlZiBqc1ZhbHVl ID0gd2Via2l0X2phdmFzY3JpcHRfcmVzdWx0X2dldF92YWx1ZShtZXNzYWdlKTsKICAgICBKU1N0 cmluZ1JlZiBqc1N0cmluZyA9IEpTVmFsdWVUb1N0cmluZ0NvcHkod2Via2l0X2phdmFzY3JpcHRf cmVzdWx0X2dldF9nbG9iYWxfY29udGV4dChtZXNzYWdlKSwganNWYWx1ZSwgTlVMTCk7CkBAIC0z MDcsNyArMzEyLDcgQEAgc3RhdGljIHZvaWQgYWJvdXREYXRhU2NyaXB0TWVzc2FnZVJlY2VpdmVk Q2FsbGJhY2soV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyICp1c2UKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlciAqbWFuYWdlciA9IHdlYmtpdF93 ZWJfY29udGV4dF9nZXRfd2Vic2l0ZV9kYXRhX21hbmFnZXIod2Via2l0X3dlYl9jb250ZXh0X2dl dF9kZWZhdWx0KCkpOworICAgIFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlciAqbWFuYWdlciA9IHdl YmtpdF93ZWJfY29udGV4dF9nZXRfd2Vic2l0ZV9kYXRhX21hbmFnZXIod2ViQ29udGV4dCk7CiAg ICAgZ3VpbnQ2NCB0eXBlcyA9IGdfYXNjaWlfc3RydG91bGwodG9rZW5zWzFdLCBOVUxMLCAxMCk7 CiAgICAgaWYgKHRva2VuQ291bnQgPT0gMikKICAgICAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9t YW5hZ2VyX2NsZWFyKG1hbmFnZXIsIHR5cGVzLCAwLCBOVUxMLCAoR0FzeW5jUmVhZHlDYWxsYmFj ayl3ZWJzaXRlRGF0YUNsZWFyZWRDYWxsYmFjaywgZGF0YVJlcXVlc3QpOwpAQCAtNDA3LDE0ICs0 MTIsMTQgQEAgc3RhdGljIHZvaWQgZ290V2Vic2l0ZURhdGFDYWxsYmFjayhXZWJLaXRXZWJzaXRl RGF0YU1hbmFnZXIgKm1hbmFnZXIsIEdBc3luY1Jlc3UKICAgICBnX2xpc3RfZnJlZV9mdWxsKGRh dGFMaXN0LCAoR0Rlc3Ryb3lOb3RpZnkpd2Via2l0X3dlYnNpdGVfZGF0YV91bnJlZik7CiB9CiAK LXN0YXRpYyB2b2lkIGFib3V0RGF0YUhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVxdWVz dCAqcmVxdWVzdCkKK3N0YXRpYyB2b2lkIGFib3V0RGF0YUhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJ U2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgV2ViS2l0V2ViQ29udGV4dCAqd2ViQ29udGV4dCkKIHsK ICAgICBBYm91dERhdGFSZXF1ZXN0ICpkYXRhUmVxdWVzdCA9IGFib3V0RGF0YVJlcXVlc3ROZXco cmVxdWVzdCk7Ci0gICAgV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyICptYW5hZ2VyID0gd2Via2l0 X3dlYl9jb250ZXh0X2dldF93ZWJzaXRlX2RhdGFfbWFuYWdlcih3ZWJraXRfd2ViX2NvbnRleHRf Z2V0X2RlZmF1bHQoKSk7CisgICAgV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyICptYW5hZ2VyID0g d2Via2l0X3dlYl9jb250ZXh0X2dldF93ZWJzaXRlX2RhdGFfbWFuYWdlcih3ZWJDb250ZXh0KTsK ICAgICB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZmV0Y2gobWFuYWdlciwgV0VCS0lUX1dF QlNJVEVfREFUQV9BTEwsIE5VTEwsIChHQXN5bmNSZWFkeUNhbGxiYWNrKWdvdFdlYnNpdGVEYXRh Q2FsbGJhY2ssIGRhdGFSZXF1ZXN0KTsKIH0KIAotc3RhdGljIHZvaWQgYWJvdXRVUklTY2hlbWVS ZXF1ZXN0Q2FsbGJhY2soV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCAqcmVxdWVzdCwgZ3BvaW50ZXIg dXNlckRhdGEpCitzdGF0aWMgdm9pZCBhYm91dFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayhXZWJL aXRVUklTY2hlbWVSZXF1ZXN0ICpyZXF1ZXN0LCBXZWJLaXRXZWJDb250ZXh0ICp3ZWJDb250ZXh0 KQogewogICAgIEdJbnB1dFN0cmVhbSAqc3RyZWFtOwogICAgIGdzaXplIHN0cmVhbUxlbmd0aDsK QEAgLTQzNCw3ICs0MzksNyBAQCBzdGF0aWMgdm9pZCBhYm91dFVSSVNjaGVtZVJlcXVlc3RDYWxs YmFjayhXZWJLaXRVUklTY2hlbWVSZXF1ZXN0ICpyZXF1ZXN0LCBncG9pbgogICAgICAgICB3ZWJr aXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBzdHJlYW0sIHN0cmVhbUxlbmd0 aCwgInRleHQvaHRtbCIpOwogICAgICAgICBnX29iamVjdF91bnJlZihzdHJlYW0pOwogICAgIH0g ZWxzZSBpZiAoIWdfc3RyY21wMChwYXRoLCAiZGF0YSIpKQotICAgICAgICBhYm91dERhdGFIYW5k bGVSZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICBhYm91dERhdGFIYW5kbGVSZXF1ZXN0KHJlcXVl c3QsIHdlYkNvbnRleHQpOwogICAgIGVsc2UgewogICAgICAgICBlcnJvciA9IGdfZXJyb3JfbmV3 KE1JTklfQlJPV1NFUl9FUlJPUiwgTUlOSV9CUk9XU0VSX0VSUk9SX0lOVkFMSURfQUJPVVRfUEFU SCwgIkludmFsaWQgYWJvdXQ6JXMgcGFnZS4iLCBwYXRoKTsKICAgICAgICAgd2Via2l0X3VyaV9z Y2hlbWVfcmVxdWVzdF9maW5pc2hfZXJyb3IocmVxdWVzdCwgZXJyb3IpOwpAQCAtNDQ5LDEwICs0 NTQsNiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGdfc2V0ZW52KCJX RUJLSVRfSU5KRUNURURfQlVORExFX1BBVEgiLCBXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEgs IEZBTFNFKTsKICNlbmRpZgogCi0gICAgY29uc3QgZ2NoYXIgKnNpbmdsZXByb2Nlc3MgPSBnX2dl dGVudigiTUlOSUJST1dTRVJfU0lOR0xFUFJPQ0VTUyIpOwotICAgIHdlYmtpdF93ZWJfY29udGV4 dF9zZXRfcHJvY2Vzc19tb2RlbCh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwgKHNp bmdsZXByb2Nlc3MgJiYgKnNpbmdsZXByb2Nlc3MpID8KLSAgICAgICAgV0VCS0lUX1BST0NFU1Nf TU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9DRVNTIDogV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVM VElQTEVfU0VDT05EQVJZX1BST0NFU1NFUyk7Ci0KICAgICBHT3B0aW9uQ29udGV4dCAqY29udGV4 dCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KE5VTEwpOwogICAgIGdfb3B0aW9uX2NvbnRleHRfYWRk X21haW5fZW50cmllcyhjb250ZXh0LCBjb21tYW5kTGluZU9wdGlvbnMsIDApOwogICAgIGdfb3B0 aW9uX2NvbnRleHRfYWRkX2dyb3VwKGNvbnRleHQsIGd0a19nZXRfb3B0aW9uX2dyb3VwKFRSVUUp KTsKQEAgLTQ3NCwxNiArNDc1LDIyIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10p CiAgICAgfQogICAgIGdfb3B0aW9uX2NvbnRleHRfZnJlZSAoY29udGV4dCk7CiAKKyAgICBXZWJL aXRXZWJDb250ZXh0ICp3ZWJDb250ZXh0ID0gcHJpdmF0ZU1vZGUgPyB3ZWJraXRfd2ViX2NvbnRl eHRfbmV3X2VwaGVtZXJhbCgpIDogd2Via2l0X3dlYl9jb250ZXh0X2dldF9kZWZhdWx0KCk7CisK KyAgICBjb25zdCBnY2hhciAqc2luZ2xlcHJvY2VzcyA9IGdfZ2V0ZW52KCJNSU5JQlJPV1NFUl9T SU5HTEVQUk9DRVNTIik7CisgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF9wcm9jZXNzX21vZGVs KHdlYkNvbnRleHQsIChzaW5nbGVwcm9jZXNzICYmICpzaW5nbGVwcm9jZXNzKSA/CisgICAgICAg IFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUyA6IFdFQktJVF9Q Uk9DRVNTX01PREVMX01VTFRJUExFX1NFQ09OREFSWV9QUk9DRVNTRVMpOworCiAgICAgLy8gRW5h YmxlIHRoZSBmYXZpY29uIGRhdGFiYXNlLCBieSBzcGVjaWZ5aW5nIHRoZSBkZWZhdWx0IGRpcmVj dG9yeS4KLSAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0 b3J5KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpLCBOVUxMKTsKKyAgICB3ZWJraXRf d2ViX2NvbnRleHRfc2V0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0b3J5KHdlYkNvbnRleHQsIE5V TEwpOwogCi0gICAgd2Via2l0X3dlYl9jb250ZXh0X3JlZ2lzdGVyX3VyaV9zY2hlbWUod2Via2l0 X3dlYl9jb250ZXh0X2dldF9kZWZhdWx0KCksIEJST1dTRVJfQUJPVVRfU0NIRU1FLCBhYm91dFVS SVNjaGVtZVJlcXVlc3RDYWxsYmFjaywgTlVMTCwgTlVMTCk7CisgICAgd2Via2l0X3dlYl9jb250 ZXh0X3JlZ2lzdGVyX3VyaV9zY2hlbWUod2ViQ29udGV4dCwgQlJPV1NFUl9BQk9VVF9TQ0hFTUUs IChXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2spYWJvdXRVUklTY2hlbWVSZXF1ZXN0Q2Fs bGJhY2ssIHdlYkNvbnRleHQsIE5VTEwpOwogCiAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy ICp1c2VyQ29udGVudE1hbmFnZXIgPSB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfbmV3KCk7 CiAgICAgd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlZ2lzdGVyX3NjcmlwdF9tZXNzYWdl X2hhbmRsZXIodXNlckNvbnRlbnRNYW5hZ2VyLCAiYWJvdXREYXRhIik7Ci0gICAgZ19zaWduYWxf Y29ubmVjdCh1c2VyQ29udGVudE1hbmFnZXIsICJzY3JpcHQtbWVzc2FnZS1yZWNlaXZlZDo6YWJv dXREYXRhIiwgR19DQUxMQkFDSyhhYm91dERhdGFTY3JpcHRNZXNzYWdlUmVjZWl2ZWRDYWxsYmFj ayksIE5VTEwpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QodXNlckNvbnRlbnRNYW5hZ2VyLCAic2Ny aXB0LW1lc3NhZ2UtcmVjZWl2ZWQ6OmFib3V0RGF0YSIsIEdfQ0FMTEJBQ0soYWJvdXREYXRhU2Ny aXB0TWVzc2FnZVJlY2VpdmVkQ2FsbGJhY2spLCB3ZWJDb250ZXh0KTsKIAotICAgIEJyb3dzZXJX aW5kb3cgKm1haW5XaW5kb3cgPSBCUk9XU0VSX1dJTkRPVyhicm93c2VyX3dpbmRvd19uZXcoTlVM TCkpOworICAgIEJyb3dzZXJXaW5kb3cgKm1haW5XaW5kb3cgPSBCUk9XU0VSX1dJTkRPVyhicm93 c2VyX3dpbmRvd19uZXcoTlVMTCwgd2ViQ29udGV4dCkpOwogICAgIGlmIChnZW9tZXRyeSkKICAg ICAgICAgZ3RrX3dpbmRvd19wYXJzZV9nZW9tZXRyeShHVEtfV0lORE9XKG1haW5XaW5kb3cpLCBn ZW9tZXRyeSk7CiAKQEAgLTUyMiw1ICs1MjksOCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq YXJndltdKQogCiAgICAgZ3RrX21haW4oKTsKIAorICAgIGlmIChwcml2YXRlTW9kZSkKKyAgICAg ICAgZ19vYmplY3RfdW5yZWYod2ViQ29udGV4dCk7CisKICAgICByZXR1cm4gMDsKIH0K