139642 2014-12-15 02:09:03 -0800 [EFL] Add logging domain for MiniBrowser 2014-12-16 02:23:35 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 g.czajkowski g.czajkowski commit-queue gyuyoung.kim lucas.de.marchi ossy ryuan.choi oldest_to_newest 1055583 0 g.czajkowski 2014-12-15 02:09:03 -0800 Similarly to EWebKit2, provide logging facility for MiniBrowser based on Eina Log module to have a convenient way to display all/subset/none messages for EFL based libraries and MiniBrowser. 1055584 1 243286 g.czajkowski 2014-12-15 02:12:37 -0800 Created attachment 243286 Patch 1055953 2 243286 gyuyoung.kim 2014-12-16 01:46:03 -0800 Comment on attachment 243286 Patch Nowadays EFL folks seem to want that EFL MiniBrowser supports many functions. However I think MiniBrowser is just a simple test application :) Anyway this patch looks fine. r=me. 1055960 3 243286 commit-queue 2014-12-16 02:23:29 -0800 Comment on attachment 243286 Patch Clearing flags on attachment: 243286 Committed r177357: <http://trac.webkit.org/changeset/177357> 1055961 4 commit-queue 2014-12-16 02:23:35 -0800 All reviewed patches have been landed. Closing bug. 243286 2014-12-15 02:12:37 -0800 2014-12-16 02:23:29 -0800 Patch bug-139642-20141215111323.patch text/plain 23388 g.czajkowski U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MjczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWZjYjliNWY2NDM0MTc1ZDFmYTE1MjUyNDg2YjE1MmUz YzBhNWEyOS4uNmZkYjI0NjMwODQ2ZDY4YjFkOTg1MDMzZDA4N2VmMTI0YmNkNGUxNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYw IEBACisyMDE0LTEyLTE1ICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIEFkZCBsb2dnaW5nIGRvbWFpbiBmb3IgTWluaUJyb3dz ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTY0 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbWls YXJseSB0byBFV2ViS2l0MiwgcHJvdmlkZSBsb2dnaW5nIGZhY2lsaXR5IGZvciBNaW5pQnJvd3Nl cgorICAgICAgICBiYXNlZCBvbiBFaW5hIExvZyBtb2R1bGUgdG8gaGF2ZSBhIGNvbnZlbmllbnQg d2F5IHRvIGRpc3BsYXkKKyAgICAgICAgYWxsL3N1YnNldC9ub25lIG1lc3NhZ2VzIGZvciBFRkwg YmFzZWQgbGlicmFyaWVzIGFuZCBNaW5pQnJvd3Nlci4KKworICAgICAgICBVc2FnZToKKyAgICAg ICAgMS4gRGlzYWJsZSBhbGwgbWVzc2FnZXM6CisgICAgICAgICAgIEVJTkFfTE9HX0xFVkVMPTAg Li9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlciAtLWVmbAorCisgICAgICAgIDIuIEVuYWJsZSBh bGwgbWVzc2FnZXM6CisgICAgICAgICAgIEVJTkFfTE9HX0xFVkVMPTcgLi9Ub29scy9TY3JpcHRz L3J1bi1sYXVuY2hlciAtLWVmbAorCisgICAgICAgIDMuIEVuYWJsZSBNaW5pQnJvd3NlciBhbmQg RVdlYmtpdDIgbWVzc2FnZXMgb25seToKKyAgICAgICAgICAgRUlOQV9MT0dfTEVWRUxTPSJtaW5p YnJvd3Nlcjo3LGV3ZWJraXQyOjciIC4vVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIgLS1lZmwK KworICAgICAgICBNb3JlIGluZm9ybWF0aW9uIGFuZCBleGFtcGxlcyB5b3UgY2FuIGZpbmQgaGVy ZToKKyAgICAgICAgaHR0cDovL2RvY3MuZW5saWdodGVubWVudC5vcmcvYXV0by9lZXQvdHV0b3Jp YWxfbG9nX3BhZ2UuaHRtbAorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAg ICAgICAgKG9uX21vdXNlX3doZWVsKToKKyAgICAgICAgKG9uX3dpbmRvd19yZXNpemUpOgorICAg ICAgICAoc2F2ZV9wYWdlX2NvbnRlbnRzX2NhbGxiYWNrKToKKyAgICAgICAgKHNjcmlwdF9leGVj dXRlX2NhbGxiYWNrKToKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX2Rvd25s b2FkX3JlcXVlc3QpOgorICAgICAgICAob25fZG93bmxvYWRfZmluaXNoZWQpOgorICAgICAgICAo b25fZG93bmxvYWRfZmFpbGVkKToKKyAgICAgICAgKHF1aXQpOgorICAgICAgICAob25fcmVmcmVz aF9idXR0b25fY2xpY2tlZCk6CisgICAgICAgIChvbl9zdG9wX2J1dHRvbl9jbGlja2VkKToKKyAg ICAgICAgKG5hdmlnYXRpb25fYnV0dG9uX2xvbmdwcmVzc19wcm9jZXNzKToKKyAgICAgICAgKG9u X3BvcHVwX21lbnVfaXRlbV9jbGlja2VkKToKKyAgICAgICAgKHBvcHVwX21lbnVfcG9wdWxhdGUp OgorICAgICAgICAob25fcG9wdXBfbWVudV9zaG93KToKKyAgICAgICAgKG9uX3dpbmRvd19jcmVh dGUpOgorICAgICAgICAoY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2IpOgorICAgICAgICAo Y29udGV4dF9tZW51X3BvcHVsYXRlKToKKyAgICAgICAgKG9uX2NvbnRleHRfbWVudV9zaG93KToK KyAgICAgICAgKG9uX2NvbnRleHRfbWVudV9oaWRlKToKKyAgICAgICAgKG9uX25hdmlnYXRpb25f cG9saWN5X2RlY2lzaW9uKToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgorICAgICAgICAocGFy c2VfY29va2llc19wb2xpY3kpOgorICAgICAgICAoZWxtX21haW4pOgorICAgICAgICAoaGFzX3Nj aGVtZSk6CisgICAgICAgIChsaXN0X2l0ZW1fbGFiZWxfZ2V0KToKKyAgICAgICAgKG9uX3BvcHVw X21lbnVfaGlkZSk6CisgICAgICAgIChvbl93aW5kb3dfY2xvc2UpOgorICAgICAgICAob25faG9t ZV9idXR0b25fY2xpY2tlZCk6CisgICAgICAgIFJlcGxhY2UgbG9jYWxseSBpbmZvKCkgbWFjcm8g d2l0aCBuZXdseSBpbnRyb2R1Y2VkCisgICAgICAgIG9uZSB3aGljaCB1c2VzIEVpbmEgTG9nIG1v ZHVsZS4gVGhlcmUgaXMgbm8gbG9naWMgY2hhbmdlLgorCiAyMDE0LTEyLTE0ICBBbmRyZWFzIEts aW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIFBhc3NSZWYgd2l0aCBS ZWYvUmVmJiYgYWNyb3NzIHRoZSBib2FyZC4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDUyMzc0NjI0 ODgyZWUwNWQ2MGRlMmMxNGNlNWVjNzRmZDVjNjkwNWQuLmY1MjU5ZDE5NjYzNDk1NjUwNjQ3YzZh OTg3NWI0ZjlmN2FkY2I3YWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWlu LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtMzcsMTMgKzM3LDYgQEAg c3RhdGljIGNvbnN0IGRvdWJsZSBUT09MVElQX0RFTEFZX1NFQ09ORFMgPSAxLjA7CiBzdGF0aWMg Y29uc3QgZG91YmxlIExPTkdQUkVTU19JTlRFUlZBTF9TRUNPTkRTID0gMS41Owogc3RhdGljIGNv bnN0IGRvdWJsZSBMSVNUX0lURU1fSEVJR0hUID0gMjQuMzU7CiAKLSNkZWZpbmUgaW5mbyhmb3Jt YXQsIGFyZ3MuLi4pICAgICAgIFwKLSAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICAgICAgaWYgKHZlcmJvc2UpICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIHBy aW50Zihmb3JtYXQiXG4iLCAjI2FyZ3MpOyBcCi0gICAgfSB3aGlsZSAoMCkKLQotc3RhdGljIGlu dCB2ZXJib3NlID0gMTsKIHN0YXRpYyBFaW5hX0xpc3QgKndpbmRvd3MgPSBOVUxMOwogc3RhdGlj IGNoYXIgKmV2YXNfZW5naW5lX25hbWUgPSBOVUxMOwogc3RhdGljIGNoYXIgKnVzZXJfYWdlbnRf c3RyaW5nID0gTlVMTDsKQEAgLTcwLDYgKzYzLDEwIEBAIHN0YXRpYyBFaW5hX0Jvb2wgbGVnYWN5 X2JlaGF2aW9yX2VuYWJsZWQgPSBFSU5BX0ZBTFNFOwogI2RlZmluZSBERUZBVUxUX1pPT01fTEVW RUwgNSAvLyBTZXQgZGVmYXVsdCB6b29tIGxldmVsIHRvIDEuMCAoaW5kZXggNSBvbiB6b29tTGV2 ZWxzKS4KIC8vIFRoZSB6b29tIHZhbHVlcyBhcmUgY2hvc2VuIHRvIGJlIGxpa2UgaW4gTW96aWxs YSBGaXJlZm94IDMuCiBjb25zdCBzdGF0aWMgZmxvYXQgem9vbUxldmVsc1tdID0gezAuMywgMC41 LCAwLjY3LCAwLjgsIDAuOSwgMS4wLCAxLjEsIDEuMiwgMS4zMywgMS41LCAxLjcsIDIuMCwgMi40 LCAzLjB9Oworc3RhdGljIGludCBfbG9nX2RvbWFpbl9pZCA9IC0xOworCisjZGVmaW5lIElORk8o Li4uKSBFSU5BX0xPR19ET01fSU5GTyhfbG9nX2RvbWFpbl9pZCwgX19WQV9BUkdTX18pCisjZGVm aW5lIEVSUk9SKC4uLikgRUlOQV9MT0dfRE9NX0VSUihfbG9nX2RvbWFpbl9pZCwgX19WQV9BUkdT X18pCiAKIHN0YXRpYyBFaW5hX0Jvb2wKIHpvb21fbGV2ZWxfc2V0KEV2YXNfT2JqZWN0ICp3ZWJ2 aWV3LCBpbnQgbGV2ZWwpCkBAIC0zMTYsMTAgKzMxMywxMCBAQCBvbl9tb3VzZV93aGVlbCh2b2lk ICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRf aW5mbwogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQpIHsKICAgICAgICAgaWYgKGV2LT56ID09 IC0xICYmIHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZl bCArIDEpKSB7CiAgICAgICAgICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCsrOwotICAg ICAgICAgICAgaW5mbygiWm9vbSBpbiAoQ3RybCArICdzY3JvbGwgdXAnKSB3YXMgcHJlc3NlZCwg em9vbSBsZXZlbCBiZWNhbWUgJS4yZiIsIHpvb21MZXZlbHNbd2luZG93LT5jdXJyZW50X3pvb21f bGV2ZWxdKTsKKyAgICAgICAgICAgIElORk8oIlpvb20gaW4gKEN0cmwgKyAnc2Nyb2xsIHVwJykg d2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+ Y3VycmVudF96b29tX2xldmVsXSk7CiAgICAgICAgIH0gZWxzZSBpZiAoZXYtPnogPT0gMSAmJiB6 b29tX2xldmVsX3NldChld2tfdmlldywgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwgLSAxKSkg ewogICAgICAgICAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwtLTsKLSAgICAgICAgICAg IGluZm8oIlpvb20gb3V0IChDdHJsICsgJ3Njcm9sbCBkb3duJykgd2FzIHByZXNzZWQsIHpvb20g bGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29tX2xldmVs XSk7CisgICAgICAgICAgICBJTkZPKCJab29tIG91dCAoQ3RybCArICdzY3JvbGwgZG93bicpIHdh cyBwcmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1 cnJlbnRfem9vbV9sZXZlbF0pOwogICAgICAgICB9CiAgICAgfQogfQpAQCAtMzMwLDcgKzMyNyw3 IEBAIG9uX3dpbmRvd19yZXNpemUodm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFzX09iamVj dCAqZWxtX3dpbmRvdywgdm9pZCAqZXZlbnRfCiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9 IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKIAogICAgIGlmICghd2luZG93KSB7Ci0gICAg ICAgIGluZm8oIkVSUk9SOiB3aW5kb3cgaXMgTlVMTC4iKTsKKyAgICAgICAgRVJST1IoIldpbmRv dyBpcyBOVUxMLiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00ODEsMjEgKzQ3OCwy MSBAQCBzdGF0aWMgdm9pZCBzYXZlX3BhZ2VfY29udGVudHNfY2FsbGJhY2soRXdrX1BhZ2VfQ29u dGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyCiAgICAgICAgIEVpbmFfU3RyYnVmICpmaWxlTmFt ZVdpdGhNaHQgPSBlaW5hX3N0cmJ1Zl9uZXcoKTsKICAgICAgICAgZWluYV9zdHJidWZfYXBwZW5k X3ByaW50ZihmaWxlTmFtZVdpdGhNaHQsICIlcy5taHQiLCBmaWxlTmFtZSk7CiAgICAgICAgIGVm ID0gZWV0X29wZW4oZWluYV9zdHJidWZfc3RyaW5nX2dldChmaWxlTmFtZVdpdGhNaHQpLCBFRVRf RklMRV9NT0RFX1dSSVRFKTsKLSAgICAgICAgaW5mbygiU2F2aW5nIGZpbGUgdG86ICVzIiwgZWlu YV9zdHJidWZfc3RyaW5nX2dldChmaWxlTmFtZVdpdGhNaHQpKTsKKyAgICAgICAgSU5GTygiU2F2 aW5nIGZpbGUgdG86ICVzIiwgZWluYV9zdHJidWZfc3RyaW5nX2dldChmaWxlTmFtZVdpdGhNaHQp KTsKICAgICAgICAgZWluYV9zdHJidWZfZnJlZShmaWxlTmFtZVdpdGhNaHQpOwogICAgIH0gZWxz ZSB7CiAgICAgICAgIGVmID0gZWV0X29wZW4oZmlsZU5hbWUsIEVFVF9GSUxFX01PREVfV1JJVEUp OwotICAgICAgICBpbmZvKCJTYXZpbmcgZmlsZSB0bzogJXMiLCBmaWxlTmFtZSk7CisgICAgICAg IElORk8oIlNhdmluZyBmaWxlIHRvOiAlcyIsIGZpbGVOYW1lKTsKICAgICB9CiAKICAgICBpZiAo IWVmKSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBDb3VsZCBub3QgY3JlYXRlIEZpbGUiKTsKKyAg ICAgICAgRVJST1IoIkNvdWxkIG5vdCBjcmVhdGUgRmlsZSIpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCiAgICAgZWV0X3dyaXRlKGVmLCAiTUhUTUwgZGF0YSIsIGRhdGEsIHN0cmxlbihkYXRh KSwgMCAvKiBjb21wcmVzcyAqLyk7CiAgICAgZWV0X2Nsb3NlKGVmKTsKLSAgICBpbmZvKCJTVUND RVNTOiBzYXZlZC4iKTsKKyAgICBJTkZPKCJTVUNDRVNTOiBzYXZlZC4iKTsKIAogICAgIGVpbmFf c3RyaW5nc2hhcmVfZGVsKGZpbGVOYW1lKTsKIH0KQEAgLTUwOSw3ICs1MDYsNyBAQCBzY3JpcHRf ZXhlY3V0ZV9jYWxsYmFjayhFdmFzX09iamVjdCAqZXdrX3ZpZXcsIGNvbnN0IGNoYXIgKnJldHVy bl92YWx1ZSwgdm9pZCAqdQogCiAgICAgaWYgKHJldHVybl92YWx1ZSkgewogICAgICAgICBlaW5h X3N0cmJ1Zl9hcHBlbmQodGV4dF9idWZmZXIsIHJldHVybl92YWx1ZSk7Ci0gICAgICAgIGluZm8o InNlbGVjdGVkIHRleHQgaXM6ICVzIiwgZWluYV9zdHJidWZfc3RyaW5nX2dldCh0ZXh0X2J1ZmZl cikpOworICAgICAgICBJTkZPKCJzZWxlY3RlZCB0ZXh0IGlzOiAlcyIsIGVpbmFfc3RyYnVmX3N0 cmluZ19nZXQodGV4dF9idWZmZXIpKTsKICAgICAgICAgZWxtX2VudHJ5X2VudHJ5X3NldCh3aW5k b3ctPnNlYXJjaC5zZWFyY2hfZmllbGQsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQodGV4dF9idWZm ZXIpKTsgICAKICAgICB9CiAgICAgZWluYV9zdHJidWZfZnJlZSh0ZXh0X2J1ZmZlcik7CkBAIC01 MzQsNTAgKzUzMSw1MCBAQCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2 YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICBFaW5hX0Jvb2wgc2hp ZnRQcmVzc2VkID0gZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KG1vZCwgIlNoaWZ0Iik7CiAKICAg ICBpZiAoIXN0cmNtcChldi0+a2V5LCAiTGVmdCIpICYmIGFsdFByZXNzZWQpIHsKLSAgICAgICAg aW5mbygiQmFjayAoQWx0K0xlZnQpIHdhcyBwcmVzc2VkIik7CisgICAgICAgIElORk8oIkJhY2sg KEFsdCtMZWZ0KSB3YXMgcHJlc3NlZCIpOwogICAgICAgICBpZiAoIWV3a192aWV3X2JhY2soZXdr X3ZpZXcpKQotICAgICAgICAgICAgaW5mbygiQmFjayBpZ25vcmVkOiBObyBiYWNrIGhpc3Rvcnki KTsKKyAgICAgICAgICAgIElORk8oIkJhY2sgaWdub3JlZDogTm8gYmFjayBoaXN0b3J5Iik7CiAg ICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJSaWdodCIpICYmIGFsdFByZXNzZWQpIHsK LSAgICAgICAgaW5mbygiRm9yd2FyZCAoQWx0K1JpZ2h0KSB3YXMgcHJlc3NlZCIpOworICAgICAg ICBJTkZPKCJGb3J3YXJkIChBbHQrUmlnaHQpIHdhcyBwcmVzc2VkIik7CiAgICAgICAgIGlmICgh ZXdrX3ZpZXdfZm9yd2FyZChld2tfdmlldykpCi0gICAgICAgICAgICBpbmZvKCJGb3J3YXJkIGln bm9yZWQ6IE5vIGZvcndhcmQgaGlzdG9yeSIpOworICAgICAgICAgICAgSU5GTygiRm9yd2FyZCBp Z25vcmVkOiBObyBmb3J3YXJkIGhpc3RvcnkiKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYt PmtleSwgIkhvbWUiKSAmJiBhbHRQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIkhvbWUgKEFsdCtI b21lKSB3YXMgcHJlc3NlZCIpOworICAgICAgICBJTkZPKCJIb21lIChBbHQrSG9tZSkgd2FzIHBy ZXNzZWQiKTsKICAgICAgICAgZXdrX3ZpZXdfdXJsX3NldCh3aW5kb3ctPmV3a192aWV3LCBERUZB VUxUX1VSTCk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMyIpKSB7CiAgICAg ICAgIGN1cnJlbnRFbmNvZGluZyA9IChjdXJyZW50RW5jb2RpbmcgKyAxKSAlIChzaXplb2YoZW5j b2RpbmdzKSAvIHNpemVvZihlbmNvZGluZ3NbMF0pKTsKLSAgICAgICAgaW5mbygiU2V0IGVuY29k aW5nIChGMykgcHJlc3NlZC4gTmV3IGVuY29kaW5nIHRvICVzIiwgZW5jb2RpbmdzW2N1cnJlbnRF bmNvZGluZ10pOworICAgICAgICBJTkZPKCJTZXQgZW5jb2RpbmcgKEYzKSBwcmVzc2VkLiBOZXcg ZW5jb2RpbmcgdG8gJXMiLCBlbmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CiAgICAgICAgIGV3 a192aWV3X2N1c3RvbV9lbmNvZGluZ19zZXQoZXdrX3ZpZXcsIGVuY29kaW5nc1tjdXJyZW50RW5j b2RpbmddKTsKICAgICB9IGVsc2UgaWYgKCghc3RyY21wKGV2LT5rZXksICJGNSIpICYmIGN0cmxQ cmVzc2VkKSB8fCAoIXN0cmNtcChldi0+a2V5LCAiciIpICYmIChzaGlmdFByZXNzZWQgJiBjdHJs UHJlc3NlZCkpKSB7Ci0gICAgICAgIGluZm8oIlJlbG9hZCBpZ25vcmluZyBjYWNoZSAoQ3RybCtG NSBvciBDdHJsK1NoaWZ0K3IpIHdhcyBwcmVzc2VkLCByZWxvYWRpbmcgYW5kIGJ5cGFzc2luZyBj YWNoZS4uLiIpOworICAgICAgICBJTkZPKCJSZWxvYWQgaWdub3JpbmcgY2FjaGUgKEN0cmwrRjUg b3IgQ3RybCtTaGlmdCtyKSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5nIGFuZCBieXBhc3NpbmcgY2Fj aGUuLi4iKTsKICAgICAgICAgZXdrX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZShld2tfdmlldyk7 CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNSIpIHx8ICghc3RyY21wKGV2LT5r ZXksICJyIikgJiYgY3RybFByZXNzZWQpKSB7Ci0gICAgICAgIGluZm8oIlJlbG9hZCAoRjUgb3Ig Q3RybCtyKSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5nLi4uIik7CisgICAgICAgIElORk8oIlJlbG9h ZCAoRjUgb3IgQ3RybCtyKSB3YXMgcHJlc3NlZCwgcmVsb2FkaW5nLi4uIik7CiAgICAgICAgIGV3 a192aWV3X3JlbG9hZChld2tfdmlldyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXks ICJGNiIpKSB7Ci0gICAgICAgIGluZm8oIlN0b3AgKEY2KSB3YXMgcHJlc3NlZCwgc3RvcCBsb2Fk aW5nLiIpOworICAgICAgICBJTkZPKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGlu Zy4iKTsKICAgICAgICAgZXdrX3ZpZXdfc3RvcChld2tfdmlldyk7CiAgICAgfSBlbHNlIGlmICgh c3RyY21wKGV2LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9k ZSA9ICBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192aWV3KTsKICAgICAgICAgbW9k ZSA9ICgrK21vZGUpICUgKEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCArIDEpOwog ICAgICAgICBpZiAoZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX3NldChld2tfdmlldywgbW9kZSkp Ci0gICAgICAgICAgICBpbmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNz ZWQsIGNoYW5nZWQgdG86ICVkIiwgbW9kZSk7CisgICAgICAgICAgICBJTkZPKCJDaGFuZ2UgUGFn aW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGNoYW5nZWQgdG86ICVkIiwgbW9kZSk7CiAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3 KSB3YXMgcHJlc3NlZCwgYnV0IE5PVCBjaGFuZ2VkISIpOworICAgICAgICAgICAgSU5GTygiQ2hh bmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBidXQgTk9UIGNoYW5nZWQhIik7 CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMTEiKSkgewotICAgICAgICBpbmZv KCJGdWxsc2NyZWVuIChGMTEpIHdhcyBwcmVzc2VkLCB0b2dnbGluZyB3aW5kb3cvZnVsbHNjcmVl bi4iKTsKKyAgICAgICAgSU5GTygiRnVsbHNjcmVlbiAoRjExKSB3YXMgcHJlc3NlZCwgdG9nZ2xp bmcgd2luZG93L2Z1bGxzY3JlZW4uIik7CiAgICAgICAgIGVsbV93aW5fZnVsbHNjcmVlbl9zZXQo d2luZG93LT5lbG1fd2luZG93LCAhZWxtX3dpbl9mdWxsc2NyZWVuX2dldCh3aW5kb3ctPmVsbV93 aW5kb3cpKTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJl c3NlZCkgewotICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJl c3NlZC4iKTsKKyAgICAgICAgSU5GTygiQ3JlYXRlIG5ldyB3aW5kb3cgKEN0cmwrbikgd2FzIHBy ZXNzZWQuIik7CiAgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRl KE5VTEwsIDAsIDApOwogICAgICAgICBld2tfdmlld191cmxfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcs IERFRkFVTFRfVVJMKTsKICAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQgaGVp Z2h0LgogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cp OwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2VkKSB7 Ci0gICAgICAgIGluZm8oIlNob3cgSW5zcGVjdG9yIChDdHJsK2kpIHdhcyBwcmVzc2VkLiIpOwor ICAgICAgICBJTkZPKCJTaG93IEluc3BlY3RvciAoQ3RybCtpKSB3YXMgcHJlc3NlZC4iKTsKICAg ICAgICAgZXdrX3ZpZXdfaW5zcGVjdG9yX3Nob3coZXdrX3ZpZXcpOwogICAgIH0gZWxzZSBpZiAo IXN0cmNtcChldi0+a2V5LCAiZiIpICYmIGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8oIlNo b3cgU2VhcmNoIEJveCAoQ3RybCtmKSB3YXMgcHJlc3NlZC4iKTsKKyAgICAgICAgSU5GTygiU2hv dyBTZWFyY2ggQm94IChDdHJsK2YpIHdhcyBwcmVzc2VkLiIpOwogICAgICAgICBjb25zdCBjaGFy IGdldF9kYXRhX3NjcmlwdFtdID0gIndpbmRvdy5nZXRTZWxlY3Rpb24oKS50b1N0cmluZygpOyI7 CiAgICAgICAgIGV3a192aWV3X3NjcmlwdF9leGVjdXRlKGV3a192aWV3LCBnZXRfZGF0YV9zY3Jp cHQsIHNjcmlwdF9leGVjdXRlX2NhbGxiYWNrLCAodm9pZCopKHdpbmRvdykpOwogICAgIH0gZWxz ZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKQEAgLTU5MiwyMSArNTg5LDIxIEBA IG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192 aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgKCFz dHJjbXAoZXYtPmtleSwgIm1pbnVzIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfU3VidHJhY3Qi KSkpIHsKICAgICAgICAgaWYgKHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJl bnRfem9vbV9sZXZlbCAtIDEpKQogICAgICAgICAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2 ZWwtLTsKLSAgICAgICAgaW5mbygiWm9vbSBvdXQgKEN0cmwgKyAnLScpIHdhcyBwcmVzc2VkLCB6 b29tIGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1cnJlbnRfem9vbV9s ZXZlbF0pOworICAgICAgICBJTkZPKCJab29tIG91dCAoQ3RybCArICctJykgd2FzIHByZXNzZWQs IHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29t X2xldmVsXSk7CiAgICAgfSBlbHNlIGlmIChjdHJsUHJlc3NlZCAmJiAoIXN0cmNtcChldi0+a2V5 LCAiZXF1YWwiKSB8fCAhc3RyY21wKGV2LT5rZXksICJLUF9BZGQiKSkpIHsKICAgICAgICAgaWYg KHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCArIDEp KQogICAgICAgICAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwrKzsKLSAgICAgICAgaW5m bygiWm9vbSBpbiAoQ3RybCArICcrJykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUu MmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29tX2xldmVsXSk7CisgICAgICAgIElO Rk8oIlpvb20gaW4gKEN0cmwgKyAnKycpIHdhcyBwcmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAl LjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbF0pOwogICAgIH0gZWxz ZSBpZiAoY3RybFByZXNzZWQgJiYgIXN0cmNtcChldi0+a2V5LCAiMCIpKSB7CiAgICAgICAgIGlm ICh6b29tX2xldmVsX3NldChld2tfdmlldywgREVGQVVMVF9aT09NX0xFVkVMKSkKICAgICAgICAg ICAgIHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsID0gREVGQVVMVF9aT09NX0xFVkVMOwotICAg ICAgICBpbmZvKCJab29tIHRvIGRlZmF1bHQgKEN0cmwgKyAnMCcpIHdhcyBwcmVzc2VkLCB6b29t IGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZl bF0pOworICAgICAgICBJTkZPKCJab29tIHRvIGRlZmF1bHQgKEN0cmwgKyAnMCcpIHdhcyBwcmVz c2VkLCB6b29tIGxldmVsIGJlY2FtZSAlLjJmIiwgem9vbUxldmVsc1t3aW5kb3ctPmN1cnJlbnRf em9vbV9sZXZlbF0pOwogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgIXN0cmNtcChldi0+ a2V5LCAicyIpKSB7CiAgICAgICAgIEVpbmFfU3RyYnVmICpkZWZhdWx0X2ZpbGUgPSBlaW5hX3N0 cmJ1Zl9uZXcoKTsKICAgICAgICAgY29uc3QgY2hhciAqaG9tZV9wYXRoID0gZ2V0ZW52KCJIT01F Iik7CiAgICAgICAgIGNvbnN0IGNoYXIgKnRpdGxlID0gZXdrX3ZpZXdfdGl0bGVfZ2V0KHdpbmRv dy0+ZXdrX3ZpZXcpOwogICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGRlZmF1bHRf ZmlsZSwgIiVzLyVzLm1odCIsIGhvbWVfcGF0aCA/IGhvbWVfcGF0aCA6ICIvaG9tZSIsIHRpdGxl ID8gdGl0bGUgOiAidGl0bGUiKTsKLSAgICAgICAgaW5mbygiUHJlc3NlZCAoQ1RSTCArIFMpIDog U2F2aW5nIEN1cnJlbnQgUGFnZS4iKTsKKyAgICAgICAgSU5GTygiUHJlc3NlZCAoQ1RSTCArIFMp IDogU2F2aW5nIEN1cnJlbnQgUGFnZS4iKTsKICAgICAgICAgRWluYV9TdHJpbmdzaGFyZSAqc2F2 ZV9maWxlX25hbWUgPSBzaG93X2ZpbGVfZW50cnlfZGlhbG9nKHdpbmRvdywgIlNBVkUiLCBlaW5h X3N0cmJ1Zl9zdHJpbmdfZ2V0KGRlZmF1bHRfZmlsZSkpOwogICAgICAgICBpZiAoIXNhdmVfZmls ZV9uYW1lKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtNjE5LDcgKzYxNiw3IEBAIG9uX2tleV9k b3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lk ICpldmVudF9pbmZvKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBFaW5hX1N0cmJ1ZiAq dXJpX3BhdGggPSBlaW5hX3N0cmJ1Zl9uZXcoKTsKICAgICAgICAgZWluYV9zdHJidWZfYXBwZW5k X3ByaW50Zih1cmlfcGF0aCwgImZpbGU6Ly8lcyIsIG9wZW5fZmlsZV9uYW1lKTsKLSAgICAgICAg aW5mbygicHJlc3NlZCAoQ1RSTCArIEwpIDogTG9hZGluZyBQYWdlICVzIiwgZWluYV9zdHJidWZf c3RyaW5nX2dldCh1cmlfcGF0aCkpOworICAgICAgICBJTkZPKCJwcmVzc2VkIChDVFJMICsgTCkg OiBMb2FkaW5nIFBhZ2UgJXMiLCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KHVyaV9wYXRoKSk7CiAg ICAgICAgIGV3a192aWV3X3VybF9zZXQoZXdrX3ZpZXcsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQo dXJpX3BhdGgpKTsKICAgICAgICAgZWluYV9zdHJidWZfZnJlZSh1cmlfcGF0aCk7CiAgICAgICAg IGVpbmFfc3RyaW5nc2hhcmVfZGVsKG9wZW5fZmlsZV9uYW1lKTsKQEAgLTc1OSwxNCArNzU2LDE0 IEBAIG9uX2Rvd25sb2FkX3JlcXVlc3Qodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqZXdr X3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIGNoYXIgKnVybCA9IE5VTEw7CiAgICAg ICAgIHVybCA9IGVpbmFfc3RyYnVmX3N0cmluZ19zdGVhbChkZXN0aW5hdGlvbl9wYXRoKTsKICAg ICAgICAgaWYgKG1rc3RlbXAodXJsKSA9PSAtMSkgewotICAgICAgICAgICAgaW5mbygiRVJST1I6 IENvdWxkIG5vdCBnZW5lcmF0ZSBhIHVuaXF1ZSBmaWxlIG5hbWUuIik7CisgICAgICAgICAgICBF UlJPUigiQ291bGQgbm90IGdlbmVyYXRlIGEgdW5pcXVlIGZpbGUgbmFtZS4iKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmQoZGVzdGlu YXRpb25fcGF0aCwgdXJsKTsKICAgICB9CiAKICAgICBld2tfZG93bmxvYWRfam9iX2Rlc3RpbmF0 aW9uX3NldChkb3dubG9hZCwgZWluYV9zdHJidWZfc3RyaW5nX2dldChkZXN0aW5hdGlvbl9wYXRo KSk7Ci0gICAgaW5mbygiRG93bmxvYWRpbmc6ICVzIiwgZWluYV9zdHJidWZfc3RyaW5nX2dldChk ZXN0aW5hdGlvbl9wYXRoKSk7CisgICAgSU5GTygiRG93bmxvYWRpbmc6ICVzIiwgZWluYV9zdHJi dWZfc3RyaW5nX2dldChkZXN0aW5hdGlvbl9wYXRoKSk7CiAgICAgZWluYV9zdHJidWZfZnJlZShk ZXN0aW5hdGlvbl9wYXRoKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChzYXZlX2ZpbGVfcGF0 aCk7CiB9CkBAIC04NDgsMTMgKzg0NSwxMyBAQCBzdGF0aWMgdm9pZAogb25fZG93bmxvYWRfZmlu aXNoZWQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50 X2luZm8pCiB7CiAgICAgRXdrX0Rvd25sb2FkX0pvYiAqZG93bmxvYWQgPSAoRXdrX0Rvd25sb2Fk X0pvYiAqKWV2ZW50X2luZm87Ci0gICAgaW5mbygiRG93bmxvYWQgZmluaXNoZWQ6ICVzIiwgIGV3 a19kb3dubG9hZF9qb2JfZGVzdGluYXRpb25fZ2V0KGRvd25sb2FkKSk7CisgICAgSU5GTygiRG93 bmxvYWQgZmluaXNoZWQ6ICVzIiwgIGV3a19kb3dubG9hZF9qb2JfZGVzdGluYXRpb25fZ2V0KGRv d25sb2FkKSk7CiB9CiAKIHN0YXRpYyB2b2lkCiBvbl9kb3dubG9hZF9mYWlsZWQodm9pZCAqdXNl cl9kYXRhLCBFdmFzX09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiB7Ci0gICAg aW5mbygiRG93bmxvYWQgZmFpbGVkISIpOworICAgIElORk8oIkRvd25sb2FkIGZhaWxlZCEiKTsK IH0KIAogc3RhdGljIHZvaWQKQEAgLTk4NywxMiArOTg0LDEzIEBAIG9uX2NvbG9yX3BpY2tlcl9y ZXF1ZXN0KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFd2tfQ29sb3JfUGlja2VyICpjb2xvcl9w aWNrZXIpCiBzdGF0aWMgaW50CiBxdWl0KEVpbmFfQm9vbCBzdWNjZXNzLCBjb25zdCBjaGFyICpt c2cpCiB7CisgICAgaWYgKG1zZykKKyAgICAgICAgc3VjY2VzcyA/IElORk8obXNnKSA6IEVSUk9S KG1zZyk7CisKKyAgICBlaW5hX2xvZ19kb21haW5fdW5yZWdpc3RlcihfbG9nX2RvbWFpbl9pZCk7 CiAgICAgZXdrX3NodXRkb3duKCk7CiAgICAgZWxtX3NodXRkb3duKCk7CiAKLSAgICBpZiAobXNn KQotICAgICAgICBmcHV0cyhtc2csIChzdWNjZXNzKSA/IHN0ZG91dCA6IHN0ZGVycik7Ci0KICAg ICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAKQEAgLTExODEs MTAgKzExNzksMTAgQEAgb25fcmVmcmVzaF9idXR0b25fY2xpY2tlZCh2b2lkICp1c2VyX2RhdGEs IEV2YXNfT2JqZWN0ICpyZWZyZXNoX2J1dHRvbiwgdm9pZCAqZXYKICAgICBFdmFzICpldmFzID0g ZXZhc19vYmplY3RfZXZhc19nZXQocmVmcmVzaF9idXR0b24pOwogICAgIEVpbmFfQm9vbCBjdHJs UHJlc3NlZCA9IGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldChldmFzX2tleV9tb2RpZmllcl9nZXQo ZXZhcyksICJDb250cm9sIik7CiAgICAgaWYgKGN0cmxQcmVzc2VkKSB7Ci0gICAgICAgIGluZm8o IlJlbG9hZGluZyBhbmQgYnlwYXNzaW5nIGNhY2hlLi4uIik7CisgICAgICAgIElORk8oIlJlbG9h ZGluZyBhbmQgYnlwYXNzaW5nIGNhY2hlLi4uIik7CiAgICAgICAgIGV3a192aWV3X3JlbG9hZF9i eXBhc3NfY2FjaGUod2luZG93LT5ld2tfdmlldyk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgaW5m bygiUmVsb2FkaW5nLi4uIik7CisgICAgICAgIElORk8oIlJlbG9hZGluZy4uLiIpOwogICAgICAg ICBld2tfdmlld19yZWxvYWQod2luZG93LT5ld2tfdmlldyk7CiAgICAgfQogfQpAQCAtMTE5NCw3 ICsxMTkyLDcgQEAgb25fc3RvcF9idXR0b25fY2xpY2tlZCh2b2lkICp1c2VyX2RhdGEsIEV2YXNf T2JqZWN0ICpzdG9wX2J1dHRvbiwgdm9pZCAqZXZlbnRfaW4KIHsKICAgICBCcm93c2VyX1dpbmRv dyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOwogCi0gICAgaW5mbygiU3Rv cCB3YXMgUHJlc3NlZC4gQWJvcnRpbmcgbG9hZC4uLiIpOworICAgIElORk8oIlN0b3Agd2FzIFBy ZXNzZWQuIEFib3J0aW5nIGxvYWQuLi4iKTsKICAgICBld2tfdmlld19zdG9wKHdpbmRvdy0+ZXdr X3ZpZXcpOwogfQogCkBAIC0xMjU0LDExICsxMjUyLDExIEBAIG5hdmlnYXRpb25fYnV0dG9uX2xv bmdwcmVzc19wcm9jZXNzKHZvaWQgKnVzZXJfZGF0YSwgRWluYV9Cb29sIGZvcndhcmRfbmF2aWdh dGlvCiAgICAgfQogCiAgICAgaXRlbV9jb3VudCA9IGVpbmFfbGlzdF9jb3VudCh3aW5kb3ctPmhp c3RvcnkuaGlzdG9yeV9saXN0X2l0ZW1zKTsKLSAgICBpbmZvKCJuYXZpZ2F0aW9uX2J1dHRvbl9s b25ncHJlc3NfcHJvY2VzcyA6IEl0ZW0gY291bnQgPSAlZCBmb3J3YXJkX25hdmlnYXRpb25fZW5h YmxlZCA9ICVkIiwgaXRlbV9jb3VudCwgZm9yd2FyZF9uYXZpZ2F0aW9uX2VuYWJsZWQpOworICAg IElORk8oIm5hdmlnYXRpb25fYnV0dG9uX2xvbmdwcmVzc19wcm9jZXNzIDogSXRlbSBjb3VudCA9 ICVkIGZvcndhcmRfbmF2aWdhdGlvbl9lbmFibGVkID0gJWQiLCBpdGVtX2NvdW50LCBmb3J3YXJk X25hdmlnYXRpb25fZW5hYmxlZCk7CiAKICAgICBFSU5BX0xJU1RfRk9SRUFDSCh3aW5kb3ctPmhp c3RvcnkuaGlzdG9yeV9saXN0X2l0ZW1zLCBsLCBkYXRhKSB7CiAgICAgICAgIHRpdGxlID0gZXdr X2JhY2tfZm9yd2FyZF9saXN0X2l0ZW1fdGl0bGVfZ2V0KGRhdGEpOwotICAgICAgICBpbmZvKCIg dGl0bGUgPSAlcyIsIHRpdGxlKTsKKyAgICAgICAgSU5GTygiIHRpdGxlID0gJXMiLCB0aXRsZSk7 CiAgICAgICAgIGVsbV9nZW5saXN0X2l0ZW1fYXBwZW5kKHdpbmRvdy0+aGlzdG9yeS5oaXN0b3J5 X2xpc3QsIGxpc3RfaXRlbSwgKHZvaWQgKikodGl0bGUpLCBOVUxMLCBFTE1fR0VOTElTVF9JVEVN X05PTkUsIG9uX2xpc3RfaXRlbV9zZWxlY3QsIGRhdGEpOwogICAgIH0KICAgICAKQEAgLTE0OTUs NyArMTQ5Myw3IEBAIG9uX3BvcHVwX21lbnVfaXRlbV9jbGlja2VkKHZvaWQgKnVzZXJfZGF0YSwg RXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICBCcm93c2VyX1dpbmRvdyAq d2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOwogICAgIEVsbV9PYmplY3RfSXRl bSAqaXRlbSA9IChFbG1fT2JqZWN0X0l0ZW0gKilldmVudF9pbmZvOwogCi0gICAgaW5mbygiU2Vs ZWN0ZWQgcG9wdXAgbWVudSBpbmRleDogJXUiLCBlbG1fbWVudV9pdGVtX2luZGV4X2dldChpdGVt KSk7CisgICAgSU5GTygiU2VsZWN0ZWQgcG9wdXAgbWVudSBpbmRleDogJXUiLCBlbG1fbWVudV9p dGVtX2luZGV4X2dldChpdGVtKSk7CiAgICAgZXdrX3BvcHVwX21lbnVfc2VsZWN0ZWRfaW5kZXhf c2V0KHdpbmRvdy0+cG9wdXAuZXdrX21lbnUsIGVsbV9tZW51X2l0ZW1faW5kZXhfZ2V0KGl0ZW0p KTsKIAogICAgIC8vIENsb3NlIHBvcHVwIG1lbnUuCkBAIC0xNTI5LDcgKzE1MjcsNyBAQCBwb3B1 cF9tZW51X3BvcHVsYXRlKEV2YXNfT2JqZWN0ICplbG1fbWVudSwgRXdrX1BvcHVwX01lbnUgKmV3 a19tZW51LCB2b2lkICp1c2VyXwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBpbmZvKCJVbnJlY29nbml6ZWQgcG9wdXAgbWVu dSBpdGVtIHR5cGUhIik7CisgICAgICAgICAgICBJTkZPKCJVbnJlY29nbml6ZWQgcG9wdXAgbWVu dSBpdGVtIHR5cGUhIik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KQEAg LTE1NDgsNyArMTU0Niw3IEBAIG9uX3BvcHVwX21lbnVfc2hvdyhFd2tfVmlld19TbWFydF9EYXRh ICpzbWFydERhdGEsIEVpbmFfUmVjdGFuZ2xlIHJlY3QsIEV3a19UZXh0CiAKICAgICBwb3B1cF9t ZW51X3BvcHVsYXRlKHdpbmRvdy0+cG9wdXAuZWxtX21lbnUsIGV3a19tZW51LCB3aW5kb3cpOwog Ci0gICAgaW5mbygiU2hvd2luZyBwb3B1cCBtZW51IGF0ICglZCwgJWQpIiwgcmVjdC54LCByZWN0 LnkpOworICAgIElORk8oIlNob3dpbmcgcG9wdXAgbWVudSBhdCAoJWQsICVkKSIsIHJlY3QueCwg cmVjdC55KTsKICAgICBlbG1fbWVudV9tb3ZlKHdpbmRvdy0+cG9wdXAuZWxtX21lbnUsIHJlY3Qu eCwgcmVjdC55KTsKICAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+cG9wdXAuZWxtX21lbnUp OwogCkBAIC0xNjgwLDcgKzE2NzgsNyBAQCBvbl93aW5kb3dfY3JlYXRlKEV3a19WaWV3X1NtYXJ0 X0RhdGEgKnNtYXJ0RGF0YSwgY29uc3QgRXdrX1dpbmRvd19GZWF0dXJlcyAqd2luZAogCiAgICAg d2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKIAotICAgIGluZm8o Im1pbmlicm93c2VyOiBsb2NhdGlvbiglZCwlZCkgc2l6ZT0oJWQsJWQpIiwgeCwgeSwgd2lkdGgs IGhlaWdodCk7CisgICAgSU5GTygibWluaWJyb3dzZXI6IGxvY2F0aW9uKCVkLCVkKSBzaXplPSgl ZCwlZCkiLCB4LCB5LCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgIHJldHVybiBuZXdfdmlldzsKIH0K QEAgLTE2OTYsMTIgKzE2OTQsMTIgQEAgc3RhdGljIHZvaWQKIGNvbnRleHRfbWVudV9pdGVtX3Nl bGVjdGVkX2NiKHZvaWQgKmRhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8p CiB7CiAgICAgaWYgKCFkYXRhKSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBjb250ZXh0IG1lbnUg Y2FsbGJhY2sgZGF0YSBpcyBOVUxMLiIpOworICAgICAgICBFUlJPUigiQ29udGV4dCBtZW51IGNh bGxiYWNrIGRhdGEgaXMgTlVMTC4iKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW0gPSAoRXdrX0NvbnRleHRfTWVudV9JdGVtICop ZGF0YTsKLSAgICBpbmZvKCJTZWxlY3RlZCBjb250ZXh0IG1lbnUgaXRlbTogJXMuIiwgZXdrX2Nv bnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSkpOworICAgIElORk8oIlNlbGVjdGVk IGNvbnRleHQgbWVudSBpdGVtOiAlcy4iLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0 KGV3a19pdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX3NlbGVjdChld2tfY29udGV4 dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGV3a19pdGVtKSwgZXdrX2l0ZW0pOwogICAgIGV3 a19jb250ZXh0X21lbnVfaGlkZShld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0 KGV3a19pdGVtKSk7CiB9CkBAIC0xNzEwLDcgKzE3MDgsNyBAQCBzdGF0aWMgdm9pZAogY29udGV4 dF9tZW51X3BvcHVsYXRlKEV2YXNfT2JqZWN0KiBjb250ZXh0X21lbnUsIEV3a19Db250ZXh0X01l bnUgKmV3a19tZW51LCBFbG1fT2JqZWN0X0l0ZW0gKnBhcmVudF9pdGVtKQogewogICAgIGlmICgh Y29udGV4dF9tZW51IHx8ICFld2tfbWVudSkgewotICAgICAgICBpbmZvKCJFUlJPUjogbmVjZXNz YXJ5IG9iamVjdHMgYXJlIE5VTEwuIik7CisgICAgICAgIEVSUk9SKCJOZWNlc3Nhcnkgb2JqZWN0 cyBhcmUgTlVMTC4iKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTc1MiwxNCArMTc1 MCwxNCBAQCBvbl9jb250ZXh0X21lbnVfc2hvdyhFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZh c19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19DbwogICAgIEJyb3dzZXJfV2luZG93ICp3aW5k b3cgPSB3aW5kb3dfZmluZF93aXRoX2V3a192aWV3KHNkLT5zZWxmKTsKIAogICAgIGlmICghd2lu ZG93IHx8ICFtZW51KSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0cyBh cmUgTlVMTC4iKTsKKyAgICAgICAgRVJST1IoIk5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLiIp OwogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9CiAKICAgICB3aW5kb3ctPmNvbnRl eHRfbWVudS5lbG1fbWVudSA9IGVsbV9tZW51X2FkZCh3aW5kb3ctPmVsbV93aW5kb3cpOwogCiAg ICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSkgewotICAgICAgICBpbmZvKCJF UlJPUjogY291bGQgbm90IGNyZWF0ZSBtZW51IHdpZGdldC4iKTsKKyAgICAgICAgRVJST1IoIkNv dWxkIG5vdCBjcmVhdGUgbWVudSB3aWRnZXQuIik7CiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNF OwogICAgIH0KIApAQCAtMTc2Nyw3ICsxNzY1LDcgQEAgb25fY29udGV4dF9tZW51X3Nob3coRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFd2tfQ28K IAogICAgIGNvbnRleHRfbWVudV9wb3B1bGF0ZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVu dSwgbWVudSwgTlVMTCk7CiAKLSAgICBpbmZvKCJTaG93aW5nIGNvbnRleHQgbWVudSBhdCAoJWQs ICVkKS4iLCB4LCB5KTsKKyAgICBJTkZPKCJTaG93aW5nIGNvbnRleHQgbWVudSBhdCAoJWQsICVk KS4iLCB4LCB5KTsKICAgICBlbG1fbWVudV9tb3ZlKHdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9t ZW51LCB4LCB5KTsKICAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9tZW51LmVs bV9tZW51KTsKIApAQCAtMTc4MCw3ICsxNzc4LDcgQEAgb25fY29udGV4dF9tZW51X2hpZGUoRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QpCiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRv d19maW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOwogCiAgICAgaWYgKCF3aW5kb3cgfHwgIXdp bmRvdy0+Y29udGV4dF9tZW51LmVsbV9tZW51KSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBuZWNl c3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC4iKTsKKyAgICAgICAgRVJST1IoIk5lY2Vzc2FyeSBvYmpl Y3RzIGFyZSBOVUxMLiIpOwogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9CiAKQEAg LTE5NjksNyArMTk2Nyw3IEBAIG9uX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uKHZvaWQgKnVz ZXJfZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mCiAgICAgICAgIEJyb3dz ZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIDAsIDApOwogICAgICAgICBl d2tfdmlld191cmxfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIGV3a191cmxfcmVxdWVzdF91cmxfZ2V0 KGV3a19uYXZpZ2F0aW9uX3BvbGljeV9yZXF1ZXN0X2dldChkZWNpc2lvbikpKTsKICAgICAgICAg d2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKLSAgICAgICAgaW5m bygiTW91c2UgbWlkZGxlIGJ1dHRvbiBwcmVzc2VkLCBvcGVuIGxpbmsgaW4gbmV3IHdpbmRvdyIp OworICAgICAgICBJTkZPKCJNb3VzZSBtaWRkbGUgYnV0dG9uIHByZXNzZWQsIG9wZW4gbGluayBp biBuZXcgd2luZG93Iik7CiAKICAgICAgICAgZXdrX25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9u X3JlamVjdChkZWNpc2lvbik7IAogICAgIH0KQEAgLTIwMDksNyArMjAwNyw3IEBAIHN0YXRpYyBC cm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBpbnQgd2lk dGgsIGludCBoZWlnaHQpCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IGNhbGxvYygx LCBzaXplb2YoQnJvd3Nlcl9XaW5kb3cpKTsKICAgICBpZiAoIXdpbmRvdykgewotICAgICAgICBp bmZvKCJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBicm93c2VyIHdpbmRvdy4iKTsKKyAgICAgICAg RVJST1IoIkNvdWxkIG5vdCBjcmVhdGUgYnJvd3NlciB3aW5kb3cuIik7CiAgICAgICAgIHJldHVy biBOVUxMOwogICAgIH0KIApAQCAtMjI1NCw3ICsyMjUyLDcgQEAgc3RhdGljIEJyb3dzZXJfV2lu ZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGludCB3aWR0aCwgaW50IGhl aWdodCkKICAgICBld2tfc2V0dGluZ3NfZW5jb2RpbmdfZGV0ZWN0b3JfZW5hYmxlZF9zZXQoc2V0 dGluZ3MsIGVuY29kaW5nX2RldGVjdG9yX2VuYWJsZWQpOwogICAgIGV3a19zZXR0aW5nc19mcmFt ZV9mbGF0dGVuaW5nX2VuYWJsZWRfc2V0KHNldHRpbmdzLCBmcmFtZV9mbGF0dGVuaW5nX2VuYWJs ZWQpOwogICAgIGV3a19zZXR0aW5nc19sb2NhbF9zdG9yYWdlX2VuYWJsZWRfc2V0KHNldHRpbmdz LCBsb2NhbF9zdG9yYWdlX2VuYWJsZWQpOwotICAgIGluZm8oIkhUTUw1IGxvY2FsIHN0b3JhZ2Ug aXMgJXMgZm9yIHRoaXMgdmlldy4iLCBsb2NhbF9zdG9yYWdlX2VuYWJsZWQgPyAiZW5hYmxlZCIg OiAiZGlzYWJsZWQiKTsKKyAgICBJTkZPKCJIVE1MNSBsb2NhbCBzdG9yYWdlIGlzICVzIGZvciB0 aGlzIHZpZXcuIiwgbG9jYWxfc3RvcmFnZV9lbmFibGVkID8gImVuYWJsZWQiIDogImRpc2FibGVk Iik7CiAgICAgZWxtX3dpbl9mdWxsc2NyZWVuX3NldCh3aW5kb3ctPmVsbV93aW5kb3csIGZ1bGxz Y3JlZW5fZW5hYmxlZCk7CiAgICAgZXdrX3NldHRpbmdzX2RldmVsb3Blcl9leHRyYXNfZW5hYmxl ZF9zZXQoc2V0dGluZ3MsIEVJTkFfVFJVRSk7CiAgICAgZXdrX3NldHRpbmdzX3ByZWZlcnJlZF9t aW5pbXVtX2NvbnRlbnRzX3dpZHRoX3NldChzZXR0aW5ncywgMCk7CkBAIC0yMzEzLDcgKzIzMTEs NyBAQCBwYXJzZV9jb29raWVzX3BvbGljeShjb25zdCBjaGFyICppbnB1dF9zdHJpbmcpCiAgICAg aWYgKCFzdHJjbXAoaW5wdXRfc3RyaW5nLCAibmV2ZXIiKSkKICAgICAgICAgcmV0dXJuIEVXS19D T09LSUVfQUNDRVBUX1BPTElDWV9ORVZFUjsKICAgICBpZiAoc3RyY21wKGlucHV0X3N0cmluZywg Im5vLXRoaXJkLXBhcnR5IikpCi0gICAgICAgIGluZm8oIlVucmVjb2duaXplZCB0eXBlIGZvciBj b29raWVzIHBvbGljeTogJXMuIiwgaW5wdXRfc3RyaW5nKTsKKyAgICAgICAgSU5GTygiVW5yZWNv Z25pemVkIHR5cGUgZm9yIGNvb2tpZXMgcG9saWN5OiAlcy4iLCBpbnB1dF9zdHJpbmcpOwogICAg IHJldHVybiBFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTk9fVEhJUkRfUEFSVFk7CiB9CiAKQEAg LTIzNzgsMTMgKzIzNzYsMTUgQEAgZWxtX21haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAg ICBpZiAoIWV3a19pbml0KCkpCiAgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAKKyAgICBf bG9nX2RvbWFpbl9pZCA9IGVpbmFfbG9nX2RvbWFpbl9yZWdpc3RlcigibWluaWJyb3dzZXIiLCBF SU5BX0NPTE9SX1lFTExPVyk7CisKICAgICBld2tfdmlld19zbWFydF9jbGFzc19zZXQobWluaUJy b3dzZXJWaWV3U21hcnRDbGFzcygpKTsKIAogICAgIGVjb3JlX2FwcF9hcmdzX3NldChhcmdjLCAo Y29uc3QgY2hhciAqKikgYXJndik7CiAgICAgYXJncyA9IGVjb3JlX2dldG9wdF9wYXJzZSgmb3B0 aW9ucywgdmFsdWVzLCBhcmdjLCBhcmd2KTsKIAogICAgIGlmIChhcmdzIDwgMCkKLSAgICAgICAg cmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgcGFyc2Ugb3B0aW9ucy5c biIpOworICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiQ291bGQgbm90IHBhcnNlIG9w dGlvbnMuIik7CiAKICAgICBpZiAocXVpdE9wdGlvbikKICAgICAgICAgcmV0dXJuIHF1aXQoRUlO QV9UUlVFLCBOVUxMKTsKQEAgLTI0MjQsNyArMjQyNCw3IEBAIGVsbV9tYWluKGludCBhcmdjLCBj aGFyICphcmd2W10pCiAKICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIDAsIDApOwog ICAgIGlmICghd2luZG93KQotICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiRVJST1I6 IGNvdWxkIG5vdCBjcmVhdGUgYnJvd3NlciB3aW5kb3cuXG4iKTsKKyAgICAgICAgcmV0dXJuIHF1 aXQoRUlOQV9GQUxTRSwgIkNvdWxkIG5vdCBjcmVhdGUgYnJvd3NlciB3aW5kb3cuIik7CiAKICAg ICBpZiAoYXJncyA8IGFyZ2MpIHsKICAgICAgICAgY2hhciAqdXJsID0gdXJsX2Zyb21fdXNlcl9p bnB1dChhcmd2W2FyZ3NdKTsK