From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Fixed Bug 747902 - mouse and ctrl+space not working Date: Sun, 31 May 2026 02:05:29 GMT Message-ID: <178019312943.1.684139919652615047.rpms-ibus-be8953085738@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: be895308573868eda0af4d5e72f32e39110cf1ed ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBiZTg5NTMwODU3Mzg2OGVkYTBhZjRkNWU3MmYzMmUzOTExMGNmMWVkCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDExLTExLTAyVDE4OjA0OjEzKzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsyMzMvLTE0NCBpbiA0IGZpbGUocykKICAgICAgICAgICAgVVJMICAgIDogaHR0cHM6 Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9pYnVzL2MvYmU4OTUzMDg1NzM4NjhlZGEwYWY0 ZDVlNzJmMzJlMzkxMTBjZjFlZD9icmFuY2g9YXV0b3Rvb2wKCiAgICAgICAgICAgIExvZzoKICAg ICAgICAgICAgRml4ZWQgQnVnIDc0NzkwMiAtIG1vdXNlIGFuZCBjdHJsK3NwYWNlIG5vdCB3b3Jr aW5nCgpVcGRhdGVkIGlidXMtSEVBRC5wYXRjaAotIEZpeGVkIHByZXYvbmV4dCBrZXlzIHdpdGhv dXQgZ2xvYmFsIGVuZ2luZS4KVXBkYXRlZCBpYnVzLXh4LWJyaWRnZS1ob3RrZXkucGF0Y2ggZm9y IGYxNgotIEZpeGVkIEJ1ZyA3NDc5MDIgLSBtb3VzZSBhbmQgY3RybCtzcGFjZSBub3Qgd29ya2lu ZwotIEZpeGVkIEJ1ZyA3NDk3NzAgLSBJTUUgaG90a2V5IGFmdGVyIENvbnRyb2wgKyBTcGFjZQpV cGRhdGVkIGlidXMtNzExNjMyLWZlZG9yYS1mYWxsYmFjay1pY29uLnBhdGNoCi0gRml4ZWQgQnVn IDcxNzgzMSAtIHVzZSBvbGQgaWNvbiBmb3IgZGVza3RvcHMgb3RoZXIgdGhhbiBnbm9tZQoKLS0t CmRpZmYgLS1naXQgYS9pYnVzLTcxMTYzMi1mZWRvcmEtZmFsbGJhY2staWNvbi5wYXRjaCBiL2li dXMtNzExNjMyLWZlZG9yYS1mYWxsYmFjay1pY29uLnBhdGNoCmluZGV4IDhhZDllOWEuLjRlMWEy NzMgMTAwNjQ0Ci0tLSBhL2lidXMtNzExNjMyLWZlZG9yYS1mYWxsYmFjay1pY29uLnBhdGNoCisr KyBiL2lidXMtNzExNjMyLWZlZG9yYS1mYWxsYmFjay1pY29uLnBhdGNoCkBAIC0xLDMgKzEsMjIg QEAKKy0tLSBpYnVzL2lidXMvX2NvbmZpZy5weS5pbi5vcmlnCTIwMTEtMTEtMDEgMTg6MzI6MDku MjM1ODk0ODU5ICswOTAwCisrKysgaWJ1cy9pYnVzL19jb25maWcucHkuaW4JMjAxMS0xMS0wMiAx MDoyNjo0MC42NzIzNTU4NjggKzA5MDAKK0BAIC00NywxMCArNDcsMTQgQEAgZGVmIGdldF9saWNl bnNlKCk6CisgCisgZGVmIGdldF9JQ09OX0tFWUJPQVJEKCk6CisgICAgIGltcG9ydCBndGsKKy0g ICAgdGhlbWUgPSBndGsuaWNvbl90aGVtZV9nZXRfZGVmYXVsdCgpCisgICAgIGljb24gPSAnQElC VVNfSUNPTl9LRVlCT0FSREAnCisrICAgIGZhbGxiYWNrX2ljb24gPSAnaWJ1cy1rZXlib2FyZCcK KysgICAgc2V0dGluZ3MgPSBndGsuc2V0dGluZ3NfZ2V0X2RlZmF1bHQoKQorKyAgICBpZiBzZXR0 aW5ncy5nZXRfcHJvcGVydHkoJ2d0ay1pY29uLXRoZW1lLW5hbWUnKSAhPSAnZ25vbWUnOgorKyAg ICAgICAgaWNvbiA9IGZhbGxiYWNrX2ljb24KKysgICAgdGhlbWUgPSBndGsuaWNvbl90aGVtZV9n ZXRfZGVmYXVsdCgpCisgICAgIGlmIG5vdCB0aGVtZS5sb29rdXBfaWNvbihpY29uLCAxOCwgMCk6 CistICAgICAgICBpY29uID0gJ2lidXMta2V5Ym9hcmQnCisrICAgICAgICBpY29uID0gZmFsbGJh Y2tfaWNvbgorICAgICByZXR1cm4gaWNvbgorIAorIGRlZiB1c2VfYnJpZGdlX2hvdGtleSgpOgog LS0tIGlidXMvdWkvZ3RrL21haW4ucHkub3JpZwkyMDExLTA0LTI1IDEyOjMzOjM5LjI5Njk5OTY5 MiArMDkwMAogKysrIGlidXMvdWkvZ3RrL21haW4ucHkJMjAxMS0wNi0wOCAxMTo1Mzo0NC4wMjcy MzIwNzUgKzA5MDAKIEBAIC04Niw2ICs4Niw5IEBAIGNsYXNzIFVJQXBwbGljYXRpb246CkBAIC0x MCw5ICsyOSw5IEBACiAgICAgICMgZ3RrLnNldHRpbmdzX2dldF9kZWZhdWx0KCkucHJvcHMuZ3Rr X3RoZW1lX25hbWUgPSAiL2hvbWUvcGh1YW5nLy50aGVtZXMvYXVkLURlZmF1bHQvZ3RrLTIuMC9n dGtyYyIKICAgICAgIyBndGsucmNfcGFyc2UoIi4vdGhlbWVzL2RlZmF1bHQvZ3RrcmMiKQogICAg ICBVSUFwcGxpY2F0aW9uKHJlcGxhY2UpLnJ1bigpCi0tLS0gaWJ1cy91aS9ndGsvcGFuZWwucHku b3JpZwkyMDExLTA2LTA4IDEyOjE2OjQwLjEwNzU3NzQzOCArMDkwMAotKysrIGlidXMvdWkvZ3Rr L3BhbmVsLnB5CTIwMTEtMDYtMDggMTI6MTc6MDAuNDQwNDYwMjY4ICswOTAwCi1AQCAtNTA3LDcg KzUwNyw3IEBAIGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKKy0tLSBpYnVzL3VpL2d0ay9w YW5lbC5weS5vcmlnCTIwMTEtMTEtMDEgMTg6MzE6NDkuODQ1ODk4MDM3ICswOTAwCisrKysgaWJ1 cy91aS9ndGsvcGFuZWwucHkJMjAxMS0xMS0wMSAxODozMTozNC40ODA5MDAzMjkgKzA5MDAKK0BA IC02NTQsNyArNjYwLDcgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgogICAgICAgICAg ICAgIG1lbnUgPSBndGsuTWVudSgpCiAgICAgICAgICAgICAgaXRlbSA9IGd0ay5JbWFnZU1lbnVJ dGVtKF8oIk5vIGlucHV0IHdpbmRvdyIpKQogICAgICAgICAgICAgIHNpemUgPSBndGsuaWNvbl9z aXplX2xvb2t1cChndGsuSUNPTl9TSVpFX01FTlUpCgpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBh dGNoIGIvaWJ1cy1IRUFELnBhdGNoCmluZGV4IDYwMzVjZTEuLjgzZjBhNDEgMTAwNjQ0Ci0tLSBh L2lidXMtSEVBRC5wYXRjaAorKysgYi9pYnVzLUhFQUQucGF0Y2gKQEAgLTI0OSwxNyArMjQ5LDE3 IEBAIGluZGV4IDMyN2E1ZDkuLmI2Y2ExMmUgMTAwNjQ0CiAtLSAKIDEuNy42LjQKIAotRnJvbSBk NTdiNTc1ZjJhMWIzM2I2MGFkODQzMTBhNGU2ODVlNzA2ZjhhNTc0IE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQorRnJvbSAwNWY5NTU2Mjc4Zjc5MWJhY2MwZjEwMTk0MjdmODU3NWZhMzljOWRiIE1v biBTZXAgMTcgMDA6MDA6MDAgMjAwMQogRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFA Z21haWwuY29tPgotRGF0ZTogRnJpLCAyOCBPY3QgMjAxMSAxMzowOTowNyArMDkwMAorRGF0ZTog V2VkLCAyIE5vdiAyMDExIDEwOjQ3OjU1ICswOTAwCiBTdWJqZWN0OiBbUEFUQ0hdIFJlcm90YXRl IG5leHQvcHJldmlvdXMgZW5naW5lcyB3aXRob3V0IGdsb2JhbCBlbmdpbmUuCiAKIC0tLQotIGJ1 cy9pYnVzaW1wbC5jIHwgICAzMyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0KLSAx IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCisgYnVzL2li dXNpbXBsLmMgfCAgIDMxICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0KKyAxIGZpbGVz IGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCiAKIGRpZmYgLS1naXQg YS9idXMvaWJ1c2ltcGwuYyBiL2J1cy9pYnVzaW1wbC5jCi1pbmRleCAwYTRmM2ZiLi42ODdmOTEw IDEwMDY0NAoraW5kZXggMGE0ZjNmYi4uMDU5ZDY2MCAxMDA2NDQKIC0tLSBhL2J1cy9pYnVzaW1w bC5jCiArKysgYi9idXMvaWJ1c2ltcGwuYwogQEAgLTEwNTYsNyArMTA1Niw3IEBAIGJ1c19pYnVz X2ltcGxfY29udGV4dF9yZXF1ZXN0X3JvdGF0ZV9lbmdpbmVfaW5fbWVudSAoQnVzSUJ1c0ltcGwg ICAgICppYnVzLApAQCAtMjcxLDcgKzI3MSw3IEBAIGluZGV4IDBhNGYzZmIuLjY4N2Y5MTAgMTAw NjQ0CiAgCiAgICAgIGVuZ2luZSA9IGJ1c19pbnB1dF9jb250ZXh0X2dldF9lbmdpbmUgKGNvbnRl eHQpOwogICAgICBpZiAoZW5naW5lID09IE5VTEwpIHsKLUBAIC0xMDc0LDIxICsxMDc0LDQ4IEBA IGJ1c19pYnVzX2ltcGxfY29udGV4dF9yZXF1ZXN0X3JvdGF0ZV9lbmdpbmVfaW5fbWVudSAoQnVz SUJ1c0ltcGwgICAgICppYnVzLAorQEAgLTEwNzQsMjEgKzEwNzQsNDYgQEAgYnVzX2lidXNfaW1w bF9jb250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZ2luZV9pbl9tZW51IChCdXNJQnVzSW1wbCAgICAg KmlidXMsCiAgICAgIGlmIChwICE9IE5VTEwpIHsKICAgICAgICAgIGlmIChpc19uZXh0KSB7CiAg ICAgICAgICAgICAgcCA9IHAtPm5leHQ7CkBAIC0yODIsMTQgKzI4MiwxMiBAQCBpbmRleCAwYTRm M2ZiLi42ODdmOTEwIDEwMDY0NAogICAgICB9CiArCiArICAgIC8qIFJvdGF0ZSByZWdpc3Rlcl9l bmdpbmVfbGlzdCBhbmQgZW5naW5lX2xpc3QuICovCi0rICAgIGlmIChwID09IE5VTEwgJiYgaXNf bmV4dCAmJgotKyAgICAgICAgZ19saXN0X2ZpbmQgKGlidXMtPnJlZ2lzdGVyX2VuZ2luZV9saXN0 LCBkZXNjKSAhPSBOVUxMKSB7Ci0rICAgICAgICBwID0gaWJ1cy0+ZW5naW5lX2xpc3Q7Ci0rICAg IH0KLSsgICAgZWxzZSBpZiAocCA9PSBOVUxMICYmICFpc19uZXh0ICYmCi0rICAgICAgICAgICAg IGdfbGlzdF9maW5kIChpYnVzLT5yZWdpc3Rlcl9lbmdpbmVfbGlzdCwgZGVzYykgIT0gTlVMTCAm JgotKyAgICAgICAgICAgICBpYnVzLT5lbmdpbmVfbGlzdCAhPSBOVUxMKSB7Ci0rICAgICAgICBw ID0gZ19saXN0X2xhc3QgKGlidXMtPmVuZ2luZV9saXN0KTsKKysgICAgaWYgKHAgPT0gTlVMTCAm JiBnX2xpc3RfZmluZCAoaWJ1cy0+cmVnaXN0ZXJfZW5naW5lX2xpc3QsIGRlc2MpICE9IE5VTEwp IHsKKysgICAgICAgIGlmIChpc19uZXh0KSB7CisrICAgICAgICAgICAgcCA9IGlidXMtPmVuZ2lu ZV9saXN0OworKyAgICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICBwID0gZ19saXN0X2xhc3Qg KGlidXMtPmVuZ2luZV9saXN0KTsKKysgICAgICAgIH0KICsgICAgfQogKwogICAgICBpZiAocCA9 PSBOVUxMKSB7CkBAIC0zMDQsMTggKzMwMiwxOCBAQCBpbmRleCAwYTRmM2ZiLi42ODdmOTEwIDEw MDY0NAogICAgICAgICAgfQogICAgICB9CiAgCi0rICAgIGlmIChwID09IE5VTEwgJiYgIWlzX25l eHQgJiYKLSsgICAgICAgIGdfbGlzdF9maW5kIChpYnVzLT5lbmdpbmVfbGlzdCwgZGVzYykgIT0g TlVMTCkgewotKyAgICAgICAgcCA9IGdfbGlzdF9sYXN0IChpYnVzLT5yZWdpc3Rlcl9lbmdpbmVf bGlzdCk7Ci0rICAgICAgICBpZiAocCA9PSBOVUxMKSB7Ci0rICAgICAgICAgICAgcCA9IGdfbGlz dF9sYXN0IChpYnVzLT5lbmdpbmVfbGlzdCk7Ci0rICAgICAgICB9Ci0rICAgIH0KLSsgICAgZWxz ZSBpZiAocCA9PSBOVUxMICYmIGlzX25leHQgJiYKLSsgICAgICAgICAgICAgZ19saXN0X2ZpbmQg KGlidXMtPmVuZ2luZV9saXN0LCBkZXNjKSAhPSBOVUxMKSB7Ci0rICAgICAgICBwID0gaWJ1cy0+ cmVnaXN0ZXJfZW5naW5lX2xpc3Q7Ci0rICAgICAgICBpZiAocCA9PSBOVUxMKSB7Ci0rICAgICAg ICAgICAgcCA9IGlidXMtPmVuZ2luZV9saXN0OworKyAgICAvKiBSZXJvdGF0ZSByZWdpc3Rlcl9l bmdpbmVfbGlzdCBhbmQgZW5naW5lX2xpc3QuICovCisrICAgIGlmIChwID09IE5VTEwgJiYgZ19s aXN0X2ZpbmQgKGlidXMtPmVuZ2luZV9saXN0LCBkZXNjKSAhPSBOVUxMKSB7CisrICAgICAgICBp ZiAoaXNfbmV4dCkgeworKyAgICAgICAgICAgIHAgPSBpYnVzLT5yZWdpc3Rlcl9lbmdpbmVfbGlz dDsKKysgICAgICAgICAgICBpZiAocCA9PSBOVUxMKSB7CisrICAgICAgICAgICAgICAgIHAgPSBp YnVzLT5lbmdpbmVfbGlzdDsKKysgICAgICAgICAgICB9CisrICAgICAgICB9IGVsc2UgeworKyAg ICAgICAgICAgIHAgPSBnX2xpc3RfbGFzdCAoaWJ1cy0+cmVnaXN0ZXJfZW5naW5lX2xpc3QpOwor KyAgICAgICAgICAgIGlmIChwID09IE5VTEwpIHsKKysgICAgICAgICAgICAgICAgcCA9IGdfbGlz dF9sYXN0IChpYnVzLT5lbmdpbmVfbGlzdCk7CisrICAgICAgICAgICAgfQogKyAgICAgICAgfQog KyAgICB9CiArCgpkaWZmIC0tZ2l0IGEvaWJ1cy14eC1icmlkZ2UtaG90a2V5LnBhdGNoIGIvaWJ1 cy14eC1icmlkZ2UtaG90a2V5LnBhdGNoCmluZGV4IGMwNGMxZTQuLjE0OWE1MzQgMTAwNjQ0Ci0t LSBhL2lidXMteHgtYnJpZGdlLWhvdGtleS5wYXRjaAorKysgYi9pYnVzLXh4LWJyaWRnZS1ob3Rr ZXkucGF0Y2gKQEAgLTEsMjIgKzEsMjIgQEAKLUZyb20gMGM3NTg5Zjg0ZDRhMGU4NzIzZjdmY2Uz Nzk4MWQxNzdhMTFkYTRmNiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb20gZDRmZDU2Nzg0 YjE4YzhlYjMyMWM3NWU4NmE5YzIxZDNlMTk4NDg4OCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEK IEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLURhdGU6IEZyaSwg MjggT2N0IDIwMTEgMTU6MzA6MTIgKzA5MDAKK0RhdGU6IFdlZCwgMiBOb3YgMjAxMSAxMjowMTo1 NSArMDkwMAogU3ViamVjdDogW1BBVENIXSBBZGQgYSBicmlkZ2UgaG90a2V5IHdoaWNoIHVzZSBw cmV2LW5leHQgZW5naW5lcyBpbnN0ZWFkCiAgb2Ygb24tb2ZmLgogCiAtLS0KICBidXMvTWFrZWZp bGUuYW0gICAgICAgICAgICAgICAgIHwgICAyMCArLQotIGJ1cy9pYnVzaW1wbC5jICAgICAgICAg ICAgICAgICAgfCAgNTcxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQor IGJ1cy9pYnVzaW1wbC5jICAgICAgICAgICAgICAgICAgfCAgNTk4ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLQogIGJ1cy9pbnB1dGNvbnRleHQuYyAgICAgICAgICAgICAg fCAgIDgxICsrKysrKwogIGJ1cy9pbnB1dGNvbnRleHQuaCAgICAgICAgICAgICAgfCAgIDIyICsr Ci0gYnVzL3JlZ2lzdHJ5LmMgICAgICAgICAgICAgICAgICB8ICAgNjEgKysrKysKKyBidXMvcmVn aXN0cnkuYyAgICAgICAgICAgICAgICAgIHwgICA2MSArKysrCiAgYnVzL3JlZ2lzdHJ5LmggICAg ICAgICAgICAgICAgICB8ICAgMTAgKwotIGNvbmZpZ3VyZS5hYyAgICAgICAgICAgICAgICAgICAg fCAgIDMxICsrKworIGNvbmZpZ3VyZS5hYyAgICAgICAgICAgICAgICAgICAgfCAgIDMxICsrCiAg ZGF0YS9NYWtlZmlsZS5hbSAgICAgICAgICAgICAgICB8ICAgIDYgKy0KLSBkYXRhL2lidXMuc2No ZW1hcy5pbiAgICAgICAgICAgIHwgIDI4NyAtLS0tLS0tLS0tLS0tLS0tLS0tLQorIGRhdGEvaWJ1 cy5zY2hlbWFzLmluICAgICAgICAgICAgfCAgMjg3IC0tLS0tLS0tLS0tLS0tLS0tLS0KICBkYXRh L2lidXMuc2NoZW1hcy5pbi5pbiAgICAgICAgIHwgIDMwMCArKysrKysrKysrKysrKysrKysrKwog IGlidXMvX2NvbmZpZy5weS5pbiAgICAgICAgICAgICAgfCAgICA2ICsKLSBpYnVzL2lucHV0Y29u dGV4dC5weSAgICAgICAgICAgIHwgICAxNyArKy0KKyBpYnVzL2lucHV0Y29udGV4dC5weSAgICAg ICAgICAgIHwgICAxNyArLQogIGlidXMvaW50ZXJmYWNlL2lpbnB1dGNvbnRleHQucHkgfCAgICA3 ICstCiAgaWJ1cy94a2J4bWwucHkuaW4gICAgICAgICAgICAgICB8ICAgIDQgKwogIHNldHVwL2Vu Z2luZWNvbWJvYm94LnB5ICAgICAgICAgfCAgICAzICsKQEAgLTI2LDE1ICsyNiwxNSBAQCBTdWJq ZWN0OiBbUEFUQ0hdIEFkZCBhIGJyaWRnZSBob3RrZXkgd2hpY2ggdXNlIHByZXYtbmV4dCBlbmdp bmVzIGluc3RlYWQKICBzcmMvTWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgIHwgICAxOCArLQog IHNyYy9pYnVzaG90a2V5LmMgICAgICAgICAgICAgICAgfCAgIDExICsKICBzcmMvaWJ1c2hvdGtl eS5oICAgICAgICAgICAgICAgIHwgICAxMSArCi0gc3JjL2lidXNpbnB1dGNvbnRleHQuYyAgICAg ICAgICB8ICAgMjggKysKKyBzcmMvaWJ1c2lucHV0Y29udGV4dC5jICAgICAgICAgIHwgICAyNyAr KwogIHNyYy9pYnVzaW5wdXRjb250ZXh0LmggICAgICAgICAgfCAgIDEyICsKICBzcmMvaWJ1c3V0 aWwuYyAgICAgICAgICAgICAgICAgIHwgICAxMiArCiAgc3JjL2lidXN1dGlsLmggICAgICAgICAg ICAgICAgICB8ICAgMTQgKwotIHVpL2d0ay9wYW5lbC5weSAgICAgICAgICAgICAgICAgfCAgMzA1 ICsrKysrKysrKysrKysrKysrKystLQorIHVpL2d0ay9wYW5lbC5weSAgICAgICAgICAgICAgICAg fCAgMzE1ICsrKysrKysrKysrKysrKysrKystLQogIHhrYi9NYWtlZmlsZS5hbSAgICAgICAgICAg ICAgICAgfCAgICAyICsKLSB4a2IvaWJ1cy1lbmdpbmUteGtiLW1haW4uYyAgICAgIHwgICAxNiAr KworIHhrYi9pYnVzLWVuZ2luZS14a2ItbWFpbi5jICAgICAgfCAgIDE2ICsKICB4a2IveGtieG1s LmMgICAgICAgICAgICAgICAgICAgIHwgICAxMCArLQotIDI5IGZpbGVzIGNoYW5nZWQsIDE1NjEg aW5zZXJ0aW9ucygrKSwgMzkxIGRlbGV0aW9ucygtKQorIDI5IGZpbGVzIGNoYW5nZWQsIDE1OTYg aW5zZXJ0aW9ucygrKSwgMzkyIGRlbGV0aW9ucygtKQogIGRlbGV0ZSBtb2RlIDEwMDY0NCBkYXRh L2lidXMuc2NoZW1hcy5pbgogIGNyZWF0ZSBtb2RlIDEwMDY0NCBkYXRhL2lidXMuc2NoZW1hcy5p bi5pbgogCkBAIC03MCw3ICs3MCw3IEBAIGluZGV4IDA3NGI0NTYuLjBlZmFhMWIgMTAwNjQ0CiAg QU1fTERBREQgPSAgICAgICAgICAgICAgICAgIFwKICAJQEdPQkpFQ1QyX0xJQlNAICAgICAgICAg XAogZGlmZiAtLWdpdCBhL2J1cy9pYnVzaW1wbC5jIGIvYnVzL2lidXNpbXBsLmMKLWluZGV4IDg1 MzQ2NWMuLjAwODY0YWMgMTAwNjQ0CitpbmRleCAwNTlkNjYwLi43MWJiNmYxIDEwMDY0NAogLS0t IGEvYnVzL2lidXNpbXBsLmMKICsrKyBiL2J1cy9pYnVzaW1wbC5jCiBAQCAtMjAsMTIgKzIwLDE3 IEBACkBAIC0zOTIsMTYgKzM5Miw2NiBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAog ICNlbHNlCiAgICAgIF9zZXRfcHJlbG9hZF9lbmdpbmVzIChpYnVzLCB2YWx1ZSk7CiAgI2VuZGlm Ci1AQCAtMTIyNiw3ICsxNDgyLDczIEBAIF9jb250ZXh0X3JlcXVlc3RfZW5naW5lX2NiIChCdXNJ bnB1dENvbnQKK0BAIC0xMjE2LDYgKzE0NzIsNTMgQEAgX2ZpbmRfZW5naW5lX2Rlc2NfYnlfbmFt ZSAoQnVzSUJ1c0ltcGwgKgorICAgICByZXR1cm4gTlVMTDsKKyB9CisgCisrI2lmIFVTRV9CUklE R0VfSE9US0VZCisrY29uc3QgZ2NoYXIgKgorK19nZXRfZW5naW5lX2Rlc2NfaG90a2V5c193aXRo X3N5c3RlbSAoSUJ1c0VuZ2luZURlc2MgKmRlc2MpCisreworKyAgICBjb25zdCBnY2hhciAqaG90 a2V5cyA9IE5VTEw7CisrCisrICAgIC8qIElmIHRoZSB1c2VyIGN1c3RvbWl6ZWQgdGhlIHRyaWdn ZXIga2V5LCB0aGUgdHJpZ2dlciBrZXkgaXMgdXNlZCBmb3IKKysgICAgICogYW55IElCdXMgZW5n aW5lcy4gKi8KKysgICAgaWYgKF9icmlkZ2VfdHJpZ2dlcl9rZXlzICE9IE5VTEwgJiYKKysgICAg ICAgICpfYnJpZGdlX3RyaWdnZXJfa2V5cyAhPSAnXDAnICYmCisrICAgICAgICBnX3N0cmNtcDAg KF9icmlkZ2VfdHJpZ2dlcl9rZXlzLCAiQ29udHJvbCtzcGFjZSIpICE9IDApIHsKKysKKysgICAg ICAgIGhvdGtleXMgPSAoY29uc3QgZ2NoYXIgKikgX2JyaWRnZV90cmlnZ2VyX2tleXM7CisrICAg IH0gZWxzZSBpZiAoZGVzYykgeworKyAgICAgICAgaG90a2V5cyA9IGlidXNfZW5naW5lX2Rlc2Nf Z2V0X2hvdGtleXMgKGRlc2MpOworKyAgICB9CisrCisrICAgIC8qIElmIGVuZ2luZSBob3RrZXlz IGFyZSBub3QgZGVmaW5lZCBpbiB0aGUgY29tcG9zZSB4bWwgZmlsZSwKKysgICAgICogSUJ1cyB0 cmlnZ2VyIGtleXMgYXJlIHVzZWQuICovCisrICAgIGlmICghaG90a2V5cyB8fCAhKmhvdGtleXMp IHsKKysgICAgICAgICAgICBob3RrZXlzID0gKGNvbnN0IGdjaGFyICopIF9icmlkZ2VfdHJpZ2dl cl9rZXlzOworKyAgICB9CisrCisrICAgIHJldHVybiBob3RrZXlzOworK30KKysKKyt2b2lkCisr X3VwZGF0ZV9ob3RrZXlzX2J5X3ByZXZfZW5naW5lX2Rlc2MgKEJ1c0lCdXNJbXBsICAgICppYnVz LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJQnVzRW5naW5lRGVzYyAq bmV4dF9kZXNjLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJQnVzRW5n aW5lRGVzYyAqcHJldl9kZXNjKQorK3sKKysgICAgc3RydWN0IF9pbXBsX2FuZF9kZXNjIHsKKysg ICAgICAgIEJ1c0lCdXNJbXBsICAgICppYnVzOworKyAgICAgICAgSUJ1c0VuZ2luZURlc2MgKmRl c2M7CisrICAgIH0gaWQgPSB7aWJ1cywgbmV4dF9kZXNjfTsKKysgICAgY29uc3QgZ2NoYXIgKmhv dGtleXMgPSBOVUxMOworKworKyAgICBob3RrZXlzID0gX2dldF9lbmdpbmVfZGVzY19ob3RrZXlz X3dpdGhfc3lzdGVtIChwcmV2X2Rlc2MpOworKyAgICBpZiAoaG90a2V5cyAmJiAqaG90a2V5cykg eworKyAgICAgICAgaWJ1c19ob3RrZXlfcHJvZmlsZV9mb3JlYWNoX2hvdGtleSAoaWJ1cy0+ZW5n aW5lc19ob3RrZXlfcHJvZmlsZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF9mb3JlYWNoX3JlbW92ZV9lbmdpbmVfaG90a2V5LAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlkKTsKKysgICAgICAgIF9hZGRfZW5naW5l X2hvdGtleV93aXRoX2hvdGtleXMgKG5leHRfZGVzYywgaWJ1cywgaG90a2V5cyk7CisrICAgIH0K Kyt9CisrI2VuZGlmCisrCisgLyoqCisgICogX2NvbnRleHRfcmVxdWVzdF9lbmdpbmVfY2I6Cisg ICoKK0BAIC0xMjI2LDcgKzE1MjksNTMgQEAgX2NvbnRleHRfcmVxdWVzdF9lbmdpbmVfY2IgKEJ1 c0lucHV0Q29udAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAg KmVuZ2luZV9uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCdXNJQnVzSW1wbCAg ICAgKmlidXMpCiAgewogLSAgICByZXR1cm4gYnVzX2lidXNfaW1wbF9nZXRfZW5naW5lX2Rlc2Mg KGlidXMsIGVuZ2luZV9uYW1lKTsKICsgICAgSUJ1c0VuZ2luZURlc2MgKmRlc2MgPSBidXNfaWJ1 c19pbXBsX2dldF9lbmdpbmVfZGVzYyAoaWJ1cywgZW5naW5lX25hbWUpOwotKyAgICBzdHJ1Y3Qg X2ltcGxfYW5kX2Rlc2MgewotKyAgICAgICAgQnVzSUJ1c0ltcGwgICAgKmlidXM7Ci0rICAgICAg ICBJQnVzRW5naW5lRGVzYyAqZGVzYzsKLSsgICAgfSBpZCA9IHtpYnVzLCBkZXNjfTsKICsKICsj aWYgVVNFX0JSSURHRV9IT1RLRVkKICsgICAgSUJ1c0VuZ2luZURlc2MgKmN1cnJlbnRfZGVzYyA9 IE5VTEw7CkBAIC00MTcsMTYgKzQ2Nyw2IEBAIGluZGV4IDg1MzQ2NWMuLjAwODY0YWMgMTAwNjQ0 CiArICAgICAgICB9CiArICAgIH0KICsKLSsgICAgaWYgKGN1cnJlbnRfZGVzYyAmJiBkZXNjICYm Ci0rICAgICAgICBnX3N0cmNtcDAgKGlidXNfZW5naW5lX2Rlc2NfZ2V0X25hbWUgKGN1cnJlbnRf ZGVzYyksCi0rICAgICAgICAgICAgICAgICAgIGlidXNfZW5naW5lX2Rlc2NfZ2V0X25hbWUgKGRl c2MpKSAhPSAwKSB7Ci0rICAgICAgICBpZiAoY29udGV4dCkgewotKyAgICAgICAgICAgIGJ1c19p bnB1dF9jb250ZXh0X3NldF9wcmV2X2hvdGtleV9lbmdpbmUgKGNvbnRleHQsIGN1cnJlbnRfZGVz Yyk7Ci0rICAgICAgICB9IGVsc2UgewotKyAgICAgICAgICAgIGlidXMtPnByZXZfaG90a2V5X2Vu Z2luZSA9IGN1cnJlbnRfZGVzYzsKLSsgICAgICAgIH0KLSsgICAgfQotKwogKyAgICBpZiAoKChj dXJyZW50X2Rlc2MgPT0gTlVMTCAmJiBkZXNjICE9IE5VTEwpIHx8CiArICAgICAgICAgKGN1cnJl bnRfZGVzYyAhPSBOVUxMICYmIGRlc2MgIT0gTlVMTCAmJgogKyAgICAgICAgICBnX3N0cmNtcDAg KGlidXNfZW5naW5lX2Rlc2NfZ2V0X25hbWUgKGN1cnJlbnRfZGVzYyksCkBAIC00MzQsNDAgKzQ3 NCwzNCBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAogKyAgICAgICAgZ19hc2NpaV9z dHJuY2FzZWNtcCAoaWJ1c19lbmdpbmVfZGVzY19nZXRfbmFtZSAoZGVzYyksCiArICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBERUZBVUxUX0JSSURHRV9FTkdJTkVfTkFNRSwKICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0cmxlbiAoREVGQVVMVF9CUklER0VfRU5HSU5FX05BTUUp KSA9PSAwKSB7Ci0rICAgICAgICBjb25zdCBnY2hhciAqaG90a2V5cyA9IE5VTEw7Ci0rCi0rICAg ICAgICAvKiBJZiB0aGUgdXNlciBjdXN0b21pemVkIHRoZSB0cmlnZ2VyIGtleSwgdGhlIHRyaWdn ZXIga2V5IGlzIHVzZWQgZm9yCi0rICAgICAgICAgKiBhbnkgSUJ1cyBlbmdpbmVzLiAqLwotKyAg ICAgICAgaWYgKF9icmlkZ2VfdHJpZ2dlcl9rZXlzICE9IE5VTEwgJiYKLSsgICAgICAgICAgICAq X2JyaWRnZV90cmlnZ2VyX2tleXMgIT0gJ1wwJyAmJgotKyAgICAgICAgICAgIGdfc3RyY21wMCAo X2JyaWRnZV90cmlnZ2VyX2tleXMsICJDb250cm9sK3NwYWNlIikgIT0gMCkgewotKwotKyAgICAg ICAgICAgIGhvdGtleXMgPSAoY29uc3QgZ2NoYXIgKikgX2JyaWRnZV90cmlnZ2VyX2tleXM7Ci0r ICAgICAgICB9IGVsc2UgaWYgKGN1cnJlbnRfZGVzYykgewotKyAgICAgICAgICAgIGhvdGtleXMg PSBpYnVzX2VuZ2luZV9kZXNjX2dldF9ob3RrZXlzIChjdXJyZW50X2Rlc2MpOwotKyAgICAgICAg fQorKyAgICAgICAgX3VwZGF0ZV9ob3RrZXlzX2J5X3ByZXZfZW5naW5lX2Rlc2MgKGlidXMsIGRl c2MsIGN1cnJlbnRfZGVzYyk7CisrICAgIH0KICsKLSsgICAgICAgIC8qIElmIGVuZ2luZSBob3Rr ZXlzIGFyZSBub3QgZGVmaW5lZCBpbiB0aGUgY29tcG9zZSB4bWwgZmlsZSwKLSsgICAgICAgICAq IElCdXMgdHJpZ2dlciBrZXlzIGFyZSB1c2VkLiAqLwotKyAgICAgICAgaWYgKCFob3RrZXlzIHx8 ICEqaG90a2V5cykgewotKyAgICAgICAgICAgIGhvdGtleXMgPSAoY29uc3QgZ2NoYXIgKikgX2Jy aWRnZV90cmlnZ2VyX2tleXM7CisrICAgIGlmIChjdXJyZW50X2Rlc2MgJiYgZGVzYyAmJgorKyAg ICAgICAgZ19zdHJjbXAwIChpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChjdXJyZW50X2Rlc2Mp LAorKyAgICAgICAgICAgICAgICAgICBpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChkZXNjKSkg IT0gMCkgeworKyAgICAgICAgaWYgKGNvbnRleHQpIHsKKysgICAgICAgICAgICBidXNfaW5wdXRf Y29udGV4dF9zZXRfcHJldl9ob3RrZXlfZW5naW5lIChjb250ZXh0LCBjdXJyZW50X2Rlc2MpOwor KyAgICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICBpYnVzLT5wcmV2X2hvdGtleV9lbmdpbmUg PSBjdXJyZW50X2Rlc2M7CiArICAgICAgICB9CiArCi0rICAgICAgICBpZiAoIWhvdGtleXMgfHwg ISpob3RrZXlzKSB7Ci0rICAgICAgICAgICAgcmV0dXJuIGRlc2M7CisrICAgICAgICAvKiBJZiB0 aGUgcHJldmlvdXMgZW5naW5lIGlzIG5vdCBpbmNsdWRlZCBpbiBlbmdpbmVfbGlzdCBhbmQKKysg ICAgICAgICAqIHRoZSBjdXJyZW50IGVuZ2luZSBpcyB0aGUgZGVmdWFsdCBicmlkZ2UgZW5naW5l LAorKyAgICAgICAgICogdGhlIGN1cnJlbnQgZW5naW5lIGlzIGFsc28gbm90IGluY2x1ZGVkIGlu IGVuZ2luZV9saXN0LgorKyAgICAgICAgICogU28gdGhlIGVuZ2luZSBpcyBhZGRlZCBoZXJlLiAq LworKyAgICAgICAgaWYgKGdfYXNjaWlfc3RybmNhc2VjbXAgKGlidXNfZW5naW5lX2Rlc2NfZ2V0 X25hbWUgKGN1cnJlbnRfZGVzYyksCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg REVGQVVMVF9CUklER0VfRU5HSU5FX05BTUUsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RybGVuIChERUZBVUxUX0JSSURHRV9FTkdJTkVfTkFNRSkpID09IDApIHsKKysgICAg ICAgICAgICBfdXBkYXRlX2hvdGtleXNfYnlfcHJldl9lbmdpbmVfZGVzYyAoaWJ1cywgY3VycmVu dF9kZXNjLCBkZXNjKTsKICsgICAgICAgIH0KLSsKLSsgICAgICAgIGlidXNfaG90a2V5X3Byb2Zp bGVfZm9yZWFjaF9ob3RrZXkgKGlidXMtPmVuZ2luZXNfaG90a2V5X3Byb2ZpbGUsCi0rICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfZm9yZWFjaF9yZW1vdmVfZW5n aW5lX2hvdGtleSwKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICZpZCk7Ci0rICAgICAgICBfYWRkX2VuZ2luZV9ob3RrZXlfd2l0aF9ob3RrZXlzIChkZXNjLCBp YnVzLCBob3RrZXlzKTsKICsgICAgfQogKyNlbmRpZgogKyAgICByZXR1cm4gZGVzYzsKICB9CiAg CiAgLyoqCi1AQCAtMTI2NSw4ICsxNTg3LDEzIEBAIGJ1c19pYnVzX2ltcGxfZ2V0X2VuZ2luZV9k ZXNjIChCdXNJQnVzSW0KK0BAIC0xMjY1LDggKzE2MTQsMTMgQEAgYnVzX2lidXNfaW1wbF9nZXRf ZW5naW5lX2Rlc2MgKEJ1c0lCdXNJbQogICAgICAgICAgaWYgKCFkZXNjKSB7CiAgICAgICAgICAg ICAgaWYgKGlidXMtPnJlZ2lzdGVyX2VuZ2luZV9saXN0KSB7CiAgICAgICAgICAgICAgICAgIGRl c2MgPSAoSUJ1c0VuZ2luZURlc2MgKikgaWJ1cy0+cmVnaXN0ZXJfZW5naW5lX2xpc3QtPmRhdGE7 CkBAIC00ODIsNyArNTE2LDcgQEAgaW5kZXggODUzNDY1Yy4uMDA4NjRhYyAxMDA2NDQKICAgICAg ICAgICAgICAgICAgZGVzYyA9IChJQnVzRW5naW5lRGVzYyAqKSBpYnVzLT5lbmdpbmVfbGlzdC0+ ZGF0YTsKICAgICAgICAgICAgICB9CiAgICAgICAgICB9Ci1AQCAtMTMxMSw5ICsxNjM4LDIwIEBA IGJ1c19pYnVzX2ltcGxfY29udGV4dF9yZXF1ZXN0X3JvdGF0ZV9lbmcKK0BAIC0xMzExLDkgKzE2 NjUsMjAgQEAgYnVzX2lidXNfaW1wbF9jb250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZwogICAgICBk ZXNjID0gYnVzX2VuZ2luZV9wcm94eV9nZXRfZGVzYyAoZW5naW5lKTsKICAKICAgICAgcCA9IGdf bGlzdF9maW5kIChpYnVzLT5yZWdpc3Rlcl9lbmdpbmVfbGlzdCwgZGVzYyk7CkBAIC01MDMsMzUg KzUzNywzMyBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAogICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICBwID0gcC0+cHJldjsKICAgICAgICAgIH0KLUBAIC0xMzQ0LDYgKzE2 ODIsMTUgQEAgYnVzX2lidXNfaW1wbF9jb250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZwotICAgICBp ZiAocCA9PSBOVUxMICYmICFpc19uZXh0ICYmCi0gICAgICAgICBnX2xpc3RfZmluZCAoaWJ1cy0+ ZW5naW5lX2xpc3QsIGRlc2MpICE9IE5VTEwpIHsKLSAgICAgICAgIHAgPSBnX2xpc3RfbGFzdCAo aWJ1cy0+cmVnaXN0ZXJfZW5naW5lX2xpc3QpOworQEAgLTEzNDMsMTEgKzE3MDgsMjUgQEAgYnVz X2lidXNfaW1wbF9jb250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZworICAgICBpZiAocCA9PSBOVUxM ICYmIGdfbGlzdF9maW5kIChpYnVzLT5lbmdpbmVfbGlzdCwgZGVzYykgIT0gTlVMTCkgeworICAg ICAgICAgaWYgKGlzX25leHQpIHsKKyAgICAgICAgICAgICBwID0gaWJ1cy0+cmVnaXN0ZXJfZW5n aW5lX2xpc3Q7CiArI2lmIFVTRV9CUklER0VfSE9US0VZCi0rICAgICAgICBpZiAoIXVzZV9icmlk Z2VfaG90a2V5IChpYnVzKSkgewotKyAgICAgICAgICAgIHAgPSBOVUxMOwotKyAgICAgICAgfQot KyAgICAgICAgZWxzZSBpZiAoaWJ1cy0+eGtiX2dyb3VwX2xlbmd0aCA+IDApIHsKLSsgICAgICAg ICAgICBwID0gZ19saXN0X250aCAoaWJ1cy0+cmVnaXN0ZXJfZW5naW5lX2xpc3QsCi0rICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlidXMtPnhrYl9ncm91cF9sZW5ndGggLSAxKTsKLSsgICAg ICAgIH0KKysgICAgICAgICAgICBpZiAoIXVzZV9icmlkZ2VfaG90a2V5IChpYnVzKSkgeworKyAg ICAgICAgICAgICAgICBwID0gTlVMTDsKKysgICAgICAgICAgICB9CiArI2VuZGlmCi0gICAgICAg ICBpZiAocCA9PSBOVUxMKSB7Ci0gICAgICAgICAgICAgcCA9IGdfbGlzdF9sYXN0IChpYnVzLT5l bmdpbmVfbGlzdCk7Ci0gICAgICAgICB9Ci1AQCAtMTM1MSw2ICsxNjk4LDExIEBAIGJ1c19pYnVz X2ltcGxfY29udGV4dF9yZXF1ZXN0X3JvdGF0ZV9lbmcKLSAgICAgZWxzZSBpZiAocCA9PSBOVUxM ICYmIGlzX25leHQgJiYKLSAgICAgICAgICAgICAgZ19saXN0X2ZpbmQgKGlidXMtPmVuZ2luZV9s aXN0LCBkZXNjKSAhPSBOVUxMKSB7Ci0gICAgICAgICBwID0gaWJ1cy0+cmVnaXN0ZXJfZW5naW5l X2xpc3Q7CisgICAgICAgICAgICAgaWYgKHAgPT0gTlVMTCkgeworICAgICAgICAgICAgICAgICBw ID0gaWJ1cy0+ZW5naW5lX2xpc3Q7CisgICAgICAgICAgICAgfQorICAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgICBwID0gZ19saXN0X2xhc3QgKGlidXMtPnJlZ2lzdGVyX2VuZ2luZV9saXN0 KTsKICsjaWYgVVNFX0JSSURHRV9IT1RLRVkKLSsgICAgICAgIGlmICghdXNlX2JyaWRnZV9ob3Rr ZXkgKGlidXMpKSB7Ci0rICAgICAgICAgICAgcCA9IE5VTEw7Ci0rICAgICAgICB9CisrICAgICAg ICAgICAgaWYgKCF1c2VfYnJpZGdlX2hvdGtleSAoaWJ1cykpIHsKKysgICAgICAgICAgICAgICAg cCA9IE5VTEw7CisrICAgICAgICAgICAgfQorKyAgICAgICAgICAgIGVsc2UgaWYgKGlidXMtPnhr Yl9ncm91cF9sZW5ndGggPiAwKSB7CisrICAgICAgICAgICAgICAgIHAgPSBnX2xpc3RfbnRoIChp YnVzLT5yZWdpc3Rlcl9lbmdpbmVfbGlzdCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlidXMtPnhrYl9ncm91cF9sZW5ndGggLSAxKTsKKysgICAgICAgICAgICB9CiArI2VuZGlm Ci0gICAgICAgICBpZiAocCA9PSBOVUxMKSB7Ci0gICAgICAgICAgICAgcCA9IGlidXMtPmVuZ2lu ZV9saXN0OwotICAgICAgICAgfQotQEAgLTEzNjAsMTQgKzE3MTIsMjUgQEAgYnVzX2lidXNfaW1w bF9jb250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZworICAgICAgICAgICAgIGlmIChwID09IE5VTEwp IHsKKyAgICAgICAgICAgICAgICAgcCA9IGdfbGlzdF9sYXN0IChpYnVzLT5lbmdpbmVfbGlzdCk7 CisgICAgICAgICAgICAgfQorQEAgLTEzNTgsMTQgKzE3MzcsMzEgQEAgYnVzX2lidXNfaW1wbF9j b250ZXh0X3JlcXVlc3Rfcm90YXRlX2VuZwogICAgICAgICAgbmV4dF9kZXNjID0gKElCdXNFbmdp bmVEZXNjKikgcC0+ZGF0YTsKICAgICAgfQogICAgICBlbHNlIHsKQEAgLTU1MCwxNCArNTgyLDIw IEBAIGluZGV4IDg1MzQ2NWMuLjAwODY0YWMgMTAwNjQ0CiAgICAgIH0KICAKICsjaWYgVVNFX0JS SURHRV9IT1RLRVkKLSsgICAgaWYgKHVzZV9icmlkZ2VfaG90a2V5IChpYnVzKSkgeworKyAgICBp ZiAodXNlX2JyaWRnZV9ob3RrZXkgKGlidXMpICYmIGRlc2MgIT0gbmV4dF9kZXNjKSB7CiArICAg ICAgICBidXNfaW5wdXRfY29udGV4dF9zZXRfcHJldl9ob3RrZXlfZW5naW5lIChjb250ZXh0LCBk ZXNjKTsKKysgICAgICAgIGlmIChkZXNjICE9IE5VTEwgJiYKKysgICAgICAgICAgICBnX2FzY2lp X3N0cm5jYXNlY21wIChpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChkZXNjKSwKKysgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBERUZBVUxUX0JSSURHRV9FTkdJTkVfTkFNRSwKKysg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJsZW4gKERFRkFVTFRfQlJJREdFX0VO R0lORV9OQU1FKSkgPT0gMCkgeworKyAgICAgICAgICAgIF91cGRhdGVfaG90a2V5c19ieV9wcmV2 X2VuZ2luZV9kZXNjIChpYnVzLCBkZXNjLCBuZXh0X2Rlc2MpOworKyAgICAgICAgfQogKyAgICB9 CiArI2VuZGlmCiAgICAgIGJ1c19pYnVzX2ltcGxfc2V0X2NvbnRleHRfZW5naW5lX2Zyb21fZGVz YyAoaWJ1cywgY29udGV4dCwgbmV4dF9kZXNjKTsKICB9CiAgCi1AQCAtMTM4OSw3ICsxNzUyLDkg QEAgYnVzX2lidXNfaW1wbF9jb250ZXh0X3JlcXVlc3RfcHJldmlvdXNfZQorQEAgLTEzODcsNyAr MTc4Myw5IEBAIGJ1c19pYnVzX2ltcGxfY29udGV4dF9yZXF1ZXN0X3ByZXZpb3VzX2UKICAgICAg ICAgIGlmICghaWJ1cy0+Z2xvYmFsX3ByZXZpb3VzX2VuZ2luZV9uYW1lKSB7CiAgICAgICAgICAg ICAgaWJ1cy0+Z2xvYmFsX3ByZXZpb3VzX2VuZ2luZV9uYW1lID0gYnVzX2lidXNfaW1wbF9sb2Fk X2dsb2JhbF9wcmV2aW91c19lbmdpbmVfbmFtZV9mcm9tX2NvbmZpZyAoaWJ1cyk7CiAgICAgICAg ICB9CkBAIC01NjcsNyArNjA1LDcgQEAgaW5kZXggODUzNDY1Yy4uMDA4NjRhYyAxMDA2NDQKICAg ICAgICAgIGlmIChlbmdpbmVfbmFtZSAhPSBOVUxMKSB7CiAgICAgICAgICAgICAgLyogSWYgdGhl IHByZXZpb3VzIGVuZ2luZSBpcyByZW1vdmVkIGZyb20gdGhlIGVuZ2luZSBsaXN0IG9yIHRoZQog ICAgICAgICAgICAgICAgIGN1cnJlbnQgZW5naW5lIGFuZCB0aGUgcHJldmlvdXMgZW5naW5lIGFy ZSB0aGUgc2FtZSBvbmUsIGZvcmNlCi1AQCAtMTQ1MCw2ICsxODE1LDkgQEAgYnVzX2lidXNfaW1w bF9zZXRfZm9jdXNlZF9jb250ZXh0IChCdXNJQgorQEAgLTE0NDgsNiArMTg0Niw5IEBAIGJ1c19p YnVzX2ltcGxfc2V0X2ZvY3VzZWRfY29udGV4dCAoQnVzSUIKICAKICAgICAgQnVzRW5naW5lUHJv eHkgKmVuZ2luZSA9IE5VTEw7CiAgICAgIGdib29sZWFuIGlzX2VuYWJsZWQgPSBGQUxTRTsKQEAg LTU3Nyw3ICs2MTUsNyBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAogIAogICAgICBp ZiAoaWJ1cy0+Zm9jdXNlZF9jb250ZXh0KSB7CiAgICAgICAgICBpZiAoaWJ1cy0+dXNlX2dsb2Jh bF9lbmdpbmUpIHsKLUBAIC0xNDU3LDYgKzE4MjUsOSBAQCBidXNfaWJ1c19pbXBsX3NldF9mb2N1 c2VkX2NvbnRleHQgKEJ1c0lCCitAQCAtMTQ1NSw2ICsxODU2LDkgQEAgYnVzX2lidXNfaW1wbF9z ZXRfZm9jdXNlZF9jb250ZXh0IChCdXNJQgogICAgICAgICAgICAgIGVuZ2luZSA9IGJ1c19pbnB1 dF9jb250ZXh0X2dldF9lbmdpbmUgKGlidXMtPmZvY3VzZWRfY29udGV4dCk7CiAgICAgICAgICAg ICAgaWYgKGVuZ2luZSkgewogICAgICAgICAgICAgICAgICBpc19lbmFibGVkID0gYnVzX2lucHV0 X2NvbnRleHRfaXNfZW5hYmxlZCAoaWJ1cy0+Zm9jdXNlZF9jb250ZXh0KTsKQEAgLTU4Nyw3ICs2 MjUsNyBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAogICAgICAgICAgICAgICAgICBn X29iamVjdF9yZWYgKGVuZ2luZSk7CiAgICAgICAgICAgICAgICAgIGJ1c19pbnB1dF9jb250ZXh0 X3NldF9lbmdpbmUgKGlidXMtPmZvY3VzZWRfY29udGV4dCwgTlVMTCk7CiAgICAgICAgICAgICAg fQotQEAgLTE0ODEsNiArMTg1Miw5IEBAIGJ1c19pYnVzX2ltcGxfc2V0X2ZvY3VzZWRfY29udGV4 dCAoQnVzSUIKK0BAIC0xNDc5LDYgKzE4ODMsOSBAQCBidXNfaWJ1c19pbXBsX3NldF9mb2N1c2Vk X2NvbnRleHQgKEJ1c0lCCiAgICAgICAgICAgICAgaWYgKGlzX2VuYWJsZWQpIHsKICAgICAgICAg ICAgICAgICAgYnVzX2lucHV0X2NvbnRleHRfZW5hYmxlIChjb250ZXh0KTsKICAgICAgICAgICAg ICB9CkBAIC01OTcsNyArNjM1LDcgQEAgaW5kZXggODUzNDY1Yy4uMDA4NjRhYyAxMDA2NDQKICAg ICAgICAgICAgICBnX29iamVjdF91bnJlZiAoZW5naW5lKTsKICAgICAgICAgIH0KICAKLUBAIC0x NzEwLDYgKzIwODQsMjUgQEAgX2NvbnRleHRfZGlzYWJsZWRfY2IgKEJ1c0lucHV0Q29udGV4dCAg IAorQEAgLTE3MDgsNiArMjExNSwyNSBAQCBfY29udGV4dF9kaXNhYmxlZF9jYiAoQnVzSW5wdXRD b250ZXh0ICAgCiAgfQogIAogIC8qKgpAQCAtNjIzLDcgKzY2MSw3IEBAIGluZGV4IDg1MzQ2NWMu LjAwODY0YWMgMTAwNjQ0CiAgICogYnVzX2lidXNfaW1wbF9jcmVhdGVfaW5wdXRfY29udGV4dDoK ICAgKiBAY2xpZW50OiBBIG5hbWUgb2YgYSBjbGllbnQuIGUuZy4gImd0ay1pbSIKICAgKiBAcmV0 dXJuczogQSBCdXNJbnB1dENvbnRleHQgb2JqZWN0LgotQEAgLTE3MzcsNiArMjEzMCw3IEBAIGJ1 c19pYnVzX2ltcGxfY3JlYXRlX2lucHV0X2NvbnRleHQgKEJ1c0kKK0BAIC0xNzM1LDYgKzIxNjEs NyBAQCBidXNfaWJ1c19pbXBsX2NyZWF0ZV9pbnB1dF9jb250ZXh0IChCdXNJCiAgICAgICAgICB7 ICJkZXN0cm95IiwgICAgICAgIEdfQ0FMTEJBQ0sgKF9jb250ZXh0X2Rlc3Ryb3lfY2IpIH0sCiAg ICAgICAgICB7ICJlbmFibGVkIiwgICAgICAgIEdfQ0FMTEJBQ0sgKF9jb250ZXh0X2VuYWJsZWRf Y2IpIH0sCiAgICAgICAgICB7ICJkaXNhYmxlZCIsICAgICAgIEdfQ0FMTEJBQ0sgKF9jb250ZXh0 X2Rpc2FibGVkX2NiKSB9LApAQCAtNjMxLDcgKzY2OSw3IEBAIGluZGV4IDg1MzQ2NWMuLjAwODY0 YWMgMTAwNjQ0CiAgICAgIH07CiAgCiAgICAgIGdpbnQgaTsKLUBAIC0yMzE0LDYgKzI3MDgsOSBA QCBidXNfaWJ1c19pbXBsX2ZpbHRlcl9rZXlib2FyZF9zaG9ydGN1dHMgCitAQCAtMjMxMiw2ICsy NzM5LDkgQEAgYnVzX2lidXNfaW1wbF9maWx0ZXJfa2V5Ym9hcmRfc2hvcnRjdXRzIAogIAogICAg ICBHUXVhcmsgZXZlbnQ7CiAgICAgIEdMaXN0ICplbmdpbmVfbGlzdDsKQEAgLTY0MSw3ICs2Nzks NyBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0NAogIAogICAgICBpZiAodHJpZ2dlciA9 PSAwKSB7CiAgICAgICAgICB0cmlnZ2VyID0gZ19xdWFya19mcm9tX3N0YXRpY19zdHJpbmcgKCJ0 cmlnZ2VyIik7Ci1AQCAtMjM3OSw2ICsyNzc2LDEyIEBAIGJ1c19pYnVzX2ltcGxfZmlsdGVyX2tl eWJvYXJkX3Nob3J0Y3V0cyAKK0BAIC0yMzc3LDYgKzI4MDcsMTIgQEAgYnVzX2lidXNfaW1wbF9m aWx0ZXJfa2V5Ym9hcmRfc2hvcnRjdXRzIAogICAgICAgICAgcmV0dXJuIEZBTFNFOwogICAgICB9 CiAgCkBAIC02NTQsNyArNjkyLDcgQEAgaW5kZXggODUzNDY1Yy4uMDA4NjRhYyAxMDA2NDQKICAg ICAgLyogVGhlbiB0cnkgZW5naW5lcyBob3RrZXlzLiAqLwogICAgICBldmVudCA9IGlidXNfaG90 a2V5X3Byb2ZpbGVfZmlsdGVyX2tleV9ldmVudCAoaWJ1cy0+ZW5naW5lc19ob3RrZXlfcHJvZmls ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtl eXZhbCwKLUBAIC0yNDAwLDYgKzI4MDMsMjQgQEAgYnVzX2lidXNfaW1wbF9maWx0ZXJfa2V5Ym9h cmRfc2hvcnRjdXRzIAorQEAgLTIzOTgsNiArMjgzNCwyNCBAQCBidXNfaWJ1c19pbXBsX2ZpbHRl cl9rZXlib2FyZF9zaG9ydGN1dHMgCiAgCiAgICAgICAgICBnX2Fzc2VydCAobmV3X2VuZ2luZV9k ZXNjKTsKICAKQEAgLTY3OSw3ICs3MTcsNyBAQCBpbmRleCA4NTM0NjVjLi4wMDg2NGFjIDEwMDY0 NAogICAgICAgICAgLyogRmluZCBvdXQgd2hhdCBlbmdpbmUgd2Ugc2hvdWxkIHN3aXRjaCB0by4g SWYgdGhlIGN1cnJlbnQgZW5naW5lIGhhcwogICAgICAgICAgICogdGhlIHNhbWUgaG90a2V5LCB0 aGVuIHdlIHNob3VsZCBzd2l0Y2ggdG8gdGhlIG5leHQgZW5naW5lIHdpdGggdGhlCiAgICAgICAg ICAgKiBzYW1lIGhvdGtleSBpbiB0aGUgbGlzdC4gT3RoZXJ3aXNlLCB3ZSBqdXN0IHN3aXRjaCB0 byB0aGUgZmlyc3QKLUBAIC0yNDExLDggKzI4MzIsNDcgQEAgYnVzX2lidXNfaW1wbF9maWx0ZXJf a2V5Ym9hcmRfc2hvcnRjdXRzIAorQEAgLTI0MDksOCArMjg2Myw0MyBAQCBidXNfaWJ1c19pbXBs X2ZpbHRlcl9rZXlib2FyZF9zaG9ydGN1dHMgCiAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgIH0KICAgICAgICAgIH0KQEAgLTY5NiwzOCArNzM0LDM0IEBAIGluZGV4IDg1MzQ2 NWMuLjAwODY0YWMgMTAwNjQ0CiArICAgICAgICAgICAgIWJ1c19pbnB1dF9jb250ZXh0X2luaXRl ZF9lbmdpbmUgKGNvbnRleHQpKSB7CiArICAgICAgICAgICAgcmV0dXJuIEZBTFNFOwogKyAgICAg ICAgfQotKwotKyAgICAgICAgaWYgKGN1cnJlbnRfZW5naW5lX2Rlc2MgIT0gbmV3X2VuZ2luZV9k ZXNjKSB7CisgCisgICAgICAgICBpZiAoY3VycmVudF9lbmdpbmVfZGVzYyAhPSBuZXdfZW5naW5l X2Rlc2MpIHsKICsgICAgICAgICAgICBpZiAoY3VycmVudF9lbmdpbmVfZGVzYykgewogKyAgICAg ICAgICAgICAgICBpZiAoY29udGV4dCkgewogKyAgICAgICAgICAgICAgICAgICAgYnVzX2lucHV0 X2NvbnRleHRfc2V0X3ByZXZfaG90a2V5X2VuZ2luZSAoY29udGV4dCwKICsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRf ZW5naW5lX2Rlc2MpOwogKyAgICAgICAgICAgICAgICB9CiArICAgICAgICAgICAgfQotIAotKyAg ICAgICAgICAgIC8qIElmIHRoZSBwcmV2aW91cyBlbmdpbmUgaXMgbm90IGluY2x1ZGVkIGluIGVu Z2luZV9saXN0IGFuZAotKyAgICAgICAgICAgICAqIHRoZSBjdXJyZW50IGVuZ2luZSBpcyB0aGUg ZGVmdWFsdCBicmlkZ2UgZW5naW5lLAotKyAgICAgICAgICAgICAqIHRoZSBjdXJyZW50IGVuZ2lu ZSBpcyBhbHNvIG5vdCBpbmNsdWRlZCBpbiBlbmdpbmVfbGlzdC4KKysKKysgICAgICAgICAgICAv KiBJZiB0aGUgY3VycmVudCBlbmdpbmUgaXMgdGhlIGRlZnVhbHQgYnJpZGdlIGVuZ2luZSwKKysg ICAgICAgICAgICAgKiB0aGUgY3VycmVudCBlbmdpbmUgaXMgbm90IGluY2x1ZGVkIGluIGVuZ2lu ZV9saXN0LgorKyAgICAgICAgICAgICAqIEUuZy4gcHJldiBpcyBDdHJsK3NwYWNlIGFuZCBaZW5h a3UgYW5kIGN1cnJlbnQgaXMgQ3RybCtzcGFjZS4KICsgICAgICAgICAgICAgKiBTbyB0aGUgZW5n aW5lIGlzIGFkZGVkIGhlcmUuICovCiArICAgICAgICAgICAgaWYgKGN1cnJlbnRfZW5naW5lX2Rl c2MgIT0gTlVMTCAmJgotKyAgICAgICAgICAgICAgICBnX2xpc3RfZmluZCAoZW5naW5lX2xpc3Qs IGN1cnJlbnRfZW5naW5lX2Rlc2MpID09IE5VTEwgJiYKICsgICAgICAgICAgICAgICAgZ19hc2Np aV9zdHJuY2FzZWNtcCAoaWJ1c19lbmdpbmVfZGVzY19nZXRfbmFtZSAoY3VycmVudF9lbmdpbmVf ZGVzYyksCiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERFRkFVTFRfQlJJ REdFX0VOR0lORV9OQU1FLAogKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dHJsZW4gKERFRkFVTFRfQlJJREdFX0VOR0lORV9OQU1FKSkgPT0gMCkgewotKyAgICAgICAgICAg ICAgICBlbmdpbmVfbGlzdCA9IGdfbGlzdF9hcHBlbmQgKGVuZ2luZV9saXN0LCBjdXJyZW50X2Vu Z2luZV9kZXNjKTsKLSsKLSsgICAgICAgICAgICAgICAgZ19oYXNoX3RhYmxlX3N0ZWFsIChpYnVz LT5ob3RrZXlfdG9fZW5naW5lc19tYXAsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgR1VJTlRfVE9fUE9JTlRFUiAoZXZlbnQpKTsKLSsgICAgICAgICAgICAgICAgZ19oYXNo X3RhYmxlX2luc2VydCAoaWJ1cy0+aG90a2V5X3RvX2VuZ2luZXNfbWFwLAotKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBHVUlOVF9UT19QT0lOVEVSIChldmVudCksIGVuZ2lu ZV9saXN0KTsKKysgICAgICAgICAgICAgICAgX3VwZGF0ZV9ob3RrZXlzX2J5X3ByZXZfZW5naW5l X2Rlc2MgKGlidXMsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjdXJyZW50X2VuZ2luZV9kZXNjLAorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3X2VuZ2luZV9kZXNjKTsKICsgICAgICAg ICAgICB9CiArI2Vsc2UKLSAgICAgICAgIGlmIChjdXJyZW50X2VuZ2luZV9kZXNjICE9IG5ld19l bmdpbmVfZGVzYykgeworKyAgICAgICAgaWYgKGN1cnJlbnRfZW5naW5lX2Rlc2MgIT0gbmV3X2Vu Z2luZV9kZXNjKSB7CiArI2VuZGlmCiAgICAgICAgICAgICAgYnVzX2lidXNfaW1wbF9zZXRfY29u dGV4dF9lbmdpbmVfZnJvbV9kZXNjIChpYnVzLCBjb250ZXh0LCBuZXdfZW5naW5lX2Rlc2MpOwog ICAgICAgICAgfQogIAotQEAgLTI1MTYsNTkgKzI5NzYsNTQgQEAgc3RhdGljIHZvaWQKK0BAIC0y NTE0LDU5ICszMDAzLDU0IEBAIHN0YXRpYyB2b2lkCiAgX2FkZF9lbmdpbmVfaG90a2V5IChJQnVz RW5naW5lRGVzYyAqZW5naW5lLCBCdXNJQnVzSW1wbCAqaWJ1cykKICB7CiAgICAgIGNvbnN0IGdj aGFyICpob3RrZXlzOwpAQCAtMTY1NCw3ICsxNjg4LDcgQEAgaW5kZXggN2NmMTk5NS4uYTE5ZDE2 ZSAxMDA2NDQKICsKICAjZW5kaWYKIGRpZmYgLS1naXQgYS91aS9ndGsvcGFuZWwucHkgYi91aS9n dGsvcGFuZWwucHkKLWluZGV4IDg4MDQ2MzQuLmJlZjZmYmYgMTAwNjQ0CitpbmRleCA4ODA0NjM0 Li4yZmMxMWJiIDEwMDY0NAogLS0tIGEvdWkvZ3RrL3BhbmVsLnB5CiArKysgYi91aS9ndGsvcGFu ZWwucHkKIEBAIC02Nyw2ICs2Nyw3IEBAIGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKQEAg LTE4MDAsOCArMTgzNCwxNSBAQCBpbmRleCA4ODA0NjM0Li5iZWY2ZmJmIDEwMDY0NAogICAgICAg ICAgaWYgbm90IGVuYWJsZWQ6CiAgICAgICAgICAgICAgc2VsZi5fX3NldF9pbV9pY29uKElDT05f S0VZQk9BUkQpCiAgICAgICAgICAgICAgc2VsZi5fX3NldF9pbV9uYW1lKE5vbmUpCi1AQCAtMjUw LDcgKzM1Myw3IEBAIGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKLSAgICAgICAgICAgICAg ICAgc2VsZi5fX3NldF9pbV9pY29uKGVuZ2luZS5pY29uKQorQEAgLTI0NywxMCArMzUwLDEzIEBA IGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKKyAgICAgICAgIGVsc2U6CisgICAgICAgICAg ICAgZW5naW5lID0gc2VsZi5fX2ZvY3VzX2ljLmdldF9lbmdpbmUoKQorICAgICAgICAgICAgIGlm IGVuZ2luZToKKy0gICAgICAgICAgICAgICAgc2VsZi5fX3NldF9pbV9pY29uKGVuZ2luZS5pY29u KQorKyAgICAgICAgICAgICAgICBpZiBlbmdpbmUubmFtZS5zdGFydHN3aXRoKGlidXMuREVGQVVM VF9CUklER0VfRU5HSU5FX05BTUUpOgorKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fX3NldF9p bV9pY29uKElDT05fS0VZQk9BUkQpCisrICAgICAgICAgICAgICAgIGVsc2U6CisrICAgICAgICAg ICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oZW5naW5lLmljb24pCiAgICAgICAgICAgICAg ICAgIHNlbGYuX19zZXRfaW1fbmFtZShlbmdpbmUubG9uZ25hbWUpCiAgICAgICAgICAgICAgICAg IGlmIHNlbGYuX19idXMuZ2V0X3VzZV9zeXNfbGF5b3V0KCk6CiAtICAgICAgICAgICAgICAgICAg ICBzZWxmLl9feGtibGF5b3V0LnNldF9sYXlvdXQoc2VsZi5fX2VuZ2luZV9nZXRfbGF5b3V0X3dy YXBwZXIoZW5naW5lKSkKQEAgLTE4MDksNyArMTg1MCw3IEBAIGluZGV4IDg4MDQ2MzQuLmJlZjZm YmYgMTAwNjQ0CiAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgc2VsZi5fX3Nl dF9pbV9pY29uKElDT05fS0VZQk9BUkQpCiAgICAgICAgICAgICAgICAgIHNlbGYuX19zZXRfaW1f bmFtZShOb25lKQotQEAgLTI3Myw3ICszNzYsMjEgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJh c2UpOgorQEAgLTI3Myw3ICszNzksMjEgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgog ICAgICAgICAgICAgIHJldHVybgogIAogICAgICAgICAgZW5hYmxlZCA9IHNlbGYuX19mb2N1c19p Yy5pc19lbmFibGVkKCkKQEAgLTE4MzIsOCArMTg3MywxNSBAQCBpbmRleCA4ODA0NjM0Li5iZWY2 ZmJmIDEwMDY0NAogIAogICAgICAgICAgaWYgZW5hYmxlZCA9PSBGYWxzZToKICAgICAgICAgICAg ICBzZWxmLnJlc2V0KCkKLUBAIC0yODcsNyArNDA0LDcgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5l bEJhc2UpOgotICAgICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oZW5naW5lLmljb24p CitAQCAtMjg0LDEwICs0MDQsMTMgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorICAg ICAgICAgZWxzZToKKyAgICAgICAgICAgICBlbmdpbmUgPSBzZWxmLl9fZm9jdXNfaWMuZ2V0X2Vu Z2luZSgpCisgICAgICAgICAgICAgaWYgZW5naW5lOgorLSAgICAgICAgICAgICAgICBzZWxmLl9f c2V0X2ltX2ljb24oZW5naW5lLmljb24pCisrICAgICAgICAgICAgICAgIGlmIGVuZ2luZS5uYW1l LnN0YXJ0c3dpdGgoaWJ1cy5ERUZBVUxUX0JSSURHRV9FTkdJTkVfTkFNRSk6CisrICAgICAgICAg ICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oSUNPTl9LRVlCT0FSRCkKKysgICAgICAgICAg ICAgICAgZWxzZToKKysgICAgICAgICAgICAgICAgICAgIHNlbGYuX19zZXRfaW1faWNvbihlbmdp bmUuaWNvbikKICAgICAgICAgICAgICAgICAgc2VsZi5fX3NldF9pbV9uYW1lKGVuZ2luZS5sb25n bmFtZSkKICAgICAgICAgICAgICAgICAgaWYgc2VsZi5fX2J1cy5nZXRfdXNlX3N5c19sYXlvdXQo KToKIC0gICAgICAgICAgICAgICAgICAgIHNlbGYuX194a2JsYXlvdXQuc2V0X2xheW91dChzZWxm Ll9fZW5naW5lX2dldF9sYXlvdXRfd3JhcHBlcihlbmdpbmUpKQpAQCAtMTg0MSw3ICsxODg5LDcg QEAgaW5kZXggODgwNDYzNC4uYmVmNmZiZiAxMDA2NDQKICAgICAgICAgICAgICBlbHNlOgogICAg ICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oSUNPTl9LRVlCT0FSRCkKICAgICAgICAg ICAgICAgICAgc2VsZi5fX3NldF9pbV9uYW1lKE5vbmUpCi1AQCAtMzE1LDYgKzQzMiw3IEBAIGNs YXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC0zMTUsNiArNDM4LDcgQEAgY2xhc3MgUGFu ZWwoaWJ1cy5QYW5lbEJhc2UpOgogIAogICAgICBkZWYgX19jb25maWdfbG9hZF9zaG93KHNlbGYp OgogICAgICAgICAgc2hvdyA9IHNlbGYuX19jb25maWcuZ2V0X3ZhbHVlKCJwYW5lbCIsICJzaG93 IiwgMCkKQEAgLTE4NDksNyArMTg5Nyw3IEBAIGluZGV4IDg4MDQ2MzQuLmJlZjZmYmYgMTAwNjQ0 CiAgICAgICAgICBzZWxmLl9fbGFuZ3VhZ2VfYmFyLnNldF9zaG93KHNob3cpCiAgCiAgICAgIGRl ZiBfX2NvbmZpZ19sb2FkX3Bvc2l0aW9uKHNlbGYpOgotQEAgLTQ0Myw2ICs1NjEsMjEgQEAgY2xh c3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorQEAgLTQ0Myw2ICs1NjcsMjEgQEAgY2xhc3MgUGFu ZWwoaWJ1cy5QYW5lbEJhc2UpOgogICAgICAjICAgICBtZW51LnNldF90YWtlX2ZvY3VzKEZhbHNl KQogICAgICAjICAgICByZXR1cm4gbWVudQogIApAQCAtMTg3MSw3ICsxOTE5LDcgQEAgaW5kZXgg ODgwNDYzNC4uYmVmNmZiZiAxMDA2NDQKICAgICAgZGVmIF9fY3JlYXRlX2ltX21lbnUoc2VsZik6 CiAgICAgICAgICBlbmdpbmVzID0gc2VsZi5fX2J1cy5saXN0X2FjdGl2ZV9lbmdpbmVzKCkKICAg ICAgICAgIGN1cnJlbnRfZW5naW5lID0gXAotQEAgLTQ1MywyNSArNTg2LDM5IEBAIGNsYXNzIFBh bmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC00NTMsMjUgKzU5MiwzOSBAQCBjbGFzcyBQYW5lbChp YnVzLlBhbmVsQmFzZSk6CiAgICAgICAgICBzaXplID0gZ3RrLmljb25fc2l6ZV9sb29rdXAoZ3Rr LklDT05fU0laRV9NRU5VKQogICAgICAgICAgbWVudSA9IGd0ay5NZW51KCkKICAgICAgICAgIGZv ciBpLCBlbmdpbmUgaW4gZW51bWVyYXRlKGVuZ2luZXMpOgpAQCAtMTkyNCw3ICsxOTcyLDcgQEAg aW5kZXggODgwNDYzNC4uYmVmNmZiZiAxMDA2NDQKICAKICAgICAgICAgIG1lbnUuc2hvd19hbGwo KQogICAgICAgICAgbWVudS5zZXRfdGFrZV9mb2N1cyhGYWxzZSkKLUBAIC01MjMsOCArNjcwLDI1 IEBAIGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC01MjMsOCArNjc2LDI1IEBAIGNs YXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKICAgICAgICAgIGlmIG5vdCBzZWxmLl9fZm9jdXNf aWM6CiAgICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgICBpZiBlbmdpbmU6CkBAIC0xOTUxLDcg KzE5OTksNyBAQCBpbmRleCA4ODA0NjM0Li5iZWY2ZmJmIDEwMDY0NAogICAgICAgICAgICAgIHNl bGYuX19mb2N1c19pYy5kaXNhYmxlKCkKICAKICAgICAgZGVmIF9fc3lzX21lbnVfaXRlbV9hY3Rp dmF0ZV9jYihzZWxmLCBpdGVtLCBjb21tYW5kKToKLUBAIC01NzMsMTIgKzczNywxMTMgQEAgY2xh c3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorQEAgLTU3MywxMiArNzQzLDExMyBAQCBjbGFzcyBQ YW5lbChpYnVzLlBhbmVsQmFzZSk6CiAgICAgICAgICBzZWxmLl9fc2V0dXBfcGlkID0gcGlkCiAg ICAgICAgICBnbGliLmNoaWxkX3dhdGNoX2FkZChzZWxmLl9fc2V0dXBfcGlkLCBzZWxmLl9fY2hp bGRfd2F0Y2hfY2IpCiAgCgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4 IDc1ZGFiOWEuLmY0NTRkNDUgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysgYi9pYnVzLnNwZWMK QEAgLTMwLDcgKzMwLDcgQEAKIAogTmFtZTogICAgICAgaWJ1cwogVmVyc2lvbjogICAgMS40LjAK LVJlbGVhc2U6ICAgIDglez9kaXN0fQorUmVsZWFzZTogICAgOSV7P2Rpc3R9CiBTdW1tYXJ5OiAg ICBJbnRlbGxpZ2VudCBJbnB1dCBCdXMgZm9yIExpbnV4IE9TCiBMaWNlbnNlOiAgICBMR1BMdjIr CiBHcm91cDogICAgICBTeXN0ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVzCkBAIC0yMDgsNiArMjA4 LDE3IEBAIG12IGRhdGEvaWJ1cy5zY2hlbWFzLmluIGRhdGEvaWJ1cy5zY2hlbWFzLmluLmluCiAK ICVidWlsZAogJWlmICVoYXZlX2xpYnhrYmZpbGUKK1hLQl9QUkVMT0FEX0xBWU9VVFM9XAorInVz LHVzKGNociksdXMoZHZvcmFrKSxhZCxhbCxhbSxhcmEsYXosYmEsYmQsYmUsYmcsYnIsYnQsYnks IlwKKyJkZSxkayxjYSxjaCxjbih0aWIpLGN6LGVlLGVwbyxlcyxldCxmaSxmbyxmciwiXAorImdi LGdlLGdlKGRzYiksZ2UocnUpLGdlKG9zKSxnaCxnaChha2FuKSxnaChld2UpLGdoKGZ1bGEpLGdo KGdhKSxnaChoYXVzYSksIlwKKyJnbixncixodSxocixpZSxpZShDbG9HYWVsYWNoKSxpbCwiXAor ImluLCJcCisiaW4odGVsKSxpbihib2xuYWdyaSksaXEsaXEoa3UpLGlyLGlyKGt1KSxpcyxpdCwi XAorImtnLGtoLGt6LGxhLGxhdGFtLGxrLGxrKHRhbV91bmljb2RlKSxsdCxsdixtYSxtYSh0aWZp bmFnaCksbWFsLG1hbywiXAorIm1lLG1rLG1tLG10LG12LG5nLG5nKGhhdXNhKSxuZyxuZyhpZ2Jv KSxuZyh5b3J1YmEpLG5sLG5vLG5vKHNtaSksbnAsIlwKKyJwayxwbCxwbChjc2IpLHB0LHJvLHJz LHJ1LHJ1KGN2KSxydShrb20pLHJ1KHNhaCkscnUodHQpLHJ1KHhhbCksIlwKKyJzZSxzaSxzayxz eSxzeShrdSksdGgsdGosdHIsdWEsdXosdm4iCiBhY2xvY2FsIC1JIG00CiBhdXRvaGVhZGVyCiBh dXRvY29uZiAtZgpAQCAtMjIxLDYgKzIzMiw5IEBAIGF1dG9tYWtlIC1hIC1jIC1mCiAgICAgLS1k aXNhYmxlLWd0ay1kb2MgXAogICAgIC0td2l0aC1uby1zbm9vcGVyLWFwcHM9J2dub21lLWRvLERv LiosZmlyZWZveC4qLC4qY2hyb21lLiosLipjaHJvbWl1bS4qJyBcCiAgICAgLS1lbmFibGUtc3Vy cm91bmRpbmctdGV4dCBcCislaWYgJWhhdmVfbGlieGtiZmlsZQorICAgIC0td2l0aC14a2ItcHJl bG9hZC1sYXlvdXRzPSRYS0JfUFJFTE9BRF9MQVlPVVRTIFwKKyVlbmRpZgogJWlmICVoYXZlX2Jy aWRnZV9ob3RrZXkKICAgICAtLWVuYWJsZS1icmlkZ2UtaG90a2V5IFwKICVlbmRpZgpAQCAtMzky LDcgKzQwNiwxNyBAQCBmaQogJXtfZGF0YWRpcn0vZ3RrLWRvYy9odG1sLyoKIAogJWNoYW5nZWxv ZworKiBXZWQgTm92IDAyIDIwMTEgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+ IC0gMS40LjAtOQorLSBVcGRhdGVkIGlidXMtSEVBRC5wYXRjaAorICBGaXhlZCBwcmV2L25leHQg a2V5cyB3aXRob3V0IGdsb2JhbCBlbmdpbmUuCistIFVwZGF0ZWQgaWJ1cy14eC1icmlkZ2UtaG90 a2V5LnBhdGNoIGZvciBmMTYKKyAgRml4ZWQgQnVnIDc0NzkwMiAtIG1vdXNlIGFuZCBjdHJsK3Nw YWNlIG5vdCB3b3JraW5nCisgIEZpeGVkIEJ1ZyA3NDk3NzAgLSBJTUUgaG90a2V5IGFmdGVyIENv bnRyb2wgKyBTcGFjZQorLSBVcGRhdGVkIGlidXMtNzExNjMyLWZlZG9yYS1mYWxsYmFjay1pY29u LnBhdGNoCisgIEZpeGVkIEJ1ZyA3MTc4MzEgLSB1c2Ugb2xkIGljb24gZm9yIGRlc2t0b3BzIG90 aGVyIHRoYW4gZ25vbWUKKwogKiBGcmkgT2N0IDI4IDIwMTEgVGFrYW8gRnVqaXdhcmEgPHRmdWpp d2FyQHJlZGhhdC5jb20+IC0gMS40LjAtOAorLSBVcGRhdGVkIGlidXMteHgtYnJpZGdlLWhvdGtl eS5wYXRjaCBmb3IgZjE2CiAtIEZpeGVkIEJ1ZyA3NDc5MDIgLSBtb3VzZSBhbmQgY3RybCtzcGFj ZSBub3Qgd29ya2luZwogCiAqIFdlZCBPY3QgMjYgMjAxMSBGZWRvcmEgUmVsZWFzZSBFbmdpbmVl cmluZyA8cmVsLWVuZ0BsaXN0cy5mZWRvcmFwcm9qZWN0Lm9yZz4gLSAxLjQuMC02Cg==