From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 5162 invoked from network); 3 Nov 2020 22:09:09 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 3 Nov 2020 22:09:09 -0000 Content-Type: multipart/mixed; boundary="===============8680471053901343501==" MIME-Version: 1.0 Subject: =?utf8?q?=5BPR_PATCH=5D_ettercap=3A_update_to_0=2E8=2E3=2E1?= To: ml@inbox.vuxu.org From: ndowens Reply-to: ml@inbox.vuxu.org Message-ID: Date: Tue, 03 Nov 2020 23:09:09 +0100 List-Id: GitHub notification mails are now in MIME to allow UTF8. --===============8680471053901343501== Content-Type: text/plain; charset="utf8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IG5kb3dlbnMgYWdhaW5zdCBtYXN0ZXIgb24g dGhlIHZvaWQtcGFja2FnZXMgcmVwb3NpdG9yeQoKaHR0cHM6Ly9naXRodWIuY29tL25kb3dlbnMv dm9pZC1wYWNrYWdlcyBldHRlcmNhcApodHRwczovL2dpdGh1Yi5jb20vdm9pZC1saW51eC92b2lk LXBhY2thZ2VzL3B1bGwvMjYxMTUKCmV0dGVyY2FwOiB1cGRhdGUgdG8gMC44LjMuMQoKCkEgcGF0 Y2ggZmlsZSBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxpbnV4L3ZvaWQtcGFja2FnZXMv cHVsbC8yNjExNS5wYXRjaCBpcyBhdHRhY2hlZA== --===============8680471053901343501== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-ettercap-26115.patch" RnJvbSBiOGNjN2M3MTY2NzI4YzdjY2MwZmE5ZWJkNGQ1MmJlNmJmYzcyM2RiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXRoYW4gT3dlbnMgPG5kb3dlbnNAYXJ0aXhsaW51eC5vcmc+ CkRhdGU6IFR1ZSwgMyBOb3YgMjAyMCAxNjowODo1NSAtMDYwMApTdWJqZWN0OiBbUEFUQ0hdIGV0 dGVyY2FwOiB1cGRhdGUgdG8gMC44LjMuMQoKLS0tCiBzcmNwa2dzL2V0dGVyY2FwL3BhdGNoZXMv Q1ZFLTIwMTctNjQzMC5wYXRjaCB8ICA1NyAtLS0tLS0KIHNyY3BrZ3MvZXR0ZXJjYXAvcGF0Y2hl cy9DVkUtMjAxNy04MzY2LnBhdGNoIHwgMjAxIC0tLS0tLS0tLS0tLS0tLS0tLS0KIHNyY3BrZ3Mv ZXR0ZXJjYXAvcGF0Y2hlcy9saWJyZXNzbC5wYXRjaCAgICAgIHwgIDMxICsrKwogc3JjcGtncy9l dHRlcmNhcC90ZW1wbGF0ZSAgICAgICAgICAgICAgICAgICAgfCAgIDkgKy0KIDQgZmlsZXMgY2hh bmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjYyIGRlbGV0aW9ucygtKQogZGVsZXRlIG1vZGUgMTAw NjQ0IHNyY3BrZ3MvZXR0ZXJjYXAvcGF0Y2hlcy9DVkUtMjAxNy02NDMwLnBhdGNoCiBkZWxldGUg bW9kZSAxMDA2NDQgc3JjcGtncy9ldHRlcmNhcC9wYXRjaGVzL0NWRS0yMDE3LTgzNjYucGF0Y2gK IGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2V0dGVyY2FwL3BhdGNoZXMvbGlicmVzc2wucGF0 Y2gKCmRpZmYgLS1naXQgYS9zcmNwa2dzL2V0dGVyY2FwL3BhdGNoZXMvQ1ZFLTIwMTctNjQzMC5w YXRjaCBiL3NyY3BrZ3MvZXR0ZXJjYXAvcGF0Y2hlcy9DVkUtMjAxNy02NDMwLnBhdGNoCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiYzA5MGY1OTRlYS4uMDAwMDAwMDAwMDAKLS0tIGEv c3JjcGtncy9ldHRlcmNhcC9wYXRjaGVzL0NWRS0yMDE3LTY0MzAucGF0Y2gKKysrIC9kZXYvbnVs bApAQCAtMSw1NyArMCwwIEBACi1kaWZmIC0tZ2l0IGEvdXRpbHMvZXR0ZXJmaWx0ZXIvZWZfY29t cGlsZXIuYyBiL3V0aWxzL2V0dGVyZmlsdGVyL2VmX2NvbXBpbGVyLmMKLWluZGV4IGRiODc2NjM2 Li5kZGI3M2JkMyAxMDA2NDQKLS0tLSB1dGlscy9ldHRlcmZpbHRlci9lZl9jb21waWxlci5jCi0r KysgdXRpbHMvZXR0ZXJmaWx0ZXIvZWZfY29tcGlsZXIuYwotQEAgLTIzOSw3ICsyMzksOSBAQCBz aXplX3QgY29tcGlsZV90cmVlKHN0cnVjdCBmaWx0ZXJfb3AgKipmb3ApCi0gICAgc3RydWN0IGZp bHRlcl9vcCAqYXJyYXkgPSBOVUxMOwotICAgIHN0cnVjdCB1bmZvbGRfZWxtICp1ZTsKLSAKLS0g ICBCVUdfSUYodHJlZV9yb290ID09IE5VTEwpOwotKyAgIC8vIGludmFsaWQgZmlsZQotKyAgIGlm ICh0cmVlX3Jvb3QgPT0gTlVMTCkKLSsgICAgICByZXR1cm4gMDsKLSAgIAotICAgIGZwcmludGYo c3Rkb3V0LCAiIFVuZm9sZGluZyB0aGUgbWV0YS10cmVlICIpOwotICAgIGZmbHVzaChzdGRvdXQp OwotZGlmZiAtLWdpdCBhL3V0aWxzL2V0dGVyZmlsdGVyL2VmX21haW4uYyBiL3V0aWxzL2V0dGVy ZmlsdGVyL2VmX21haW4uYwotaW5kZXggYWU0NTkxMzQuLjQzMTA4NGI5IDEwMDY0NAotLS0tIHV0 aWxzL2V0dGVyZmlsdGVyL2VmX21haW4uYwotKysrIHV0aWxzL2V0dGVyZmlsdGVyL2VmX21haW4u YwotQEAgLTM5LDcgKzM5LDcgQEAgc3RydWN0IGdsb2JhbHMgKmdibHM7Ci0gCi0gaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKLSB7Ci0tCi0rICAgaW50IHJldF92YWx1ZSA9IDA7Ci0g ICAgZ2xvYmFsc19hbGxvYygpOwotICAgIC8qIGV0dGVyZmlsdGVyIGNvcHlyaWdodCAqLwotICAg IGZwcmludGYoc3Rkb3V0LCAiXG4iIEVDX0NPTE9SX0JPTEQgIiVzICVzIiBFQ19DT0xPUl9FTkQg IiBjb3B5cmlnaHQgJXMgJXNcblxuIiwgCi1AQCAtODQsOCArODQsMTIgQEAgaW50IG1haW4oaW50 IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKLSAgICAgICBmcHJpbnRmKHN0ZG91dCwgIlxuXG5UaGUgc2Ny aXB0IGNvbnRhaW5zIGVycm9ycy4uLlxuXG4iKTsKLSAgIAotICAgIC8qIHdyaXRlIHRvIGZpbGUg Ki8KLS0gICBpZiAod3JpdGVfb3V0cHV0KCkgIT0gRV9TVUNDRVNTKQotLSAgICAgIEZBVEFMX0VS Uk9SKCJDYW5ub3Qgd3JpdGUgb3V0cHV0IGZpbGUgKCVzKSIsIEdCTF9PUFRJT05TLT5vdXRwdXRf ZmlsZSk7Ci0rICAgcmV0X3ZhbHVlID0gd3JpdGVfb3V0cHV0KCk7Ci0rICAgaWYgKHJldF92YWx1 ZSA9PSAtRV9OT1RIQU5ETEVEKQotKyAgICAgIEZBVEFMX0VSUk9SKCJDYW5ub3Qgd3JpdGUgb3V0 cHV0IGZpbGUgKCVzKTogdGhlIGZpbHRlciBpcyBub3QgY29ycmVjdGx5IGhhbmRsZWQuIiwgR0JM X09QVElPTlMtPm91dHB1dF9maWxlKTsKLSsgICBlbHNlIGlmIChyZXRfdmFsdWUgPT0gLUVfSU5W QUxJRCkKLSsgICAgICBGQVRBTF9FUlJPUigiQ2Fubm90IHdyaXRlIG91dHB1dCBmaWxlICglcyk6 IHRoZSBmaWx0ZXIgZm9ybWF0IGlzIG5vdCBjb3JyZWN0LiAiLCBHQkxfT1BUSU9OUy0+b3V0cHV0 X2ZpbGUpOwotKwotICAgIGdsb2JhbHNfZnJlZSgpOwotICAgIHJldHVybiAwOwotIH0KLWRpZmYg LS1naXQgYS91dGlscy9ldHRlcmZpbHRlci9lZl9vdXRwdXQuYyBiL3V0aWxzL2V0dGVyZmlsdGVy L2VmX291dHB1dC5jCi1pbmRleCA1YWU1OTE5MC4uZmNmMTlmMDEgMTAwNjQ0Ci0tLS0gdXRpbHMv ZXR0ZXJmaWx0ZXIvZWZfb3V0cHV0LmMKLSsrKyB1dGlscy9ldHRlcmZpbHRlci9lZl9vdXRwdXQu YwotQEAgLTUxLDYgKzUxLDkgQEAgaW50IHdyaXRlX291dHB1dCh2b2lkKQotICAgIGlmIChmb3Ag PT0gTlVMTCkKLSAgICAgICByZXR1cm4gLUVfTk9USEFORExFRDsKLSAKLSsgICBpZiAobmluc3Qg PT0gMCkKLSsgICAgICByZXR1cm4gLUVfSU5WQUxJRDsKLSsKLSAgICAvKiBjcmVhdGUgdGhlIGZp bGUgKi8KLSAgICBmZCA9IG9wZW4oR0JMX09QVElPTlMtPm91dHB1dF9maWxlLCBPX0NSRUFUIHwg T19SRFdSIHwgT19UUlVOQyB8IE9fQklOQVJZLCAwNjQ0KTsKLSAgICBPTl9FUlJPUihmZCwgLTEs ICJDYW4ndCBjcmVhdGUgZmlsZSAlcyIsIEdCTF9PUFRJT05TLT5vdXRwdXRfZmlsZSk7CmRpZmYg LS1naXQgYS9zcmNwa2dzL2V0dGVyY2FwL3BhdGNoZXMvQ1ZFLTIwMTctODM2Ni5wYXRjaCBiL3Ny Y3BrZ3MvZXR0ZXJjYXAvcGF0Y2hlcy9DVkUtMjAxNy04MzY2LnBhdGNoCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCA0ZmZhMDliYzc2OC4uMDAwMDAwMDAwMDAKLS0tIGEvc3JjcGtncy9l dHRlcmNhcC9wYXRjaGVzL0NWRS0yMDE3LTgzNjYucGF0Y2gKKysrIC9kZXYvbnVsbApAQCAtMSwy MDEgKzAsMCBAQAotZGlmZiAtLWdpdCBhL0NNYWtlTGlzdHMudHh0IGIvQ01ha2VMaXN0cy50eHQK LWluZGV4IDkwMDUwNTkwLi44ZjdjN2MzNiAxMDA2NDQKLS0tLSBDTWFrZUxpc3RzLnR4dAotKysr IENNYWtlTGlzdHMudHh0Ci1AQCAtMTI2LDcgKzEyNiwyNyBAQCBpZihOT1QgRElTQUJMRV9SUEFU SCkKLSAgIHNldChDTUFLRV9JTlNUQUxMX1JQQVRIX1VTRV9MSU5LX1BBVEggVFJVRSkKLSAgIHNl dChDTUFLRV9NQUNPU1hfUlBBVEggMSkKLSBlbmRpZihOT1QgRElTQUJMRV9SUEFUSCkKLSsKLSsj IHNldCBnZW5lcmFsIGJ1aWxkIGZsYWdzIGZvciBkZWJ1ZyBidWlsZC10eXBlCi0gc2V0KENNQUtF X0NfRkxBR1NfREVCVUcgIi1PMCAtZ2dkYjMgLURERUJVRyAtV2FsbCAtV25vLXBvaW50ZXItc2ln biAtRF9GT1JUSUZZX1NPVVJDRT0yIC1XZm9ybWF0IC1XZm9ybWF0LXNlY3VyaXR5IC1XZXJyb3I9 Zm9ybWF0LXNlY3VyaXR5IC1XZXh0cmEgLVdyZWR1bmRhbnQtZGVjbHMiIENBQ0hFIFNUUklORyAi IiBGT1JDRSkKLSsjIGFwcGVuZCBBU0FOIGJ1aWxkIGZsYWdzIGlmIGNvbXBpbGVyIHZlcnNpb24g aGFzIHN1cHBvcnQKLStpZiAoIiR7Q01BS0VfQ19DT01QSUxFUl9JRH0iIFNUUkVRVUFMICJHTlUi KQotKyAgIGlmIChDTUFLRV9DX0NPTVBJTEVSX1ZFUlNJT04gVkVSU0lPTl9HUkVBVEVSIDQuOCkK LSsgICAgICBzZXQoQ01BS0VfQ19GTEFHU19ERUJVRyAiJHtDTUFLRV9DX0ZMQUdTX0RFQlVHfSAt ZnNhbml0aXplPWFkZHJlc3MgLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIiIENBQ0hFIFNUUklORyAi IiBGT1JDRSkKLSsgICAgICBtZXNzYWdlKCJCdWlsZGluZyB3aXRoIEFTQU4gc3VwcG9ydCAoR05V IGNvbXBpbGVyKSIpCi0rICAgZWxzZSAoQ01BS0VfQ19DT01QSUxFUl9WRVJTSU9OIFZFUlNJT05f R1JFQVRFUiA0LjgpCi0rICAgICAgbWVzc2FnZSgiQnVpbGRpbmcgd2l0aG91dCBBU0FOIHN1cHBv cnQgKEdOVSBjb21waWxlcikiKQotKyAgIGVuZGlmIChDTUFLRV9DX0NPTVBJTEVSX1ZFUlNJT04g VkVSU0lPTl9HUkVBVEVSIDQuOCkKLStlbHNlaWYgKCIke0NNQUtFX0NfQ09NUElMRVJfSUR9IiBT VFJFUVVBTCAiQ2xhbmciKQotKyAgIGlmIChDTUFLRV9DX0NPTVBJTEVSX1ZFUlNJT04gVkVSU0lP Tl9HUkVBVEVSIDMuMSkKLSsgICAgICBzZXQoQ01BS0VfQ19GTEFHU19ERUJVRyAiJHtDTUFLRV9D X0ZMQUdTX0RFQlVHfSAtZnNhbml0aXplPWFkZHJlc3MgLWZuby1vbWl0LWZyYW1lLXBvaW50ZXIi IENBQ0hFIFNUUklORyAiIiBGT1JDRSkKLSsgICAgICBtZXNzYWdlKCJCdWlsZGluZyB3aXRoIEFT QU4gc3VwcG9ydCAoQ2xhbmcgY29tcGlsZXIpIikKLSsgICBlbHNlaWYgKENNQUtFX0NfQ09NUElM RVJfVkVSU0lPTiBWRVJTSU9OX0dSRUFURVIgMy4xKQotKyAgICAgIG1lc3NhZ2UoIkJ1aWxkaW5n IHdpdGhvdXQgQVNBTiBzdXBwb3J0IChDbGFuZyBjb21waWxlcikiKQotKyAgIGVuZGlmIChDTUFL RV9DX0NPTVBJTEVSX1ZFUlNJT04gVkVSU0lPTl9HUkVBVEVSIDMuMSkKLStlbmRpZiAoIiR7Q01B S0VfQ19DT01QSUxFUl9JRH0iIFNUUkVRVUFMICJHTlUiKQotKwotKyMgc2V0IGJ1aWxkIGZsYWdz IGZvciByZWxlYXNlIGJ1aWxkLXR5cGUKLSBzZXQoQ01BS0VfQ19GTEFHU19SRUxFQVNFICItTzIg LXcgLURfRk9SVElGWV9TT1VSQ0U9MiIgQ0FDSEUgU1RSSU5HICIiIEZPUkNFKQotIAotIGlmKE9T X0RBUldJTikKLWRpZmYgLS1naXQgYS9pbmNsdWRlL2VjX3N0cmluZ3MuaCBiL2luY2x1ZGUvZWNf c3RyaW5ncy5oCi1pbmRleCBmNzkxNzM5ZC4uOWFkMjQ1ZWYgMTAwNjQ0Ci0tLS0gaW5jbHVkZS9l Y19zdHJpbmdzLmgKLSsrKyBpbmNsdWRlL2VjX3N0cmluZ3MuaAotQEAgLTQzLDcgKzQzLDcgQEAK LSAKLSBFQ19BUElfRVhURVJOIGludCBtYXRjaF9wYXR0ZXJuKGNvbnN0IGNoYXIgKnMsIGNvbnN0 IGNoYXIgKnBhdHRlcm4pOwotIEVDX0FQSV9FWFRFUk4gaW50IGJhc2U2NF9kZWNvZGUoY2hhciAq YnVmcGxhaW4sIGNvbnN0IGNoYXIgKmJ1ZmNvZGVkKTsKLS1FQ19BUElfRVhURVJOIGludCBzdHJl c2NhcGUoY2hhciAqZHN0LCBjaGFyICpzcmMpOwotK0VDX0FQSV9FWFRFUk4gaW50IHN0cmVzY2Fw ZShjaGFyICpkc3QsIGNoYXIgKnNyYywgc2l6ZV90IGxlbik7Ci0gRUNfQVBJX0VYVEVSTiBpbnQg c3RyX3JlcGxhY2UoY2hhciAqKnRleHQsIGNvbnN0IGNoYXIgKnMsIGNvbnN0IGNoYXIgKmQpOyAg IAotIEVDX0FQSV9FWFRFUk4gc2l6ZV90IHN0cmxlbl91dGY4KGNvbnN0IGNoYXIgKnMpOwotIEVD X0FQSV9FWFRFUk4gY2hhciAqIGVjX3N0cnRvayhjaGFyICpzLCBjb25zdCBjaGFyICpkZWxpbSwg Y2hhciAqKnB0cnB0cik7Ci1kaWZmIC0tZ2l0IGEvc3JjL2VjX2VuY3J5cHRpb24uYyBiL3NyYy9l Y19lbmNyeXB0aW9uLmMKLWluZGV4IDZjMDI1MjljLi4zZDUwNTYwMyAxMDA2NDQKLS0tLSBzcmMv ZWNfZW5jcnlwdGlvbi5jCi0rKysgc3JjL2VjX2VuY3J5cHRpb24uYwotQEAgLTIxOCw3ICsyMTgs NyBAQCBpbnQgc2V0X3dlcF9rZXkoY2hhciAqc3RyaW5nKQotIAotICAgIGlmICh0eXBlID09ICdz JykgewotICAgICAgIC8qIGVzY2FwZSB0aGUgc3RyaW5nIGFuZCBjaGVjayBpdHMgbGVuZ3RoICov Ci0tICAgICAgaWYgKHN0cmVzY2FwZSgoY2hhciAqKXRtcF93a2V5LCBwKSAhPSAoaW50KXRtcF93 a2V5X2xlbikKLSsgICAgICBpZiAoc3RyZXNjYXBlKChjaGFyICopdG1wX3drZXksIHAsIHN0cmxl bih0bXBfd2tleSkrMSkgIT0gKGludCl0bXBfd2tleV9sZW4pCi0gICAgIAkgIFNFTUlGQVRBTF9F UlJPUigiU3BlY2lmaWVkIFdFUCBrZXkgbGVuZ3RoIGRvZXMgbm90IG1hdGNoIHRoZSBnaXZlbiBz dHJpbmciKTsKLSAgICB9IGVsc2UgaWYgKHR5cGUgPT0gJ3AnKSB7Ci0gICAgICAgLyogY3JlYXRl IHRoZSBrZXkgZnJvbSB0aGUgcGFzc3BocmFzZSAqLwotZGlmZiAtLWdpdCBhL3NyYy9lY19zdHJp bmdzLmMgYi9zcmMvZWNfc3RyaW5ncy5jCi1pbmRleCA1MzU4Mzg1MS4uMjFiNzE5MjYgMTAwNjQ0 Ci0tLS0gc3JjL2VjX3N0cmluZ3MuYwotKysrIHNyYy9lY19zdHJpbmdzLmMKLUBAIC0xNjcsMTMg KzE2NywxNCBAQCBzdGF0aWMgaW50IGhleHRvaW50KGludCBjKQotIC8qIAotICAqIGNvbnZlcnQg dGhlIGVzY2FwZWQgc3RyaW5nIGludG8gYSBiaW5hcnkgb25lCi0gICovCi0taW50IHN0cmVzY2Fw ZShjaGFyICpkc3QsIGNoYXIgKnNyYykKLStpbnQgc3RyZXNjYXBlKGNoYXIgKmRzdCwgY2hhciAq c3JjLCBzaXplX3QgbGVuKQotIHsKLSAgICBjaGFyICAqb2xkZHN0ID0gZHN0OwotKyAgIGNoYXIg ICpvbGRzcmMgPSBzcmM7Ci0gICAgaW50ICAgYzsKLSAgICBpbnQgICB2YWw7Ci0gCi0tICAgd2hp bGUgKChjID0gKnNyYysrKSAhPSAnXDAnKSB7Ci0rICAgd2hpbGUgKChjID0gKnNyYysrKSAhPSAn XDAnICYmIChzaXplX3QpKHNyYyAtIG9sZHNyYykgPD0gbGVuKSB7Ci0gICAgICAgaWYgKGMgPT0g J1xcJykgewotICAgICAgICAgIHN3aXRjaCAoKGMgPSAqc3JjKyspKSB7Ci0gICAgICAgICAgICAg Y2FzZSAnXDAnOgotQEAgLTIxOCw5ICsyMTksMTEgQEAgaW50IHN0cmVzY2FwZShjaGFyICpkc3Qs IGNoYXIgKnNyYykKLSAgICAgICAgICAgICAgICAgICBpZiAoYyA+PSAnMCcgJiYgYyA8PSAnNycp Ci0gICAgICAgICAgICAgICAgICAgICAgdmFsID0gKHZhbCA8PCAzKSB8IChjIC0gJzAnKTsKLSAg ICAgICAgICAgICAgICAgICBlbHNlIAotLSAgICAgICAgICAgICAgICAgICAgIC0tc3JjOwotKyAg ICAgICAgICAgICAgICAgICAgIGlmIChzcmMgPiBvbGRzcmMpIC8qIHByb3RlY3QgYWdhaW5zdCBi dWZmZXIgdW5kZXJmbG93ICovCi0rICAgICAgICAgICAgICAgICAgICAgICAgLS1zcmM7Ci0gICAg ICAgICAgICAgICAgfSBlbHNlIAotLSAgICAgICAgICAgICAgICAgIC0tc3JjOwotKyAgICAgICAg ICAgICAgICAgIGlmIChzcmMgPiBvbGRzcmMpIC8qIHByb3RlY3QgYWdhaW5zdCBidWZmZXIgdW5k ZXJmbG93ICovCi0rICAgICAgICAgICAgICAgICAgICAgLS1zcmM7Ci0gICAgICAgICAgICAgICAg KmRzdCsrID0gKGNoYXIpIHZhbDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAKLUBAIC0yMzIs MTUgKzIzNSwxNyBAQCBpbnQgc3RyZXNjYXBlKGNoYXIgKmRzdCwgY2hhciAqc3JjKQotICAgICAg ICAgICAgICAgICAgICAgICAgYyA9IGhleHRvaW50KCpzcmMrKyk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBpZiAoYyA+PSAwKSAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbCA9ICh2 YWwgPDwgNCkgKyBjOwotLSAgICAgICAgICAgICAgICAgICAgICAgZWxzZSAKLS0gICAgICAgICAg ICAgICAgICAgICAgICAgIC0tc3JjOwotLSAgICAgICAgICAgICAgIH0gZWxzZSAKLS0gICAgICAg ICAgICAgICAgICAtLXNyYzsKLSsgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHNyYyA+ IG9sZHNyYykgLyogcHJvdGVjdCBhZ2FpbnN0IGJ1ZmZlciB1bmRlcmZsb3cgKi8KLSsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC0tc3JjOwotKyAgICAgICAgICAgICAgIH0gZWxzZSBpZiAo c3JjID4gb2xkc3JjKSAvKiBwcm90ZWN0IGFnYWluc3QgYnVmZmVyIHVuZGVyZmxvdyAqLwotKyAg ICAgICAgICAgICAgICAgICAgIC0tc3JjOwotICAgICAgICAgICAgICAgICpkc3QrKyA9IChjaGFy KSB2YWw7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgfQotLSAgICAgIH0gZWxz ZSBpZiAoYyA9PSA4IHx8IGMgPT0gMjYzKSAgLyogdGhlIGJhY2tzcGFjZSAqLwotLSAgICAgICAg IGRzdC0tOwotKyAgICAgIH0gZWxzZSBpZiAoYyA9PSA4IHx8IGMgPT0gMjYzKSB7ICAvKiB0aGUg YmFja3NwYWNlICovCi0rICAgICAgICAgaWYgKGRzdCA+IG9sZHNyYykgLyogcHJvdGVjdCBhZ2Fp bnN0IGJ1ZmZlciB1bmRlcmZsb3cgKi8KLSsgICAgICAgICAgICBkc3QtLTsKLSsgICAgICB9Ci0g ICAgICAgZWxzZQotICAgICAgICAgICpkc3QrKyA9IChjaGFyKSBjOwotICAgIH0KLWRpZmYgLS1n aXQgYS9zcmMvaW50ZXJmYWNlcy9jdXJzZXMvZWNfY3Vyc2VzX3ZpZXdfY29ubmVjdGlvbnMuYyBi L3NyYy9pbnRlcmZhY2VzL2N1cnNlcy9lY19jdXJzZXNfdmlld19jb25uZWN0aW9ucy5jCi1pbmRl eCBmYjUyMzMxYy4uMDExYzBlZGYgMTAwNjQ0Ci0tLS0gc3JjL2ludGVyZmFjZXMvY3Vyc2VzL2Vj X2N1cnNlc192aWV3X2Nvbm5lY3Rpb25zLmMKLSsrKyBzcmMvaW50ZXJmYWNlcy9jdXJzZXMvZWNf Y3Vyc2VzX3ZpZXdfY29ubmVjdGlvbnMuYwotQEAgLTYxNCw3ICs2MTQsNyBAQCBzdGF0aWMgdm9p ZCBpbmplY3RfdXNlcih2b2lkKQotICAgIHNpemVfdCBsZW47Ci0gCi0gICAgLyogZXNjYXBlIHRo ZSBzZXF1bmNlcyBpbiB0aGUgYnVmZmVyICovCi0tICAgbGVuID0gc3RyZXNjYXBlKChjaGFyKilp bmplY3RidWYsIChjaGFyKilpbmplY3RidWYpOwotKyAgIGxlbiA9IHN0cmVzY2FwZSgoY2hhciop aW5qZWN0YnVmLCAoY2hhciopaW5qZWN0YnVmLCBzdHJsZW4oaW5qZWN0YnVmKSsxKTsKLSAgICAK LSAgICAvKiBjaGVjayB3aGVyZSB0byBpbmplY3QgKi8KLSAgICBpZiAod2RnX2MxLT5mbGFncyAm IFdER19PQkpfRk9DVVNFRCkgewotZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2d0ay9lY19n dGtfdmlld19jb25uZWN0aW9ucy5jIGIvc3JjL2ludGVyZmFjZXMvZ3RrL2VjX2d0a192aWV3X2Nv bm5lY3Rpb25zLmMKLWluZGV4IGZhN2RmZGM1Li5iNTVlMTc1NSAxMDA2NDQKLS0tLSBzcmMvaW50 ZXJmYWNlcy9ndGsvZWNfZ3RrX3ZpZXdfY29ubmVjdGlvbnMuYwotKysrIHNyYy9pbnRlcmZhY2Vz L2d0ay9lY19ndGtfdmlld19jb25uZWN0aW9ucy5jCi1AQCAtMTYyNyw3ICsxNjI3LDcgQEAgc3Rh dGljIHZvaWQgZ3RrdWlfaW5qZWN0X3VzZXIoaW50IHNpZGUpCi0gICAgc2l6ZV90IGxlbjsKLSAg ICAgCi0gICAgLyogZXNjYXBlIHRoZSBzZXF1bmNlcyBpbiB0aGUgYnVmZmVyICovCi0tICAgbGVu ID0gc3RyZXNjYXBlKGluamVjdGJ1ZiwgaW5qZWN0YnVmKTsKLSsgICBsZW4gPSBzdHJlc2NhcGUo aW5qZWN0YnVmLCBpbmplY3RidWYsIHN0cmxlbihpbmplY3RidWYpKzEpOwotIAotICAgIC8qIGNo ZWNrIHdoZXJlIHRvIGluamVjdCAqLwotICAgIGlmIChzaWRlID09IDEgfHwgc2lkZSA9PSAyKSB7 Ci1kaWZmIC0tZ2l0IGEvdXRpbHMvZXR0ZXJmaWx0ZXIvZWZfZW5jb2RlLmMgYi91dGlscy9ldHRl cmZpbHRlci9lZl9lbmNvZGUuYwotaW5kZXggZDRiOTExMGMuLjdlMzU5ZTA2IDEwMDY0NAotLS0t IHV0aWxzL2V0dGVyZmlsdGVyL2VmX2VuY29kZS5jCi0rKysgdXRpbHMvZXR0ZXJmaWx0ZXIvZWZf ZW5jb2RlLmMKLUBAIC0xMzYsNyArMTM2LDggQEAgaW50IGVuY29kZV9jb25zdChjaGFyICpzdHJp bmcsIHN0cnVjdCBmaWx0ZXJfb3AgKmZvcCkKLSAgICAgICBmb3AtPm9wLnRlc3Quc3RyaW5nID0g KHVfY2hhciopc3RyZHVwKHN0cmluZyArIDEpOwotICAgICAgICAgIAotICAgICAgIC8qIGVzY2Fw ZSBpdCBpbiB0aGUgc3RydWN0dXJlICovCi0tICAgICAgZm9wLT5vcC50ZXN0LnNsZW4gPSBzdHJl c2NhcGUoKGNoYXIqKWZvcC0+b3AudGVzdC5zdHJpbmcsIChjaGFyKilmb3AtPm9wLnRlc3Quc3Ry aW5nKTsKLSsgICAgICBmb3AtPm9wLnRlc3Quc2xlbiA9IHN0cmVzY2FwZSgoY2hhciopZm9wLT5v cC50ZXN0LnN0cmluZywgCi0rICAgICAgICAgICAgKGNoYXIqKWZvcC0+b3AudGVzdC5zdHJpbmcs IHN0cmxlbihmb3AtPm9wLnRlc3Quc3RyaW5nKSsxKTsKLSAgICAgIAotICAgICAgIHJldHVybiBF X1NVQ0NFU1M7Ci0gICAgICAgCi1AQCAtMTg0LDcgKzE4NSw4IEBAIGludCBlbmNvZGVfZnVuY3Rp b24oY2hhciAqc3RyaW5nLCBzdHJ1Y3QgZmlsdGVyX29wICpmb3ApCi0gICAgICAgICAgICAgZm9w LT5vcGNvZGUgPSBGT1BfRlVOQzsKLSAgICAgICAgICAgICBmb3AtPm9wLmZ1bmMub3AgPSBGRlVO Q19TRUFSQ0g7Ci0gICAgICAgICAgICAgZm9wLT5vcC5mdW5jLnN0cmluZyA9ICh1X2NoYXIqKXN0 cmR1cChkZWNfYXJnc1sxXSk7Ci0tICAgICAgICAgICAgZm9wLT5vcC5mdW5jLnNsZW4gPSBzdHJl c2NhcGUoKGNoYXIqKWZvcC0+b3AuZnVuYy5zdHJpbmcsIChjaGFyKilmb3AtPm9wLmZ1bmMuc3Ry aW5nKTsKLSsgICAgICAgICAgICBmb3AtPm9wLmZ1bmMuc2xlbiA9IHN0cmVzY2FwZSgoY2hhciop Zm9wLT5vcC5mdW5jLnN0cmluZywgCi0rICAgICAgICAgICAgICAgICAgKGNoYXIqKWZvcC0+b3Au ZnVuYy5zdHJpbmcsIHN0cmxlbihmb3AtPm9wLmZ1bmMuc3RyaW5nKSsxKTsKLSAgICAgICAgICAg ICByZXQgPSBFX1NVQ0NFU1M7Ci0gICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgU0NSSVBU X0VSUk9SKCJVbmtub3duIG9mZnNldCAlcyAiLCBkZWNfYXJnc1swXSk7Ci1AQCAtMjAyLDcgKzIw NCw4IEBAIGludCBlbmNvZGVfZnVuY3Rpb24oY2hhciAqc3RyaW5nLCBzdHJ1Y3QgZmlsdGVyX29w ICpmb3ApCi0gICAgICAgICAgICAgZm9wLT5vcGNvZGUgPSBGT1BfRlVOQzsKLSAgICAgICAgICAg ICBmb3AtPm9wLmZ1bmMub3AgPSBGRlVOQ19SRUdFWDsKLSAgICAgICAgICAgICBmb3AtPm9wLmZ1 bmMuc3RyaW5nID0gKHVfY2hhciopc3RyZHVwKGRlY19hcmdzWzFdKTsKLS0gICAgICAgICAgICBm b3AtPm9wLmZ1bmMuc2xlbiA9IHN0cmVzY2FwZSgoY2hhciopZm9wLT5vcC5mdW5jLnN0cmluZywg KGNoYXIqKWZvcC0+b3AuZnVuYy5zdHJpbmcpOwotKyAgICAgICAgICAgIGZvcC0+b3AuZnVuYy5z bGVuID0gc3RyZXNjYXBlKChjaGFyKilmb3AtPm9wLmZ1bmMuc3RyaW5nLCAKLSsgICAgICAgICAg ICAgICAgICAoY2hhciopZm9wLT5vcC5mdW5jLnN0cmluZywgc3RybGVuKGZvcC0+b3AuZnVuYy5z dHJpbmcpKzEpOwotICAgICAgICAgICAgIHJldCA9IEVfU1VDQ0VTUzsKLSAgICAgICAgICB9IGVs c2UKLSAgICAgICAgICAgICBTQ1JJUFRfRVJST1IoIlVua25vd24gb2Zmc2V0ICVzICIsIGRlY19h cmdzWzBdKTsKLUBAIC0yNzIsOSArMjc1LDExIEBAIGludCBlbmNvZGVfZnVuY3Rpb24oY2hhciAq c3RyaW5nLCBzdHJ1Y3QgZmlsdGVyX29wICpmb3ApCi0gICAgICAgICAgLyogcmVwbGFjZSBhbHdh eXMgb3BlcmF0ZSBhdCBEQVRBIGxldmVsICovCi0gICAgICAgICAgZm9wLT5vcC5mdW5jLmxldmVs ID0gNTsKLSAgICAgICAgICBmb3AtPm9wLmZ1bmMuc3RyaW5nID0gKHVfY2hhciopc3RyZHVwKGRl Y19hcmdzWzBdKTsKLS0gICAgICAgICBmb3AtPm9wLmZ1bmMuc2xlbiA9IHN0cmVzY2FwZSgoY2hh ciopZm9wLT5vcC5mdW5jLnN0cmluZywgKGNoYXIqKWZvcC0+b3AuZnVuYy5zdHJpbmcpOwotKyAg ICAgICAgIGZvcC0+b3AuZnVuYy5zbGVuID0gc3RyZXNjYXBlKChjaGFyKilmb3AtPm9wLmZ1bmMu c3RyaW5nLCAKLSsgICAgICAgICAgICAgICAoY2hhciopZm9wLT5vcC5mdW5jLnN0cmluZywgc3Ry bGVuKGZvcC0+b3AuZnVuYy5zdHJpbmcpKzEpOwotICAgICAgICAgIGZvcC0+b3AuZnVuYy5yZXBs YWNlID0gKHVfY2hhciopc3RyZHVwKGRlY19hcmdzWzFdKTsKLS0gICAgICAgICBmb3AtPm9wLmZ1 bmMucmxlbiA9IHN0cmVzY2FwZSgoY2hhciopZm9wLT5vcC5mdW5jLnJlcGxhY2UsIChjaGFyKilm b3AtPm9wLmZ1bmMucmVwbGFjZSk7Ci0rICAgICAgICAgZm9wLT5vcC5mdW5jLnJsZW4gPSBzdHJl c2NhcGUoKGNoYXIqKWZvcC0+b3AuZnVuYy5yZXBsYWNlLCAKLSsgICAgICAgICAgICAgICAoY2hh ciopZm9wLT5vcC5mdW5jLnJlcGxhY2UsIHN0cmxlbihmb3AtPm9wLmZ1bmMucmVwbGFjZSkrMSk7 Ci0gICAgICAgICAgcmV0ID0gRV9TVUNDRVNTOwotICAgICAgIH0gZWxzZQotICAgICAgICAgIFND UklQVF9FUlJPUigiV3JvbmcgbnVtYmVyIG9mIGFyZ3VtZW50cyBmb3IgZnVuY3Rpb24gXCIlc1wi ICIsIG5hbWUpOwotQEAgLTMyOCw3ICszMzMsOCBAQCBpbnQgZW5jb2RlX2Z1bmN0aW9uKGNoYXIg KnN0cmluZywgc3RydWN0IGZpbHRlcl9vcCAqZm9wKQotICAgICAgIGlmIChuYXJncyA9PSAxKSB7 Ci0gICAgICAgICAgZm9wLT5vcC5mdW5jLm9wID0gRkZVTkNfTVNHOwotICAgICAgICAgIGZvcC0+ b3AuZnVuYy5zdHJpbmcgPSAodV9jaGFyKilzdHJkdXAoZGVjX2FyZ3NbMF0pOwotLSAgICAgICAg IGZvcC0+b3AuZnVuYy5zbGVuID0gc3RyZXNjYXBlKChjaGFyKilmb3AtPm9wLmZ1bmMuc3RyaW5n LCAoY2hhciopZm9wLT5vcC5mdW5jLnN0cmluZyk7Ci0rICAgICAgICAgZm9wLT5vcC5mdW5jLnNs ZW4gPSBzdHJlc2NhcGUoKGNoYXIqKWZvcC0+b3AuZnVuYy5zdHJpbmcsIAotKyAgICAgICAgICAg ICAgIChjaGFyKilmb3AtPm9wLmZ1bmMuc3RyaW5nLCBzdHJsZW4oZm9wLT5vcC5mdW5jLnN0cmlu ZykrMSk7Ci0gICAgICAgICAgcmV0ID0gRV9TVUNDRVNTOwotICAgICAgIH0gZWxzZQotICAgICAg ICAgIFNDUklQVF9FUlJPUigiV3JvbmcgbnVtYmVyIG9mIGFyZ3VtZW50cyBmb3IgZnVuY3Rpb24g XCIlc1wiICIsIG5hbWUpOwpkaWZmIC0tZ2l0IGEvc3JjcGtncy9ldHRlcmNhcC9wYXRjaGVzL2xp YnJlc3NsLnBhdGNoIGIvc3JjcGtncy9ldHRlcmNhcC9wYXRjaGVzL2xpYnJlc3NsLnBhdGNoCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi4xNWUwZDNjMWM5ZQotLS0gL2Rl di9udWxsCisrKyBiL3NyY3BrZ3MvZXR0ZXJjYXAvcGF0Y2hlcy9saWJyZXNzbC5wYXRjaApAQCAt MCwwICsxLDMxIEBACitGcm9tIGIyZjc2MzRjOWRiYzBlZjY4NjQwZjA1NzE3ODdkOTIzMDBlOWY5 ZjkgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBTdGVmYW4gU3Ryb2dpbiA8c3RlZmFu QHN0ZWlscy5vcmc+CitEYXRlOiBTYXQsIDE1IEF1ZyAyMDIwIDA3OjE4OjMxICswMzAwCitTdWJq ZWN0OiBbUEFUQ0hdIGVjX3NzbHdyYXA6IGZpeCBjb21waWxhdGlvbiB3aXRoIExpYnJlU1NMCisK K0Rpc2FibGUgdGFraW5nIG92ZXIgU05JIGV4dGVuc2lvbiBmcm9tIENsaWVudEhlbGxvIGFuZCBT U0wgY29uZmlndXJhdGlvbgorb3BlcmF0aW9ucyB1bnRpbCBMaWJyZVNTTCBzdXBwb3J0cyB0aGUg cmVxdWlyZWQgQVBJLgorCitGaXhlczogaHR0cHM6Ly9naXRodWIuY29tL0V0dGVyY2FwL2V0dGVy Y2FwL2lzc3Vlcy8xMDY4CistLS0KKyBzcmMvZWNfc3Nsd3JhcC5jIHwgNCArKy0tCisgMSBmaWxl IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBz cmMvZWNfc3Nsd3JhcC5jIHNyYy9lY19zc2x3cmFwLmMKK2luZGV4IGI5ZjI2YTE0Mi4uMWU0YzI0 ZmMxIDEwMDY0NAorLS0tIHNyYy9lY19zc2x3cmFwLmMKKysrKyBzcmMvZWNfc3Nsd3JhcC5jCitA QCAtNzEsMTEgKzcxLDExIEBACisgI2RlZmluZSBUTFNfc2VydmVyX21ldGhvZCBTU0x2MjNfc2Vy dmVyX21ldGhvZAorICNlbmRpZgorIAorLSNpZiAoT1BFTlNTTF9WRVJTSU9OX05VTUJFUiA+PSAw eDEwMTAwMDAwTCkKKysjaWYgKE9QRU5TU0xfVkVSU0lPTl9OVU1CRVIgPj0gMHgxMDEwMDAwMEwp ICYmICFkZWZpbmVkKExJQlJFU1NMX1ZFUlNJT05fTlVNQkVSKQorICNkZWZpbmUgSEFWRV9PUEVO U1NMXzFfMV8wCisgI2VuZGlmCisgCistI2lmIChPUEVOU1NMX1ZFUlNJT05fTlVNQkVSID49IDB4 MTAxMDEwMDBMKQorKyNpZiAoT1BFTlNTTF9WRVJTSU9OX05VTUJFUiA+PSAweDEwMTAxMDAwTCkg JiYgIWRlZmluZWQoTElCUkVTU0xfVkVSU0lPTl9OVU1CRVIpCisgI2RlZmluZSBIQVZFX09QRU5T U0xfMV8xXzEKKyAjZW5kaWYKKyAKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZXR0ZXJjYXAvdGVtcGxh dGUgYi9zcmNwa2dzL2V0dGVyY2FwL3RlbXBsYXRlCmluZGV4IDc3MmMwNzNiNmQyLi4wYTA5NmY0 YWQ1NyAxMDA2NDQKLS0tIGEvc3JjcGtncy9ldHRlcmNhcC90ZW1wbGF0ZQorKysgYi9zcmNwa2dz L2V0dGVyY2FwL3RlbXBsYXRlCkBAIC0xLDE4ICsxLDE5IEBACiAjIFRlbXBsYXRlIGZpbGUgZm9y ICdldHRlcmNhcCcKIHBrZ25hbWU9ZXR0ZXJjYXAKLXZlcnNpb249MC44LjIKLXJldmlzaW9uPTE0 Cit2ZXJzaW9uPTAuOC4zLjEKK3JldmlzaW9uPTEKIGJ1aWxkX3N0eWxlPWNtYWtlCiBjb25maWd1 cmVfYXJncz0iLURFTkFCTEVfR1RLPU9GRiIKIGhvc3RtYWtlZGVwZW5kcz0iZmxleCIKLW1ha2Vk ZXBlbmRzPSJuY3Vyc2VzLWRldmVsIGxpYnJlc3NsLWRldmVsIGxpYmN1cmwtZGV2ZWwgbGlibHRk bC1kZXZlbCBsaWJuZXQtZGV2ZWwgbGlicGNhcC1kZXZlbCBwY3JlLWRldmVsIgorbWFrZWRlcGVu ZHM9Imdlb2lwLWRldmVsIG5jdXJzZXMtZGV2ZWwgbGlicmVzc2wtZGV2ZWwgbGliY3VybC1kZXZl bAorIGxpYmx0ZGwtZGV2ZWwgbGlibmV0LWRldmVsIGxpYnBjYXAtZGV2ZWwgcGNyZS1kZXZlbCIK IGNvbmZfZmlsZXM9Ii9ldGMvJHtwa2duYW1lfS9ldHRlci5jb25mIgogc2hvcnRfZGVzYz0iTmV0 d29yayBzbmlmZmVyL2ludGVyY2VwdG9yL2xvZ2dlciBmb3IgZXRoZXJuZXQgTEFOcyIKIG1haW50 YWluZXI9Ik9ycGhhbmVkIDxvcnBoYW5Adm9pZGxpbnV4Lm9yZz4iCiBsaWNlbnNlPSJHUEwtMi4w LW9ubHkiCiBob21lcGFnZT0iaHR0cDovL2V0dGVyY2FwLmdpdGh1Yi5jb20vZXR0ZXJjYXAvIgog ZGlzdGZpbGVzPSJodHRwczovL2dpdGh1Yi5jb20vRXR0ZXJjYXAvZXR0ZXJjYXAvYXJjaGl2ZS92 JHt2ZXJzaW9ufS50YXIuZ3oiCi1jaGVja3N1bT1mMzg1MTRmMzViZWE1OGJmZTZlZjE5MDJiZmQ0 NzYxZGUwMzc5OTQyYTlhYTNlMTc1ZmM5MzQ4ZjRlZWYyYzgxCitjaGVja3N1bT1kMGMzZWY4OGRm YzI4NGI2MWQzZDViNjRkOTQ2YzExNjBmZDA0Mjc2YjQ0ODUxOWMxYWU0NDM4YTljZGZmYWYzCiBs aWIzMmRpc2FibGVkPXllcwogCiBDRkxBR1M9Ii1mY29tbW9uIgo= --===============8680471053901343501==--