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: Add preedit D-Bus signals to PostProcessKeyEvent Date: Sun, 31 May 2026 02:08:20 GMT Message-ID: <178019330013.1.15573002968950084899.rpms-ibus-1c5ffb1a7e11@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 1c5ffb1a7e11b85b2e1f0c16fc34b0322c929fd5 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiAxYzVmZmIxYTdlMTFiODViMmUxZjBjMTZmYzM0YjAzMjJjOTI5 ZmQ1CkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDIzLTEwLTI1VDE3OjU1OjAwKzA5OjAwClN0YXRzICA6ICs1MTgvLTEgaW4gMiBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzFjNWZm YjFhN2UxMWI4NWIyZTFmMGMxNmZjMzRiMDMyMmM5MjlmZDU/YnJhbmNoPWF1dG90b29sCgpMb2c6 CkFkZCBwcmVlZGl0IEQtQnVzIHNpZ25hbHMgdG8gUG9zdFByb2Nlc3NLZXlFdmVudAoKLS0tCmRp ZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggM2YzZWFl My4uYTcyYTBhNCAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVBRC5w YXRjaApAQCAtMTQxMiwzICsxNDEyLDUxNiBAQCBpbmRleCBkZWYyM2IyNS4uYzZhMDMwZmUgMTAw NjQ0CiAtLSAKIDIuNDEuMAogCitGcm9tIGVmMGQyOWQ4YmY0ZTUzM2M0MjhiMmNkOWQzZWU5ZmE0 MmU5ZTIwZTcgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2Fv LmZ1aml3YXJhMUBnbWFpbC5jb20+CitEYXRlOiBXZWQsIDI1IE9jdCAyMDIzIDE2OjQ2OjA3ICsw OTAwCitTdWJqZWN0OiBbUEFUQ0hdIHNyYzogQWRkIHByZWVkaXQgRC1CdXMgc2lnbmFscyB0byBQ b3N0UHJvY2Vzc0tleUV2ZW50CisKK2lidXMtaGFuZ3VsIGNhbGxzIFVwZGF0ZVByZWVkaXRUZXh0 IHNpZ25hbCBkdXJpbmcgcHJlc3NpbmcgRW50ZXIga2V5Cit0byBoaWRlIHRoZSBjdXJyZW50IHBy ZWVkaXQgdGV4dCBhbmQgdGhpcyBhbHNvIGNhdXNlcyB0aGUgcmVvcmRlciBpc3N1ZQoraW4gc3lu YyBwcm9jZXNzLWtleS1ldmVudCBhbmQgbmVlZCB0byBtb3ZlIHRoZSBwcmVlZGl0IHNpZ25hbHMK K3RvIFBvc3RQcm9jZXNzS2V5RXZlbnQuCisKK0Fsc28gcmVmYWN0b3IgUG9zdFByb2Nlc3NLZXlF dmVudCBjb2Rlcy4KKworRml4ZXM6IGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvY29tbWl0 LzM4ZjA5YzYKKworQlVHPWh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvcHVsbC8yNTc1Cist LS0KKyBidXMvaW5wdXRjb250ZXh0LmMgICAgIHwgMTc2ICsrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tCisgc3JjL2lidXNpbnB1dGNvbnRleHQuYyB8IDE2MiArKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCisgMiBmaWxlcyBjaGFuZ2VkLCAyNDggaW5z ZXJ0aW9ucygrKSwgOTAgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9idXMvaW5wdXRjb250 ZXh0LmMgYi9idXMvaW5wdXRjb250ZXh0LmMKK2luZGV4IDY0NDMwZmU0Li5jOTE0ZmJkMiAxMDA2 NDQKKy0tLSBhL2J1cy9pbnB1dGNvbnRleHQuYworKysrIGIvYnVzL2lucHV0Y29udGV4dC5jCitA QCAtNDgsMTEgKzQ4LDI1IEBAIHN0cnVjdCBfU2V0RW5naW5lQnlEZXNjRGF0YSB7CisgfTsKKyB0 eXBlZGVmIHN0cnVjdCBfU2V0RW5naW5lQnlEZXNjRGF0YSBTZXRFbmdpbmVCeURlc2NEYXRhOwor IAorK3R5cGVkZWYgc3RydWN0IF9EZWxldGVTdXJyb3VuZGluZ0RhdGEgeworKyAgICBnaW50ICAg ICAgICBvZmZzZXQ7CisrICAgIGd1aW50ICAgICAgIG5jaGFyczsKKyt9IERlbGV0ZVN1cnJvdW5k aW5nRGF0YTsKKysKKyB0eXBlZGVmIHN0cnVjdCBfU3luY0ZvcndhcmRpbmdEYXRhIHsKKy0gICAg Z2NoYXIgICAgIGtleTsKKy0gICAgSUJ1c1RleHQgKnRleHQ7CisrICAgIGNoYXIgICAgICAgIGtl eTsKKysgICAgSUJ1c1RleHQgICAqdGV4dDsKKyB9IFN5bmNGb3J3YXJkaW5nRGF0YTsKKyAKKyt0 eXBlZGVmIHN0cnVjdCBfU3luY0ZvcndhcmRpbmdQcmVEYXRhIHsKKysgICAgY2hhciAgICAgICAg a2V5OworKyAgICBJQnVzVGV4dCAgICp0ZXh0OworKyAgICB1bmlvbiB7CisrICAgICAgICBndWlu dCAgICAgICAgICAgICAgICAgdWludHNbM107CisrICAgICAgICBEZWxldGVTdXJyb3VuZGluZ0Rh dGEgZGVsZXRpbmc7CisrICAgIH0gdTsKKyt9IFN5bmNGb3J3YXJkaW5nUHJlRGF0YTsKKysKKyBz dHJ1Y3QgX0J1c0lucHV0Q29udGV4dCB7CisgICAgIElCdXNTZXJ2aWNlIHBhcmVudDsKKyAKK0BA IC05NDMsNiArOTU3LDcgQEAgX2ljX3Byb2Nlc3Nfa2V5X2V2ZW50IChCdXNJbnB1dENvbnRleHQg ICAgICAgKmNvbnRleHQsCisgICAgICAgICAgKi8KKyAgICAgICAgIGdfZGJ1c19tZXRob2RfaW52 b2NhdGlvbl9yZXR1cm5fdmFsdWUgKGludm9jYXRpb24sCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBnX3ZhcmlhbnRfbmV3ICgiKGIpIiwgVFJVRSkpOwor KyAgICAgICAgY29udGV4dC0+cHJvY2Vzc2luZ19rZXlfZXZlbnQgPSBGQUxTRTsKKyAgICAgICAg IHJldHVybjsKKyAgICAgfQorICAgICBpZiAoR19VTkxJS0VMWSAoIWNvbnRleHQtPmhhc19mb2N1 cykpIHsKK0BAIC0xMDA1LDYgKzEwMjAsNyBAQCBfaWNfcHJvY2Vzc19rZXlfZXZlbnQgKEJ1c0lu cHV0Q29udGV4dCAgICAgICAqY29udGV4dCwKKyAgICAgZWxzZSB7CisgICAgICAgICBnX2RidXNf bWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlIChpbnZvY2F0aW9uLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ192YXJpYW50X25ldyAoIihiKSIs IEZBTFNFKSk7CisrICAgICAgICBjb250ZXh0LT5wcm9jZXNzaW5nX2tleV9ldmVudCA9IEZBTFNF OworICAgICB9CisgfQorIAorQEAgLTE2NTQsNiArMTY3MCw3MSBAQCBidXNfaW5wdXRfY29udGV4 dF9zZXJ2aWNlX3NldF9wcm9wZXJ0eSAoSUJ1c1NlcnZpY2UgICAgICpzZXJ2aWNlLAorIH0KKyAK KyAKKytzdGF0aWMgZ2Jvb2xlYW4KKytidXNfaW5wdXRfY29udGV4dF9tYWtlX3Bvc3RfcHJvY2Vz c19rZXlfZXZlbnQgKEJ1c0lucHV0Q29udGV4dCAgICAgICAqY29udGV4dCwKKysgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN5bmNGb3J3YXJkaW5nUHJlRGF0 YSAqcHJlX2RhdGEpCisreworKyAgICBTeW5jRm9yd2FyZGluZ0RhdGEgKmRhdGE7CisrICAgIGlm IChjb250ZXh0LT5wcm9jZXNzaW5nX2tleV9ldmVudCAmJiBnX3F1ZXVlX2dldF9sZW5ndGggKAor KyAgICAgICAgICAgIGNvbnRleHQtPnF1ZXVlX2R1cmluZ19wcm9jZXNzX2tleV9ldmVudCkgPD0g TUFYX1NZTkNfREFUQSkgeworKyAgICAgICAgaWYgKGdfcXVldWVfZ2V0X2xlbmd0aCAoY29udGV4 dC0+cXVldWVfZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50KQorKyAgICAgICAgICAgID09IE1BWF9T WU5DX0RBVEEpIHsKKysgICAgICAgICAgICBnX3dhcm5pbmcgKCJFeGNlZWQgbWF4IG51bWJlciBv ZiBwb3N0IHByb2Nlc3Nfa2V5X2V2ZW50IGRhdGEiKTsKKysgICAgICAgIH0KKysgICAgICAgIGRh dGEgPSBnX3NsaWNlX25ldyAoU3luY0ZvcndhcmRpbmdEYXRhKTsKKysgICAgICAgIGRhdGEtPmtl eSA9IHByZV9kYXRhLT5rZXk7CisrICAgICAgICBzd2l0Y2ggKHByZV9kYXRhLT5rZXkpIHsKKysg ICAgICAgIGNhc2UgJ2MnOgorKyAgICAgICAgICAgIGRhdGEtPnRleHQgPSBnX29iamVjdF9yZWYg KHByZV9kYXRhLT50ZXh0KTsKKysgICAgICAgICAgICBicmVhazsKKysgICAgICAgIGNhc2UgJ2Qn OgorKyAgICAgICAgICAgIGRhdGEtPnRleHQgPSBpYnVzX3RleHRfbmV3X2Zyb21fcHJpbnRmICgK KysgICAgICAgICAgICAgICAgICAgICIlZCwldSIsCisrICAgICAgICAgICAgICAgICAgICBwcmVf ZGF0YS0+dS5kZWxldGluZy5vZmZzZXQsCisrICAgICAgICAgICAgICAgICAgICBwcmVfZGF0YS0+ dS5kZWxldGluZy5uY2hhcnMpOworKyAgICAgICAgICAgIGJyZWFrOworKyAgICAgICAgY2FzZSAn Zic6CisrICAgICAgICAgICAgZGF0YS0+dGV4dCA9IGlidXNfdGV4dF9uZXdfZnJvbV9wcmludGYg KCIldSwldSwldSIsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHByZV9kYXRhLT51LnVpbnRzWzBdLAorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVfZGF0YS0+dS51aW50c1sxXSwKKysgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlX2RhdGEt PnUudWludHNbMl0pOworKyAgICAgICAgICAgIGJyZWFrOworKyAgICAgICAgY2FzZSAnaCc6Cisr ICAgICAgICBjYXNlICdyJzoKKysgICAgICAgIGNhc2UgJ3MnOgorKyAgICAgICAgICAgIGRhdGEt PnRleHQgPSBpYnVzX3RleHRfbmV3X2Zyb21fc3RhdGljX3N0cmluZyAoIiIpOworKyAgICAgICAg ICAgIGJyZWFrOworKyAgICAgICAgY2FzZSAndSc6CisrICAgICAgICBjYXNlICdtJzoKKysgICAg ICAgICAgICBkYXRhLT50ZXh0ID0gZ19vYmplY3RfcmVmIChwcmVfZGF0YS0+dGV4dCk7CisrICAg ICAgICAgICAgZ19xdWV1ZV9wdXNoX3RhaWwgKGNvbnRleHQtPnF1ZXVlX2R1cmluZ19wcm9jZXNz X2tleV9ldmVudCwgZGF0YSk7CisrICAgICAgICAgICAgZGF0YSA9IGdfc2xpY2VfbmV3IChTeW5j Rm9yd2FyZGluZ0RhdGEpOworKyAgICAgICAgICAgIGRhdGEtPmtleSA9IHByZV9kYXRhLT5rZXk7 CisrICAgICAgICAgICAgaWYgKHByZV9kYXRhLT5rZXkgPT0gJ3UnKSB7CisrICAgICAgICAgICAg ICAgIGRhdGEtPnRleHQgPSBpYnVzX3RleHRfbmV3X2Zyb21fcHJpbnRmICgKKysgICAgICAgICAg ICAgICAgICAgICAgICAiJXUsJXUiLAorKyAgICAgICAgICAgICAgICAgICAgICAgIHByZV9kYXRh LT51LnVpbnRzWzBdLAorKyAgICAgICAgICAgICAgICAgICAgICAgIHByZV9kYXRhLT51LnVpbnRz WzFdKTsKKysgICAgICAgICAgICB9IGVsc2UgeworKyAgICAgICAgICAgICAgICBkYXRhLT50ZXh0 ID0gaWJ1c190ZXh0X25ld19mcm9tX3ByaW50ZiAoCisrICAgICAgICAgICAgICAgICAgICAgICAg IiV1LCV1LCV1IiwKKysgICAgICAgICAgICAgICAgICAgICAgICBwcmVfZGF0YS0+dS51aW50c1sw XSwKKysgICAgICAgICAgICAgICAgICAgICAgICBwcmVfZGF0YS0+dS51aW50c1sxXSwKKysgICAg ICAgICAgICAgICAgICAgICAgICBwcmVfZGF0YS0+dS51aW50c1syXSk7CisrICAgICAgICAgICAg fQorKyAgICAgICAgICAgIGJyZWFrOworKyAgICAgICAgZGVmYXVsdDoKKysgICAgICAgICAgICBn X3dhcm5pbmcgKCJUeXBlICVjIG9mIFN5bmNGb3J3YXJkaW5nRGF0YSBpcyBub3Qgc3VwcG9ydGVk IiwKKysgICAgICAgICAgICAgICAgICAgICAgIHByZV9kYXRhLT5rZXkpOworKyAgICAgICAgICAg IGdfc2xpY2VfZnJlZSAoU3luY0ZvcndhcmRpbmdEYXRhLCBkYXRhKTsKKysgICAgICAgICAgICBy ZXR1cm4gRkFMU0U7CisrICAgICAgICB9CisrICAgICAgICBnX3F1ZXVlX3B1c2hfdGFpbCAoY29u dGV4dC0+cXVldWVfZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50LCBkYXRhKTsKKysgICAgICAgIHJl dHVybiBUUlVFOworKyAgICB9CisrICAgIHJldHVybiBGQUxTRTsKKyt9CisrCisgZ2Jvb2xlYW4K KyBidXNfaW5wdXRfY29udGV4dF9oYXNfZm9jdXMgKEJ1c0lucHV0Q29udGV4dCAqY29udGV4dCkK KyB7CitAQCAtMTg5Myw2ICsxOTc0LDkgQEAgYnVzX2lucHV0X2NvbnRleHRfc2hvd19wcmVlZGl0 X3RleHQgKEJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKKyAgICAgfQorIAorICAgICBpZiAoUFJF RURJVF9DT05ESVRJT04pIHsKKysgICAgICAgIFN5bmNGb3J3YXJkaW5nUHJlRGF0YSBwcmVfZGF0 YSA9IHsgJ3MnLCB9OworKyAgICAgICAgaWYgKGJ1c19pbnB1dF9jb250ZXh0X21ha2VfcG9zdF9w cm9jZXNzX2tleV9ldmVudCAoY29udGV4dCwgJnByZV9kYXRhKSkKKysgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICBidXNfaW5wdXRfY29udGV4dF9lbWl0X3NpZ25hbCAoY29udGV4dCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiU2hvd1ByZWVkaXRUZXh0IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorQEAgLTE5MzMs NiArMjAxNyw5IEBAIGJ1c19pbnB1dF9jb250ZXh0X2hpZGVfcHJlZWRpdF90ZXh0IChCdXNJbnB1 dENvbnRleHQgKmNvbnRleHQsCisgICAgIH0KKyAKKyAgICAgaWYgKFBSRUVESVRfQ09ORElUSU9O KSB7CisrICAgICAgICBTeW5jRm9yd2FyZGluZ1ByZURhdGEgcHJlX2RhdGEgPSB7ICdoJywgfTsK KysgICAgICAgIGlmIChidXNfaW5wdXRfY29udGV4dF9tYWtlX3Bvc3RfcHJvY2Vzc19rZXlfZXZl bnQgKGNvbnRleHQsICZwcmVfZGF0YSkpCisrICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg YnVzX2lucHV0X2NvbnRleHRfZW1pdF9zaWduYWwgKGNvbnRleHQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIkhpZGVQcmVlZGl0VGV4dCIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKK0BAIC0yMzc1LDI3ICsyNDYyLDE4IEBA IF9lbmdpbmVfZm9yd2FyZF9rZXlfZXZlbnRfY2IgKEJ1c0VuZ2luZVByb3h5ICAgICplbmdpbmUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQgICAgICAgICAgICAgIHN0YXRl LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJ1c0lucHV0Q29udGV4dCAgICpjb250 ZXh0KQorIHsKKysgICAgU3luY0ZvcndhcmRpbmdQcmVEYXRhIHByZV9kYXRhID0geyAnZicsIH07 CisrCisgICAgIGdfYXNzZXJ0IChCVVNfSVNfRU5HSU5FX1BST1hZIChlbmdpbmUpKTsKKyAgICAg Z19hc3NlcnQgKEJVU19JU19JTlBVVF9DT05URVhUIChjb250ZXh0KSk7CistCisgICAgIGdfYXNz ZXJ0IChjb250ZXh0LT5lbmdpbmUgPT0gZW5naW5lKTsKKyAgICAgZ19hc3NlcnQgKGNvbnRleHQt PnF1ZXVlX2R1cmluZ19wcm9jZXNzX2tleV9ldmVudCk7CisgCistICAgIGlmIChjb250ZXh0LT5w cm9jZXNzaW5nX2tleV9ldmVudCAmJiBnX3F1ZXVlX2dldF9sZW5ndGggKAorLSAgICAgICAgICAg IGNvbnRleHQtPnF1ZXVlX2R1cmluZ19wcm9jZXNzX2tleV9ldmVudCkgPD0gTUFYX1NZTkNfREFU QSkgeworLSAgICAgICAgU3luY0ZvcndhcmRpbmdEYXRhICpkYXRhOworLSAgICAgICAgSUJ1c1Rl eHQgKnRleHQgPSBpYnVzX3RleHRfbmV3X2Zyb21fcHJpbnRmICgiJXUsJXUsJXUiLAorLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXl2YWwsIGtl eWNvZGUsIHN0YXRlKTsKKy0gICAgICAgIGlmIChnX3F1ZXVlX2dldF9sZW5ndGggKGNvbnRleHQt PnF1ZXVlX2R1cmluZ19wcm9jZXNzX2tleV9ldmVudCkKKy0gICAgICAgICAgICA9PSBNQVhfU1lO Q19EQVRBKSB7CistICAgICAgICAgICAgZ193YXJuaW5nICgiRXhjZWVkIG1heCBudW1iZXIgb2Yg cG9zdCBwcm9jZXNzX2tleV9ldmVudCBkYXRhIik7CistICAgICAgICB9CistICAgICAgICBkYXRh ID0gZ19zbGljZV9uZXcgKFN5bmNGb3J3YXJkaW5nRGF0YSk7CistICAgICAgICBkYXRhLT5rZXkg PSAnZic7CistICAgICAgICBkYXRhLT50ZXh0ID0gdGV4dDsKKy0gICAgICAgIGdfcXVldWVfcHVz aF90YWlsIChjb250ZXh0LT5xdWV1ZV9kdXJpbmdfcHJvY2Vzc19rZXlfZXZlbnQsIGRhdGEpOwor KyAgICBwcmVfZGF0YS51LnVpbnRzWzBdID0ga2V5dmFsOworKyAgICBwcmVfZGF0YS51LnVpbnRz WzFdID0ga2V5Y29kZTsKKysgICAgcHJlX2RhdGEudS51aW50c1syXSA9IHN0YXRlOworKyAgICBp ZiAoYnVzX2lucHV0X2NvbnRleHRfbWFrZV9wb3N0X3Byb2Nlc3Nfa2V5X2V2ZW50IChjb250ZXh0 LCAmcHJlX2RhdGEpKQorICAgICAgICAgcmV0dXJuOworLSAgICB9CisgICAgIGJ1c19pbnB1dF9j b250ZXh0X2VtaXRfc2lnbmFsIChjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIkZvcndhcmRLZXlFdmVudCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBnX3ZhcmlhbnRfbmV3ICgiKHV1dSkiLAorQEAgLTI0MTUsMjYgKzI0OTMsMTYgQEAg X2VuZ2luZV9kZWxldGVfc3Vycm91bmRpbmdfdGV4dF9jYiAoQnVzRW5naW5lUHJveHkgICAgKmVu Z2luZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICAgICAg ICAgICAgbmNoYXJzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJ1c0lu cHV0Q29udGV4dCAgICpjb250ZXh0KQorIHsKKysgICAgU3luY0ZvcndhcmRpbmdQcmVEYXRhIHBy ZV9kYXRhID0geyAnZCcsIH07CisrCisgICAgIGdfYXNzZXJ0IChCVVNfSVNfRU5HSU5FX1BST1hZ IChlbmdpbmUpKTsKKyAgICAgZ19hc3NlcnQgKEJVU19JU19JTlBVVF9DT05URVhUIChjb250ZXh0 KSk7CistCisgICAgIGdfYXNzZXJ0IChjb250ZXh0LT5lbmdpbmUgPT0gZW5naW5lKTsKKyAKKy0g ICAgaWYgKGNvbnRleHQtPnByb2Nlc3Npbmdfa2V5X2V2ZW50ICYmIGdfcXVldWVfZ2V0X2xlbmd0 aCAoCistICAgICAgICAgICAgY29udGV4dC0+cXVldWVfZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50 KSA8PSBNQVhfU1lOQ19EQVRBKSB7CistICAgICAgICBTeW5jRm9yd2FyZGluZ0RhdGEgKmRhdGE7 CistICAgICAgICBJQnVzVGV4dCAqdGV4dCA9IGlidXNfdGV4dF9uZXdfZnJvbV9wcmludGYgKCIl ZCwldSIsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG9mZnNldF9mcm9tX2N1cnNvciwgbmNoYXJzKTsKKy0gICAgICAgIGlmIChnX3F1ZXVlX2dl dF9sZW5ndGggKGNvbnRleHQtPnF1ZXVlX2R1cmluZ19wcm9jZXNzX2tleV9ldmVudCkKKy0gICAg ICAgICAgICA9PSBNQVhfU1lOQ19EQVRBKSB7CistICAgICAgICAgICAgZ193YXJuaW5nICgiRXhj ZWVkIG1heCBudW1iZXIgb2Ygc3luYyBwcm9jZXNzX2tleV9ldmVudCBkYXRhIik7CistICAgICAg ICB9CistICAgICAgICBkYXRhID0gZ19zbGljZV9uZXcgKFN5bmNGb3J3YXJkaW5nRGF0YSk7Cist ICAgICAgICBkYXRhLT5rZXkgPSAnZCc7CistICAgICAgICBkYXRhLT50ZXh0ID0gZ19vYmplY3Rf cmVmICh0ZXh0KTsKKy0gICAgICAgIGdfcXVldWVfcHVzaF90YWlsIChjb250ZXh0LT5xdWV1ZV9k dXJpbmdfcHJvY2Vzc19rZXlfZXZlbnQsIGRhdGEpOworKyAgICBwcmVfZGF0YS51LmRlbGV0aW5n Lm9mZnNldCA9IG9mZnNldF9mcm9tX2N1cnNvcjsKKysgICAgcHJlX2RhdGEudS5kZWxldGluZy5u Y2hhcnMgPSBuY2hhcnM7CisrICAgIGlmIChidXNfaW5wdXRfY29udGV4dF9tYWtlX3Bvc3RfcHJv Y2Vzc19rZXlfZXZlbnQgKGNvbnRleHQsICZwcmVfZGF0YSkpCisgICAgICAgICByZXR1cm47Cist ICAgIH0KKyAgICAgYnVzX2lucHV0X2NvbnRleHRfZW1pdF9zaWduYWwgKGNvbnRleHQsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRGVsZXRlU3Vycm91bmRpbmdUZXh0IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfdmFyaWFudF9uZXcgKCIoaXUp IiwKK0BAIC0yNDUyLDI1ICsyNTIwLDE0IEBAIHN0YXRpYyB2b2lkCisgX2VuZ2luZV9yZXF1aXJl X3N1cnJvdW5kaW5nX3RleHRfY2IgKEJ1c0VuZ2luZVByb3h5ICAgICplbmdpbmUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJ1c0lucHV0Q29udGV4dCAgICpjb250ZXh0 KQorIHsKKysgICAgU3luY0ZvcndhcmRpbmdQcmVEYXRhIHByZV9kYXRhID0geyAncicsIH07Cisr CisgICAgIGdfYXNzZXJ0IChCVVNfSVNfRU5HSU5FX1BST1hZIChlbmdpbmUpKTsKKyAgICAgZ19h c3NlcnQgKEJVU19JU19JTlBVVF9DT05URVhUIChjb250ZXh0KSk7CistCisgICAgIGdfYXNzZXJ0 IChjb250ZXh0LT5lbmdpbmUgPT0gZW5naW5lKTsKKyAKKy0gICAgaWYgKGNvbnRleHQtPnByb2Nl c3Npbmdfa2V5X2V2ZW50ICYmIGdfcXVldWVfZ2V0X2xlbmd0aCAoCistICAgICAgICAgICAgY29u dGV4dC0+cXVldWVfZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50KSA8PSBNQVhfU1lOQ19EQVRBKSB7 CistICAgICAgICBTeW5jRm9yd2FyZGluZ0RhdGEgKmRhdGE7CistICAgICAgICBJQnVzVGV4dCAq dGV4dCA9IGlidXNfdGV4dF9uZXdfZnJvbV9zdGF0aWNfc3RyaW5nICgiIik7CistICAgICAgICBp ZiAoZ19xdWV1ZV9nZXRfbGVuZ3RoIChjb250ZXh0LT5xdWV1ZV9kdXJpbmdfcHJvY2Vzc19rZXlf ZXZlbnQpCistICAgICAgICAgICAgPT0gTUFYX1NZTkNfREFUQSkgeworLSAgICAgICAgICAgIGdf d2FybmluZyAoIkV4Y2VlZCBtYXggbnVtYmVyIG9mIHBvc3QgcHJvY2Vzc19rZXlfZXZlbnQgZGF0 YSIpOworLSAgICAgICAgfQorLSAgICAgICAgZGF0YSA9IGdfc2xpY2VfbmV3IChTeW5jRm9yd2Fy ZGluZ0RhdGEpOworLSAgICAgICAgZGF0YS0+a2V5ID0gJ3InOworLSAgICAgICAgZGF0YS0+dGV4 dCA9IHRleHQ7CistICAgICAgICBnX3F1ZXVlX3B1c2hfdGFpbCAoY29udGV4dC0+cXVldWVfZHVy aW5nX3Byb2Nlc3Nfa2V5X2V2ZW50LCBkYXRhKTsKKysgICAgaWYgKGJ1c19pbnB1dF9jb250ZXh0 X21ha2VfcG9zdF9wcm9jZXNzX2tleV9ldmVudCAoY29udGV4dCwgJnByZV9kYXRhKSkKKyAgICAg ICAgIHJldHVybjsKKy0gICAgfQorICAgICBidXNfaW5wdXRfY29udGV4dF9lbWl0X3NpZ25hbCAo Y29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJSZXF1aXJlU3Vy cm91bmRpbmdUZXh0IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEws CitAQCAtMzE3OCw2ICszMjM1LDggQEAgYnVzX2lucHV0X2NvbnRleHRfY29tbWl0X3RleHRfdXNl X2V4dGVuc2lvbiAoQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIElCdXNUZXh0ICAgICAgICAqdGV4dCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAgICAg IHVzZV9leHRlbnNpb24pCisgeworKyAgICBTeW5jRm9yd2FyZGluZ1ByZURhdGEgcHJlX2RhdGEg PSB7ICdjJywgdGV4dCwgfTsKKysKKyAgICAgZ19hc3NlcnQgKEJVU19JU19JTlBVVF9DT05URVhU IChjb250ZXh0KSk7CisgICAgIGdfYXNzZXJ0IChjb250ZXh0LT5xdWV1ZV9kdXJpbmdfcHJvY2Vz c19rZXlfZXZlbnQpOworIAorQEAgLTMxODYsMTcgKzMyNDUsOSBAQCBidXNfaW5wdXRfY29udGV4 dF9jb21taXRfdGV4dF91c2VfZXh0ZW5zaW9uIChCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisg CisgICAgIGlmICh1c2VfZXh0ZW5zaW9uICYmIGNvbnRleHQtPmVtb2ppX2V4dGVuc2lvbikgewor ICAgICAgICAgYnVzX3BhbmVsX3Byb3h5X2NvbW1pdF90ZXh0X3JlY2VpdmVkIChjb250ZXh0LT5l bW9qaV9leHRlbnNpb24sIHRleHQpOworLSAgICB9IGVsc2UgaWYgKGNvbnRleHQtPnByb2Nlc3Np bmdfa2V5X2V2ZW50ICYmIGdfcXVldWVfZ2V0X2xlbmd0aCAoCistICAgICAgICAgICAgY29udGV4 dC0+cXVldWVfZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50KSA8PSBNQVhfU1lOQ19EQVRBKSB7Cist ICAgICAgICBTeW5jRm9yd2FyZGluZ0RhdGEgKmRhdGE7CistICAgICAgICBpZiAoZ19xdWV1ZV9n ZXRfbGVuZ3RoIChjb250ZXh0LT5xdWV1ZV9kdXJpbmdfcHJvY2Vzc19rZXlfZXZlbnQpCistICAg ICAgICAgICAgPT0gTUFYX1NZTkNfREFUQSkgeworLSAgICAgICAgICAgIGdfd2FybmluZyAoIkV4 Y2VlZCBtYXggbnVtYmVyIG9mIHN5bmMgcHJvY2Vzc19rZXlfZXZlbnQgZGF0YSIpOworLSAgICAg ICAgfQorLSAgICAgICAgZGF0YSA9IGdfc2xpY2VfbmV3IChTeW5jRm9yd2FyZGluZ0RhdGEpOwor LSAgICAgICAgZGF0YS0+a2V5ID0gJ2MnOworLSAgICAgICAgZGF0YS0+dGV4dCA9IGdfb2JqZWN0 X3JlZiAodGV4dCk7CistICAgICAgICBnX3F1ZXVlX3B1c2hfdGFpbCAoY29udGV4dC0+cXVldWVf ZHVyaW5nX3Byb2Nlc3Nfa2V5X2V2ZW50LCBkYXRhKTsKKysgICAgfSBlbHNlIGlmIChidXNfaW5w dXRfY29udGV4dF9tYWtlX3Bvc3RfcHJvY2Vzc19rZXlfZXZlbnQgKGNvbnRleHQsCisrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm cHJlX2RhdGEpKSB7CisrICAgICAgICByZXR1cm47CisgICAgIH0gZWxzZSB7CisgICAgICAgICBH VmFyaWFudCAqdmFyaWFudCA9IGlidXNfc2VyaWFsaXphYmxlX3NlcmlhbGl6ZSAoCisgICAgICAg ICAgICAgICAgIChJQnVzU2VyaWFsaXphYmxlICopdGV4dCk7CitAQCAtMzI0NSw5ICszMjk2LDE4 IEBAIGJ1c19pbnB1dF9jb250ZXh0X3VwZGF0ZV9wcmVlZGl0X3RleHQgKEJ1c0lucHV0Q29udGV4 dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb250ZXh0LT5wcmVlZGl0X2N1cnNvcl9wb3MsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29udGV4dC0+cHJlZWRpdF92aXNpYmxlKTsKKyAgICAgfSBl bHNlIGlmIChQUkVFRElUX0NPTkRJVElPTikgeworKyAgICAgICAgU3luY0ZvcndhcmRpbmdQcmVE YXRhIHByZV9kYXRhID0geyAndScsIGNvbnRleHQtPnByZWVkaXRfdGV4dCwgfTsKKyAgICAgICAg IEdWYXJpYW50ICp2YXJpYW50ID0gaWJ1c19zZXJpYWxpemFibGVfc2VyaWFsaXplICgKKyAgICAg ICAgICAgICAgICAgKElCdXNTZXJpYWxpemFibGUgKiljb250ZXh0LT5wcmVlZGl0X3RleHQpOwor LSAgICAgICAgaWYgKGNvbnRleHQtPmNsaWVudF9jb21taXRfcHJlZWRpdCkgeworKyAgICAgICAg cHJlX2RhdGEudS51aW50c1swXSA9IGNvbnRleHQtPnByZWVkaXRfY3Vyc29yX3BvczsKKysgICAg ICAgIHByZV9kYXRhLnUudWludHNbMV0gPSBleHRlbnNpb25fdmlzaWJsZSA/IDEgOiAwOworKyAg ICAgICAgcHJlX2RhdGEudS51aW50c1syXSA9IGNvbnRleHQtPnByZWVkaXRfbW9kZTsKKysgICAg ICAgIGlmIChjb250ZXh0LT5jbGllbnRfY29tbWl0X3ByZWVkaXQpCisrICAgICAgICAgICAgcHJl X2RhdGEua2V5ID0gJ20nOworKyAgICAgICAgaWYgKGJ1c19pbnB1dF9jb250ZXh0X21ha2VfcG9z dF9wcm9jZXNzX2tleV9ldmVudCAoY29udGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwcmVfZGF0YSkpIHsKKysgICAgICAg ICAgICByZXR1cm47CisrICAgICAgICB9IGVsc2UgaWYgKGNvbnRleHQtPmNsaWVudF9jb21taXRf cHJlZWRpdCkgeworICAgICAgICAgICAgIGJ1c19pbnB1dF9jb250ZXh0X2VtaXRfc2lnbmFsICgK KyAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAiVXBk YXRlUHJlZWRpdFRleHRXaXRoTW9kZSIsCitkaWZmIC0tZ2l0IGEvc3JjL2lidXNpbnB1dGNvbnRl eHQuYyBiL3NyYy9pYnVzaW5wdXRjb250ZXh0LmMKK2luZGV4IGM2YTAzMGZlLi4xYjYyZjY1NiAx MDA2NDQKKy0tLSBhL3NyYy9pYnVzaW5wdXRjb250ZXh0LmMKKysrKyBiL3NyYy9pYnVzaW5wdXRj b250ZXh0LmMKK0BAIC0xNDAzLDEwICsxNDAzLDEwNCBAQCBpYnVzX2lucHV0X2NvbnRleHRfc2V0 X3Bvc3RfcHJvY2Vzc19rZXlfZXZlbnQgKElCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisgICAg IGdfdmFyaWFudF91bnJlZiAodmFyX3Bvc3QpOworIH0KKyAKKysKKytzdGF0aWMgdm9pZAorK2li dXNfaW5wdXRfY29udGV4dF9md2RfdGV4dF90b19jb21taXQgKElCdXNJbnB1dENvbnRleHQgKmNv bnRleHQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSUJ1c1RleHQg ICAgICAgICAqdGV4dCkKKyt7CisrICAgIGdfc2lnbmFsX2VtaXQgKGNvbnRleHQsIGNvbnRleHRf c2lnbmFsc1tDT01NSVRfVEVYVF0sIDAsIHRleHQpOworK30KKysKKysKKytzdGF0aWMgdm9pZAor K2lidXNfaW5wdXRfY29udGV4dF9md2RfdGV4dF90b19mb3J3YXJkX2tleV9ldmVudCAoSUJ1c0lu cHV0Q29udGV4dCAqY29udGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIElCdXNUZXh0ICAgICAgICAgKnRleHQpCisreworKyAgICBnY2hhciAq KmFycmF5ID0gTlVMTDsKKysgICAgZ3VpbnQga2V5dmFsLCBrZXljb2RlLCBzdGF0ZTsKKysgICAg YXJyYXkgPSBnX3N0cnNwbGl0ICh0ZXh0LT50ZXh0LCAiLCIsIC0xKTsKKysgICAga2V5dmFsID0g Z19hc2NpaV9zdHJ0b3VsbCAoYXJyYXlbMF0sIE5VTEwsIDEwKTsKKysgICAga2V5Y29kZSA9IGdf YXNjaWlfc3RydG91bGwgKGFycmF5WzFdLCBOVUxMLCAxMCk7CisrICAgIHN0YXRlID0gZ19hc2Np aV9zdHJ0b3VsbCAoYXJyYXlbMl0sIE5VTEwsIDEwKTsKKysgICAgZ19zdHJmcmVldiAoYXJyYXkp OworKyAgICBnX3NpZ25hbF9lbWl0IChjb250ZXh0LAorKyAgICAgICAgICAgICAgICAgICBjb250 ZXh0X3NpZ25hbHNbRk9SV0FSRF9LRVlfRVZFTlRdLAorKyAgICAgICAgICAgICAgICAgICAwLAor KyAgICAgICAgICAgICAgICAgICBrZXl2YWwsCisrICAgICAgICAgICAgICAgICAgIGtleWNvZGUs CisrICAgICAgICAgICAgICAgICAgIHN0YXRlIHwgSUJVU19GT1JXQVJEX01BU0spOworK30KKysK KysKKytzdGF0aWMgdm9pZAorK2lidXNfaW5wdXRfY29udGV4dF9md2RfdGV4dF90b19yZXF1aXJl X3N1cnJvdW5kaW5nIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJQnVzVGV4dCAgICAgICAgICp0 ZXh0KQorK3sKKysgICAgSUJ1c0lucHV0Q29udGV4dFByaXZhdGUgKnByaXY7CisrICAgIGdfYXNz ZXJ0IChJQlVTX0lTX0lOUFVUX0NPTlRFWFQgKGNvbnRleHQpKTsKKysgICAgcHJpdiA9IElCVVNf SU5QVVRfQ09OVEVYVF9HRVRfUFJJVkFURSAoSUJVU19JTlBVVF9DT05URVhUIChjb250ZXh0KSk7 CisrICAgIHByaXYtPm5lZWRzX3N1cnJvdW5kaW5nX3RleHQgPSBUUlVFOworKyAgICBnX3NpZ25h bF9lbWl0IChjb250ZXh0LCBjb250ZXh0X3NpZ25hbHNbUkVRVUlSRV9TVVJST1VORElOR19URVhU XSwgMCk7CisrfQorKworKworK3N0YXRpYyB2b2lkCisraWJ1c19pbnB1dF9jb250ZXh0X2Z3ZF90 ZXh0X3RvX2RlbGV0ZV9zdXJyb3VuZGluZyAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKKysg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJQnVzVGV4 dCAgICAgICAgICp0ZXh0KQorK3sKKysgICAgZ2NoYXIgKiphcnJheSA9IE5VTEw7CisrICAgIGdp bnQgb2Zmc2V0X2Zyb21fY3Vyc29yOworKyAgICBndWludCBuY2hhcnM7CisrICAgIGFycmF5ID0g Z19zdHJzcGxpdCAodGV4dC0+dGV4dCwgIiwiLCAtMSk7CisrICAgIG9mZnNldF9mcm9tX2N1cnNv ciA9IGdfYXNjaWlfc3RydG9sbCAoYXJyYXlbMF0sIE5VTEwsIDEwKTsKKysgICAgbmNoYXJzID0g Z19hc2NpaV9zdHJ0b3VsbCAoYXJyYXlbMV0sIE5VTEwsIDEwKTsKKysgICAgZ19zdHJmcmVldiAo YXJyYXkpOworKyAgICBnX3NpZ25hbF9lbWl0IChjb250ZXh0LAorKyAgICAgICAgICAgICAgICAg ICBjb250ZXh0X3NpZ25hbHNbREVMRVRFX1NVUlJPVU5ESU5HX1RFWFRdLAorKyAgICAgICAgICAg ICAgICAgICAwLAorKyAgICAgICAgICAgICAgICAgICBvZmZzZXRfZnJvbV9jdXJzb3IsCisrICAg ICAgICAgICAgICAgICAgIG5jaGFycyk7CisrfQorKworKworK3N0YXRpYyB2b2lkCisraWJ1c19p bnB1dF9jb250ZXh0X2Z3ZF90ZXh0X3RvX3VwZGF0ZV9wcmVlZGl0IChJQnVzSW5wdXRDb250ZXh0 ICpjb250ZXh0LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgSUJ1c1RleHQgICAgICAgICAqdGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIElCdXNUZXh0ICAgICAgICAgKnBvc2l0aW9uLAorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhciAgICAgICAgICAgICAg dHlwZSkKKyt7CisrICAgIGdjaGFyICoqYXJyYXkgPSBOVUxMOworKyAgICBndWludDMyIGN1cnNv cl9wb3M7CisrICAgIGdib29sZWFuIHZpc2libGU7CisrICAgIGd1aW50IG1vZGUgPSAwOworKwor KyAgICBhcnJheSA9IGdfc3Ryc3BsaXQgKHBvc2l0aW9uLT50ZXh0LCAiLCIsIC0xKTsKKysgICAg Y3Vyc29yX3BvcyA9IGdfYXNjaWlfc3RydG91bGwgKGFycmF5WzBdLCBOVUxMLCAxMCk7CisrICAg IHZpc2libGUgPSBnX2FzY2lpX3N0cnRvdWxsIChhcnJheVsxXSwgTlVMTCwgMTApID8gVFJVRSA6 IEZBTFNFOworKyAgICBpZiAodHlwZSA9PSAndScpIHsKKysgICAgICAgICAgICAgICAgZ19zaWdu YWxfZW1pdCAoY29udGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4 dF9zaWduYWxzW1VQREFURV9QUkVFRElUX1RFWFRdLAorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAwLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0LAorKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJzb3JfcG9zLAorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB2aXNpYmxlKTsKKysgICAgfSBlbHNlIHsKKysgICAgICAgICAgICAgICAg bW9kZSA9IGdfYXNjaWlfc3RydG91bGwgKGFycmF5WzJdLCBOVUxMLCAxMCk7CisrICAgICAgICAg ICAgICAgIGdfc2lnbmFsX2VtaXQgKGNvbnRleHQsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnRleHRfc2lnbmFsc1tVUERBVEVfUFJFRURJVF9URVhUX1dJVEhfTU9ERV0sCisr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsCisrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRleHQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnNvcl9w b3MsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc2libGUsCisrICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1vZGUpOworKyAgICB9CisrICAgIGdfc3RyZnJlZXYgKGFy cmF5KTsKKyt9CisrCisrCisgdm9pZAorIGlidXNfaW5wdXRfY29udGV4dF9wb3N0X3Byb2Nlc3Nf a2V5X2V2ZW50IChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0KQorIHsKKy0gICAgSUJ1c0lucHV0 Q29udGV4dFByaXZhdGUgKnByaXY7CisgICAgIEdWYXJpYW50ICpjYWNoZWRfdmFyX3Bvc3Q7Cisg ICAgIGdib29sZWFuIGVuYWJsZSA9IEZBTFNFOworICAgICBHVmFyaWFudCAqcmVzdWx0OworQEAg LTE0MTksNyArMTUxMyw2IEBAIGlidXNfaW5wdXRfY29udGV4dF9wb3N0X3Byb2Nlc3Nfa2V5X2V2 ZW50IChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0KQorIAorICAgICBnX2Fzc2VydCAoSUJVU19J U19JTlBVVF9DT05URVhUIChjb250ZXh0KSk7CisgCistICAgIHByaXYgPSBJQlVTX0lOUFVUX0NP TlRFWFRfR0VUX1BSSVZBVEUgKElCVVNfSU5QVVRfQ09OVEVYVCAoY29udGV4dCkpOworICAgICBj YWNoZWRfdmFyX3Bvc3QgPQorICAgICAgICAgZ19kYnVzX3Byb3h5X2dldF9jYWNoZWRfcHJvcGVy dHkgKChHREJ1c1Byb3h5ICopY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiRWZmZWN0aXZlUG9zdFByb2Nlc3NLZXlFdmVudCIpOworQEAgLTE0NTQs NyArMTU0Nyw3IEBAIGlidXNfaW5wdXRfY29udGV4dF9wb3N0X3Byb2Nlc3Nfa2V5X2V2ZW50IChJ QnVzSW5wdXRDb250ZXh0ICpjb250ZXh0KQorICAgICBnX2Fzc2VydCAodmFyaWFudCk7CisgICAg IGdfdmFyaWFudF9pdGVyX2luaXQgKCZpdGVyLCB2YXJpYW50KTsKKyAgICAgc2l6ZSA9IGdfdmFy aWFudF9pdGVyX25fY2hpbGRyZW4gKCZpdGVyKTsKKy0gICAgd2hpbGUgKHNpemUgPjAgJiYgZ192 YXJpYW50X2l0ZXJfbG9vcCAoJml0ZXIsICIoeXYpIiwgJnR5cGUsICZ2dGV4dCkpIHsKKysgICAg d2hpbGUgKHNpemUgPiAwICYmIGdfdmFyaWFudF9pdGVyX2xvb3AgKCZpdGVyLCAiKHl2KSIsICZ0 eXBlLCAmdnRleHQpKSB7CisgICAgICAgICBJQnVzVGV4dCAqdGV4dCA9CisgICAgICAgICAgICAg ICAgIChJQnVzVGV4dCAqKWlidXNfc2VyaWFsaXphYmxlX2Rlc2VyaWFsaXplX29iamVjdCAodnRl eHQpOworICAgICAgICAgaWYgKCFJQlVTX0lTX1RFWFQgKHRleHQpKSB7CitAQCAtMTQ2Myw0MyAr MTU1Niw0OCBAQCBpYnVzX2lucHV0X2NvbnRleHRfcG9zdF9wcm9jZXNzX2tleV9ldmVudCAoSUJ1 c0lucHV0Q29udGV4dCAqY29udGV4dCkKKyAgICAgICAgIH0KKyAgICAgICAgIHN3aXRjaCAodHlw ZSkgeworICAgICAgICAgY2FzZSAnYyc6CistICAgICAgICAgICAgZ19zaWduYWxfZW1pdCAoY29u dGV4dCwgY29udGV4dF9zaWduYWxzW0NPTU1JVF9URVhUXSwgMCwgdGV4dCk7CisrICAgICAgICAg ICAgaWJ1c19pbnB1dF9jb250ZXh0X2Z3ZF90ZXh0X3RvX2NvbW1pdCAoY29udGV4dCwgdGV4dCk7 CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNlICdmJzogeworLSAgICAgICAgICAg IGdjaGFyICoqYXJyYXkgPSBOVUxMOworLSAgICAgICAgICAgIGd1aW50IGtleXZhbCwga2V5Y29k ZSwgc3RhdGU7CistICAgICAgICAgICAgYXJyYXkgPSBnX3N0cnNwbGl0ICh0ZXh0LT50ZXh0LCAi LCIsIC0xKTsKKy0gICAgICAgICAgICBrZXl2YWwgPSBnX2FzY2lpX3N0cnRvdWxsIChhcnJheVsw XSwgTlVMTCwgMTApOworLSAgICAgICAgICAgIGtleWNvZGUgPSBnX2FzY2lpX3N0cnRvdWxsIChh cnJheVsxXSwgTlVMTCwgMTApOworLSAgICAgICAgICAgIHN0YXRlID0gZ19hc2NpaV9zdHJ0b3Vs bCAoYXJyYXlbMl0sIE5VTEwsIDEwKTsKKy0gICAgICAgICAgICBnX3N0cmZyZWV2IChhcnJheSk7 CistICAgICAgICAgICAgZ19zaWduYWxfZW1pdCAoY29udGV4dCwKKy0gICAgICAgICAgICAgICAg ICAgICAgICAgICBjb250ZXh0X3NpZ25hbHNbRk9SV0FSRF9LRVlfRVZFTlRdLAorLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIDAsCistICAgICAgICAgICAgICAgICAgICAgICAgICAga2V5dmFs LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleWNvZGUsCistICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3RhdGUgfCBJQlVTX0ZPUldBUkRfTUFTSyk7CisrICAgICAgICAgICAgaWJ1 c19pbnB1dF9jb250ZXh0X2Z3ZF90ZXh0X3RvX2ZvcndhcmRfa2V5X2V2ZW50IChjb250ZXh0LCB0 ZXh0KTsKKyAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgIH0KKyAgICAgICAgIGNhc2UgJ3In OiB7CistICAgICAgICAgICAgcHJpdi0+bmVlZHNfc3Vycm91bmRpbmdfdGV4dCA9IFRSVUU7Cist ICAgICAgICAgICAgZ19zaWduYWxfZW1pdCAoY29udGV4dCwKKy0gICAgICAgICAgICAgICAgICAg ICAgICAgICBjb250ZXh0X3NpZ25hbHNbUkVRVUlSRV9TVVJST1VORElOR19URVhUXSwgMCk7Cisr ICAgICAgICAgICAgaWJ1c19pbnB1dF9jb250ZXh0X2Z3ZF90ZXh0X3RvX3JlcXVpcmVfc3Vycm91 bmRpbmcgKGNvbnRleHQsIHRleHQpOworICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgfQor ICAgICAgICAgY2FzZSAnZCc6IHsKKy0gICAgICAgICAgICBnY2hhciAqKmFycmF5ID0gTlVMTDsK Ky0gICAgICAgICAgICBnaW50IG9mZnNldF9mcm9tX2N1cnNvcjsKKy0gICAgICAgICAgICBndWlu dCBuY2hhcnM7CistICAgICAgICAgICAgYXJyYXkgPSBnX3N0cnNwbGl0ICh0ZXh0LT50ZXh0LCAi LCIsIC0xKTsKKy0gICAgICAgICAgICBvZmZzZXRfZnJvbV9jdXJzb3IgPSBnX2FzY2lpX3N0cnRv bGwgKGFycmF5WzBdLCBOVUxMLCAxMCk7CistICAgICAgICAgICAgbmNoYXJzID0gZ19hc2NpaV9z dHJ0b3VsbCAoYXJyYXlbMV0sIE5VTEwsIDEwKTsKKy0gICAgICAgICAgICBnX3N0cmZyZWV2IChh cnJheSk7CistICAgICAgICAgICAgZ19zaWduYWxfZW1pdCAoY29udGV4dCwKKy0gICAgICAgICAg ICAgICAgICAgICAgICAgICBjb250ZXh0X3NpZ25hbHNbREVMRVRFX1NVUlJPVU5ESU5HX1RFWFRd LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsCistICAgICAgICAgICAgICAgICAgICAg ICAgICAgb2Zmc2V0X2Zyb21fY3Vyc29yLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgIG5j aGFycyk7CisrICAgICAgICAgICAgaWJ1c19pbnB1dF9jb250ZXh0X2Z3ZF90ZXh0X3RvX2RlbGV0 ZV9zdXJyb3VuZGluZyAoY29udGV4dCwgdGV4dCk7CisrICAgICAgICAgICAgYnJlYWs7CisrICAg ICAgICB9CisrICAgICAgICBjYXNlICd1JzoKKysgICAgICAgIGNhc2UgJ20nOiB7CisrICAgICAg ICAgICAgSUJ1c1RleHQgKnBvc2l0aW9uOworKyAgICAgICAgICAgIGdfY2xlYXJfcG9pbnRlciAo JnZ0ZXh0LCBnX3ZhcmlhbnRfdW5yZWYpOworKyAgICAgICAgICAgIGlmICghZ192YXJpYW50X2l0 ZXJfbG9vcCAoJml0ZXIsICIoeXYpIiwgJnR5cGUsICZ2dGV4dCkpIHsKKysgICAgICAgICAgICAg ICAgZ193YXJuaW5nICgiJXM6ICVzIiwgR19TVFJGVU5DLAorKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICJUeXBlICd1JyByZXF1aXJlcyBuZXh0IHR5cGUgJ3UnIik7CisrICAgICAgICAgICAg ICAgIGJyZWFrOworKyAgICAgICAgICAgIH0KKysgICAgICAgICAgICBpZiAodHlwZSAhPSAndScg JiYgdHlwZSAhPSAnbScpIHsKKysgICAgICAgICAgICAgICAgZ193YXJuaW5nICgiJXM6ICVzIiwg R19TVFJGVU5DLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJUaGUgbmV4dCBvZiB0eXBl ICd1JyBzaG91bGQgYmUgdHlwZSAndSciKTsKKysgICAgICAgICAgICAgICAgYnJlYWs7CisrICAg ICAgICAgICAgfQorKyAgICAgICAgICAgIHBvc2l0aW9uID0KKysgICAgICAgICAgICAgICAgICAg IChJQnVzVGV4dCAqKWlidXNfc2VyaWFsaXphYmxlX2Rlc2VyaWFsaXplX29iamVjdCAodnRleHQp OworKyAgICAgICAgICAgIGlmICghSUJVU19JU19URVhUIChwb3NpdGlvbikpIHsKKysgICAgICAg ICAgICAgICAgZ193YXJuaW5nICgiJXM6ICVzIiwgR19TVFJGVU5DLCAidGV4dCBpcyBub3QgSUJ1 c1RleHQiKTsKKysgICAgICAgICAgICAgICAgYnJlYWs7CisrICAgICAgICAgICAgfQorKyAgICAg ICAgICAgIGlidXNfaW5wdXRfY29udGV4dF9md2RfdGV4dF90b191cGRhdGVfcHJlZWRpdCAoY29u dGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRleHQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbiwKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5cGUpOworKyAgICAgICAgICAgIGlm IChnX29iamVjdF9pc19mbG9hdGluZyAocG9zaXRpb24pKSB7CisrICAgICAgICAgICAgICAgIGdf b2JqZWN0X3JlZl9zaW5rIChwb3NpdGlvbik7CisrICAgICAgICAgICAgICAgIGdfb2JqZWN0X3Vu cmVmIChwb3NpdGlvbik7CisrICAgICAgICAgICAgfQorICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgfQorICAgICAgICAgZGVmYXVsdDoKKy0tIAorMi40MS4wCisKCmRpZmYgLS1naXQgYS9p YnVzLnNwZWMgYi9pYnVzLnNwZWMKaW5kZXggNDI4YTkzNC4uODM5ZGRlYyAxMDA2NDQKLS0tIGEv aWJ1cy5zcGVjCisrKyBiL2lidXMuc3BlYwpAQCAtNTgsNyArNTgsNyBAQAogCiBOYW1lOiAgICAg ICAgICAgaWJ1cwogVmVyc2lvbjogICAgICAgIDEuNS4yOX5yYzEKLVJlbGVhc2U6ICAgICAgICA1 JXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAgICA2JXs/ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBJbnRl bGxpZ2VudCBJbnB1dCBCdXMgZm9yIExpbnV4IE9TCiBMaWNlbnNlOiAgICAgICAgTEdQTC0yLjEt b3ItbGF0ZXIKIFVSTDogICAgICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vaWJ1cy8lbmFtZS93 aWtpCkBAIC0yNTcsNiArMjU3LDcgQEAgVGhpcyBwYWNrYWdlIGNvbnRhaW5zIElCdXMgSU0gbW9k dWxlIGZvciBXYXlsYW5kCiAlcGFja2FnZSBwYW5lbAogU3VtbWFyeTogICAgICAgIElCdXMgUGFu ZWwgaWNvbgogUmVxdWlyZXM6ICAgICAgICV7bmFtZX0lez9faXNhfSA9ICV7dmVyc2lvbn0tJXty ZWxlYXNlfQorUmVxdWlyZXM6ICAgICAgICV7bmFtZX0tbGlicyV7P19pc2F9ICAgPSAle3ZlcnNp b259LSV7cmVsZWFzZX0KIEJ1aWxkUmVxdWlyZXM6ICBsaWJkYnVzbWVudS1ndGszLWRldmVsCiAK ICVkZXNjcmlwdGlvbiBwYW5lbApAQCAtNTc5LDYgKzU4MCw5IEBAIGRjb25mIHVwZGF0ZSB8fCA6 CiAle19kYXRhZGlyfS9pbnN0YWxsZWQtdGVzdHMvaWJ1cwogCiAlY2hhbmdlbG9nCisqIFdlZCBP Y3QgMjUgMjAyMyBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuMjl+ cmMxLTYKKy0gQWRkIHByZWVkaXQgRC1CdXMgc2lnbmFscyB0byBQb3N0UHJvY2Vzc0tleUV2ZW50 CisKICogTW9uIE9jdCAyMyAyMDIzIFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29t PiAtIDEuNS4yOX5yYzEtNQogLSBBZGQgRGVsZXRlU3Vycm91bmRpbmdUZXh0IHRvIFBvc3RQcm9j ZXNzS2V5RXZlbnQKIAo=