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 <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Fix Key typing order in ibus-x11
Date: Sun, 31 May 2026 02:08:07 GMT
Message-ID: <178019328720.1.18234127830042040817.rpms-ibus-49b039c60d4d@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/ibus
X-Git-Branch: autotool
X-Git-Rev: 49b039c60d4d531d96346094b74ade3ed838d0e8

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg
ICBDb21taXQgOiA0OWIwMzljNjBkNGQ1MzFkOTYzNDYwOTRiNzRhZGUzZWQ4MzhkMGU4CiAgICAg
ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg
ICAgICAgICBEYXRlICAgOiAyMDIzLTAzLTE1VDExOjU4OjA1KzA5OjAwCiAgICAgICAgICAgIFN0
YXRzICA6ICszODIvLTIgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v
c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzQ5YjAzOWM2MGQ0ZDUzMWQ5NjM0NjA5
NGI3NGFkZTNlZDgzOGQwZTg/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg
ICAgICAgIEZpeCBLZXkgdHlwaW5nIG9yZGVyIGluIGlidXMteDExCgotIERpc2FibGUgd2hpbGUg
bG9vcCBiZWZvcmUgY2FsbCBGb3J3YXJkRXZlbnRNZXNzYWdlUHJvYygpIGluIGlidXMteDExCgot
LS0KZGlmZiAtLWdpdCBhL2lidXMtSEVBRC5wYXRjaCBiL2lidXMtSEVBRC5wYXRjaAppbmRleCBl
NjlkZTI5Li5hYWIwZWJhIDEwMDY0NAotLS0gYS9pYnVzLUhFQUQucGF0Y2gKKysrIGIvaWJ1cy1I
RUFELnBhdGNoCkBAIC0wLDAgKzEsMzc0IEBACitGcm9tIDlkOWRjYTllMTAzZTg4YjMzZTc4NmM0
YTQ2ZjQ0MTIzYTZjZjExYzYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2Fy
YXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CitEYXRlOiBXZWQsIDggTWFyIDIwMjMgMTk6
NDQ6MTYgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gY2xpZW50L3gxMTogRml4IEtleSB0eXBpbmcg
b3JkZXIKKworaWJ1cy14MTEgbm93IGFsc28gdXNlcyB0aGUgaHlicmlkIHByb2Nlc3Mga2V5IGV2
ZW50cyB3aXRoCitJQlVTX0VOQUJMRV9TWU5DX01PREU9MiBhbmQgaXQgd2FpdHMgZm9yIHRoZSBh
c3luYyBBUEkKK3dpdGggR1NvdXJjZSBhbmQgZ19tYWluX2NvbnRleHRfaXRlcmF0aW9uKCkgaW4g
eGltX2ZvcndhcmRfZXZlbnQoKS4KKworQnV0IGdfbWFpbl9jb250ZXh0X2l0ZXJhdGlvbigpIGNh
bGxzIGdka19ldmVudF9zb3VyY2VfZGlzcGF0Y2goKQorYW5kIGl0IGNhbiBjYWxsIGFub3RoZXIg
eGltX2ZvcndhcmRfZXZlbnQoKSBhbmQgdGhlIGNhbGxiYWNrcworb2YgaWJ1c19pbnB1dF9jb250
ZXh0X3Byb2Nlc3Nfa2V5X2V2ZW50X2FzeW5jKCkgY2FuIGJlIG5lc3RlZC4KK1NvIGlmIHRoZSBm
b3J3YXJkaW5nIEFQSSBpcyBjYWxsZWQgb3V0IG9mIHRoZSBjYWxsYmFja3Mgb2YKK2lidXNfaW5w
dXRfY29udGV4dF9wcm9jZXNzX2tleV9ldmVudF9hc3luYygpLCB0aGUga2V5IGV2ZW50cworb3Jk
ZXIgaXMgc3dhcHBlZCBkdWUgdG8gdGhlIGRlbGF5ZWQgcmV0dXJuIG9mCitnX21haW5fY29udGV4
dF9pdGVyYXRpb24oKS4KKworVG8gcmVzb2x2ZSB0aGlzIGlzc3VlLCB0aGUgZm9yd2FyZGluZyBB
UEkgc2hvdWxkIGJlIGNhbGxlZCBpbgordGhlIGNhbGxiYWNrcyBvZiBpYnVzX2lucHV0X2NvbnRl
eHRfcHJvY2Vzc19rZXlfZXZlbnRfYXN5bmMoKS4KKworQlVHPWh0dHBzOi8vZ2l0aHViLmNvbS9p
YnVzL2lidXMvaXNzdWVzLzI0ODAKKy0tLQorIGNsaWVudC94MTEvbWFpbi5jIHwgMTYwICsrKysr
KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAxIGZpbGUgY2hhbmdl
ZCwgODMgaW5zZXJ0aW9ucygrKSwgNzcgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9jbGll
bnQveDExL21haW4uYyBiL2NsaWVudC94MTEvbWFpbi5jCitpbmRleCA5MDVmZDI1MS4uODNkOTVj
YjcgMTAwNjQ0CistLS0gYS9jbGllbnQveDExL21haW4uYworKysrIGIvY2xpZW50L3gxMS9tYWlu
LmMKK0BAIC0yLDcgKzIsNyBAQAorIC8qIHZpbTpzZXQgZXQgc3RzPTQ6ICovCisgLyogaWJ1cwor
ICAqIENvcHlyaWdodCAoQykgMjAwNy0yMDE1IFBlbmcgSHVhbmcgPHNoYXduLnAuaHVhbmdAZ21h
aWwuY29tPgorLSAqIENvcHlyaWdodCAoQykgMjAxNS0yMDIyIFRha2FvIEZ1aml3YXJhIDx0YWth
by5mdWppd2FyYTFAZ21haWwuY29tPgorKyAqIENvcHlyaWdodCAoQykgMjAxNS0yMDIzIFRha2Fv
IEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorICAqIENvcHlyaWdodCAoQykg
MjAwNy0yMDE1IFJlZCBIYXQsIEluYy4KKyAgKgorICAqIG1haW4uYzoKK0BAIC00OSw2ICs0OSw4
IEBACisgI2luY2x1ZGUgPGdldG9wdC5oPgorIAorICNkZWZpbmUgRVNDX1NFUVVFTkNFX0lTTzEw
NjQ2XzEgIlwwMzMlRyIKKysvKiBXYWl0IGZvciBhYm91dCAxMjAgc2VjcyB0byByZXR1cm4gYSBr
ZXkgZnJvbSBhc3luYyBwcm9jZXNzLWtleS1ldmVudC4gKi8KKysjZGVmaW5lIE1BWF9XQUlUX0tF
WV9USU1FICAgICAgIDEyMDAwMAorIAorICNkZWZpbmUgTE9HKGxldmVsLCBmbXRfYXJncy4uLikg
XAorICAgICBpZiAoZ19kZWJ1Z19sZXZlbCA+PSAobGV2ZWwpKSB7IFwKK0BAIC00NjEsMTEgKzQ2
MywzOSBAQCB4aW1fdW5zZXRfaWNfZm9jdXMgKFhJTVMgeGltcywgSU1DaGFuZ2VGb2N1c1N0cnVj
dCAqY2FsbF9kYXRhKQorIAorIH0KKyAKKytzdGF0aWMgdm9pZAorK194aW1fZm9yd2FyZF9rZXlf
ZXZlbnRfZG9uZSAoWDExSUMgICAqeDExaWMsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBYRXZlbnQgICpldmVudCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFu
IHByb2Nlc3NlZCkKKyt7CisrICAgIElNRm9yd2FyZEV2ZW50U3RydWN0IGZlOworKyAgICBpZiAo
cHJvY2Vzc2VkKSB7CisrICAgICAgICBpZiAoIXgxMWljLT5oYXNfcHJlZWRpdF9hcmVhKSB7Cisr
ICAgICAgICAgICAgX3hpbV9zZXRfY3Vyc29yX2xvY2F0aW9uICh4MTFpYyk7CisrICAgICAgICB9
CisrICAgICAgICByZXR1cm47CisrICAgIH0KKysgICAgZ19hc3NlcnQgKHgxMWljKTsKKysgICAg
Z19hc3NlcnQgKGV2ZW50KTsKKysKKysgICAgbWVtc2V0ICgmZmUsIDAsIHNpemVvZiAoZmUpKTsK
KysgICAgZmUubWFqb3JfY29kZSA9IFhJTV9GT1JXQVJEX0VWRU5UOworKyAgICBmZS5pY2lkID0g
eDExaWMtPmljaWQ7CisrICAgIGZlLmNvbm5lY3RfaWQgPSB4MTFpYy0+Y29ubmVjdF9pZDsKKysg
ICAgZmUuc3luY19iaXQgPSAwOworKyAgICBmZS5zZXJpYWxfbnVtYmVyID0gMEw7CisrICAgIGZl
LmV2ZW50ID0gKmV2ZW50OworKyAgICBJTUZvcndhcmRFdmVudCAoX3hpbXMsIChYUG9pbnRlcikg
JmZlKTsKKyt9CisrCisrCisgdHlwZWRlZiBzdHJ1Y3QgeworLSAgICBJTUZvcndhcmRFdmVudFN0
cnVjdCAqcGZlOworICAgICBpbnQgICAgICAgICAgICAgICAgICAgY291bnQ7CisgICAgIGd1aW50
ICAgICAgICAgICAgICAgICBjb3VudF9jYl9pZDsKKyAgICAgZ2Jvb2xlYW4gICAgICAgICAgICAg
IHJldHZhbDsKKysgICAgWDExSUMgICAgICAgICAgICAgICAgKngxMWljOworKyAgICBDQVJEMTYg
ICAgICAgICAgICAgICAgY29ubmVjdF9pZDsKKysgICAgWEV2ZW50ICAgICAgICAgICAgICAgIGV2
ZW50OworIH0gUHJvY2Vzc0tleUV2ZW50UmVwbHlEYXRhOworIAorIHN0YXRpYyB2b2lkCitAQCAt
NDc0LDcgKzUwNCw3IEBAIF9wcm9jZXNzX2tleV9ldmVudF9kb25lIChHT2JqZWN0ICAgICAgKm9i
amVjdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZ3BvaW50ZXIgICAgICB1c2VyX2RhdGEp
CisgeworICAgICBJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0ID0gKElCdXNJbnB1dENvbnRleHQg
KilvYmplY3Q7CistICAgIElNRm9yd2FyZEV2ZW50U3RydWN0ICpwZmUgPSAoSU1Gb3J3YXJkRXZl
bnRTdHJ1Y3QqKSB1c2VyX2RhdGE7CisrICAgIFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSAqZGF0
YSA9IChQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEgKil1c2VyX2RhdGE7CisgCisgICAgIEdFcnJv
ciAqZXJyb3IgPSBOVUxMOworICAgICBnYm9vbGVhbiByZXR2YWwgPSBpYnVzX2lucHV0X2NvbnRl
eHRfcHJvY2Vzc19rZXlfZXZlbnRfYXN5bmNfZmluaXNoICgKK0BAIC00ODgsMTYgKzUxOCwxNSBA
QCBfcHJvY2Vzc19rZXlfZXZlbnRfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCisgICAgIH0K
KyAKKyAgICAgaWYgKGdfaGFzaF90YWJsZV9sb29rdXAgKF9jb25uZWN0aW9ucywKKy0gICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIEdJTlRfVE9fUE9JTlRFUiAoKGdpbnQpIHBmZS0+Y29ubmVj
dF9pZCkpCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHSU5UX1RPX1BPSU5URVIgKChn
aW50KWRhdGEtPmNvbm5lY3RfaWQpKQorICAgICAgICAgPT0gTlVMTCkgeworLSAgICAgICAgZ19z
bGljZV9mcmVlIChJTUZvcndhcmRFdmVudFN0cnVjdCwgcGZlKTsKKysgICAgICAgIGdfc2xpY2Vf
ZnJlZSAoUHJvY2Vzc0tleUV2ZW50UmVwbHlEYXRhLCBkYXRhKTsKKyAgICAgICAgIHJldHVybjsK
KyAgICAgfQorIAorLSAgICBpZiAocmV0dmFsID09IEZBTFNFKSB7CistICAgICAgICBJTUZvcndh
cmRFdmVudCAoX3hpbXMsIChYUG9pbnRlcikgcGZlKTsKKy0gICAgfQorLSAgICBnX3NsaWNlX2Zy
ZWUgKElNRm9yd2FyZEV2ZW50U3RydWN0LCBwZmUpOworKyAgICBpZiAocmV0dmFsID09IEZBTFNF
KQorKyAgICAgICAgX3hpbV9mb3J3YXJkX2tleV9ldmVudF9kb25lIChkYXRhLT54MTFpYywgJmRh
dGEtPmV2ZW50LCByZXR2YWwpOworKyAgICBnX3NsaWNlX2ZyZWUgKFByb2Nlc3NLZXlFdmVudFJl
cGx5RGF0YSwgZGF0YSk7CisgfQorIAorIHN0YXRpYyB2b2lkCitAQCAtNTE4LDYgKzU0NywyMSBA
QCBfcHJvY2Vzc19rZXlfZXZlbnRfcmVwbHlfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCisg
ICAgIH0KKyAgICAgZ19yZXR1cm5faWZfZmFpbCAoZGF0YSk7CisgICAgIGRhdGEtPnJldHZhbCA9
IHJldHZhbDsKKysgICAgaWYgKGdfaGFzaF90YWJsZV9sb29rdXAgKF9jb25uZWN0aW9ucywKKysg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdJTlRfVE9fUE9JTlRFUiAoKGdpbnQpZGF0YS0+
Y29ubmVjdF9pZCkpCisrICAgICAgICA9PSBOVUxMKSB7CisrICAgICAgICByZXR1cm47CisrICAg
IH0KKysgICAgLyogX3hpbV9mb3J3YXJkX2tleV9ldmVudF9kb25lKCkgc2hvdWxkIGJlIGNhbGxl
ZCBpbgorKyAgICAgKiBfcHJvY2Vzc19rZXlfZXZlbnRfcmVwbHlfZG9uZSgpIGJlY2F1c2UgZ19t
YWluX2NvbnRleHRfaXRlcmF0aW9uKCkKKysgICAgICogY2FuIGNhbGwgYW5vdGhlciB4aW1fZm9y
d2FyZF9ldmVudCgpIGFuZCB4aW1fZm9yd2FyZF9ldmVudCgpIGNhbiBiZQorKyAgICAgKiBuZXN0
ZWQgYW5kIHRoZSBmaXJzdCBfcHJvY2Vzc19rZXlfZXZlbnRfcmVwbHlfZG9uZSgpIGlzIHJldHVy
bmVkCisrICAgICAqIGF0IGxhc3Qgd2l0aCBnX21haW5fY29udGV4dF9pdGVyYXRpb24oKSBzbwor
KyAgICAgKiBpZiBfeGltX2ZvcndhcmRfa2V5X2V2ZW50X2RvbmUoKSBpcyBjYWxsZWQgb3V0IG9m
CisrICAgICAqIF9wcm9jZXNzX2tleV9ldmVudF9yZXBseV9kb25lKCksIHRoZSBrZXkgZXZlbnRz
IG9yZGVyCisrICAgICAqIGNhbiBiZSBzd2FwcGVkLgorKyAgICAgKi8KKysgICAgX3hpbV9mb3J3
YXJkX2tleV9ldmVudF9kb25lIChkYXRhLT54MTFpYywgJmRhdGEtPmV2ZW50LCByZXR2YWwpOwor
ICAgICBkYXRhLT5jb3VudCA9IDA7CisgICAgIGdfc291cmNlX3JlbW92ZSAoZGF0YS0+Y291bnRf
Y2JfaWQpOworIH0KK0BAIC01MjksOSArNTczLDggQEAgX3Byb2Nlc3Nfa2V5X2V2ZW50X2NvdW50
X2NiIChncG9pbnRlciB1c2VyX2RhdGEpCisgICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsIChkYXRh
LCBHX1NPVVJDRV9SRU1PVkUpOworICAgICBpZiAoIWRhdGEtPmNvdW50KQorICAgICAgICAgcmV0
dXJuIEdfU09VUkNFX1JFTU9WRTsKKy0gICAgLyogV2FpdCBmb3IgYWJvdXQgMTAgc2Vjcy4gKi8K
Ky0gICAgaWYgKGRhdGEtPmNvdW50KysgPT0gMTAwMDApIHsKKy0gICAgICAgIGRhdGEtPmNvdW50
ID0gMDsKKysgICAgaWYgKGRhdGEtPmNvdW50KysgPT0gTUFYX1dBSVRfS0VZX1RJTUUpIHsKKysg
ICAgICAgIGdfd2FybmluZyAoIktleSBldmVudCBpcyBub3QgcmV0dXJuZWQgZm9yICV1c2Vjcy4i
LCBNQVhfV0FJVF9LRVlfVElNRSk7CisgICAgICAgICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOwor
ICAgICB9CisgICAgIHJldHVybiBHX1NPVVJDRV9DT05USU5VRTsKK0BAIC01NzEsMzIgKzYxNCwx
MyBAQCB4aW1fZm9yd2FyZF9ldmVudCAoWElNUyB4aW1zLCBJTUZvcndhcmRFdmVudFN0cnVjdCAq
Y2FsbF9kYXRhKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQu
a2V5dmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQuaGFy
ZHdhcmVfa2V5Y29kZSAtIDgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBldmVudC5zdGF0ZSk7CistICAgICAgICBpZiAocmV0dmFsKSB7CistICAgICAgICAgICAgaWYg
KCF4MTFpYy0+aGFzX3ByZWVkaXRfYXJlYSkgeworLSAgICAgICAgICAgICAgICBfeGltX3NldF9j
dXJzb3JfbG9jYXRpb24gKHgxMWljKTsKKy0gICAgICAgICAgICB9CistICAgICAgICAgICAgcmV0
dXJuIDE7CistICAgICAgICB9CistCistICAgICAgICBJTUZvcndhcmRFdmVudFN0cnVjdCBmZTsK
Ky0gICAgICAgIG1lbXNldCAoJmZlLCAwLCBzaXplb2YgKGZlKSk7CistCistICAgICAgICBmZS5t
YWpvcl9jb2RlID0gWElNX0ZPUldBUkRfRVZFTlQ7CistICAgICAgICBmZS5pY2lkID0geDExaWMt
PmljaWQ7CistICAgICAgICBmZS5jb25uZWN0X2lkID0geDExaWMtPmNvbm5lY3RfaWQ7CistICAg
ICAgICBmZS5zeW5jX2JpdCA9IDA7CistICAgICAgICBmZS5zZXJpYWxfbnVtYmVyID0gMEw7Cist
ICAgICAgICBmZS5ldmVudCA9IGNhbGxfZGF0YS0+ZXZlbnQ7CistCistICAgICAgICBJTUZvcndh
cmRFdmVudCAoX3hpbXMsIChYUG9pbnRlcikgJmZlKTsKKy0KKysgICAgICAgIF94aW1fZm9yd2Fy
ZF9rZXlfZXZlbnRfZG9uZSAoeDExaWMsICZjYWxsX2RhdGEtPmV2ZW50LCByZXR2YWwpOworICAg
ICAgICAgcmV0dmFsID0gMTsKKyAgICAgICAgIGJyZWFrOworICAgICB9CisgICAgIGNhc2UgMjog
eworICAgICAgICAgR1NvdXJjZSAqc291cmNlID0gZ190aW1lb3V0X3NvdXJjZV9uZXcgKDEpOwor
ICAgICAgICAgUHJvY2Vzc0tleUV2ZW50UmVwbHlEYXRhICpkYXRhID0gTlVMTDsKKy0gICAgICAg
IElNRm9yd2FyZEV2ZW50U3RydWN0IGZlOworIAorICAgICAgICAgaWYgKHNvdXJjZSkKKyAgICAg
ICAgICAgICBkYXRhID0gZ19zbGljZV9uZXcwIChQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEpOwor
QEAgLTYxMCwxMSArNjM0LDEzIEBAIHhpbV9mb3J3YXJkX2V2ZW50IChYSU1TIHhpbXMsIElNRm9y
d2FyZEV2ZW50U3RydWN0ICpjYWxsX2RhdGEpCisgICAgICAgICAgICAgaWYgKHNvdXJjZSkKKyAg
ICAgICAgICAgICAgICAgZ19zb3VyY2VfZGVzdHJveSAoc291cmNlKTsKKyAgICAgICAgIH0gZWxz
ZSB7CistICAgICAgICAgICAgQ0FSRDE2IGNvbm5lY3RfaWQgPSB4MTFpYy0+Y29ubmVjdF9pZDsK
KyAgICAgICAgICAgICBkYXRhLT5jb3VudCA9IDE7CisgICAgICAgICAgICAgZ19zb3VyY2VfYXR0
YWNoIChzb3VyY2UsIE5VTEwpOworICAgICAgICAgICAgIGdfc291cmNlX3VucmVmIChzb3VyY2Up
OworICAgICAgICAgICAgIGRhdGEtPmNvdW50X2NiX2lkID0gZ19zb3VyY2VfZ2V0X2lkIChzb3Vy
Y2UpOworKyAgICAgICAgICAgIGRhdGEtPmNvbm5lY3RfaWQgPSBjYWxsX2RhdGEtPmNvbm5lY3Rf
aWQ7CisrICAgICAgICAgICAgZGF0YS0+eDExaWMgPSB4MTFpYzsKKysgICAgICAgICAgICBkYXRh
LT5ldmVudCA9ICooKFhFdmVudCopeGV2ZW50KTsKKyAgICAgICAgICAgICBpYnVzX2lucHV0X2Nv
bnRleHRfcHJvY2Vzc19rZXlfZXZlbnRfYXN5bmMgKAorICAgICAgICAgICAgICAgICAgICAgeDEx
aWMtPmNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICBldmVudC5rZXl2YWwsCitAQCAtNjI2
LDcgKzY1Miw3IEBAIHhpbV9mb3J3YXJkX2V2ZW50IChYSU1TIHhpbXMsIElNRm9yd2FyZEV2ZW50
U3RydWN0ICpjYWxsX2RhdGEpCisgICAgICAgICAgICAgICAgICAgICBkYXRhKTsKKyAgICAgICAg
ICAgICBnX3NvdXJjZV9zZXRfY2FsbGJhY2sgKHNvdXJjZSwgX3Byb2Nlc3Nfa2V5X2V2ZW50X2Nv
dW50X2NiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YSwgTlVMTCk7
CistICAgICAgICAgICAgd2hpbGUgKGRhdGEtPmNvdW50KQorKyAgICAgICAgICAgIHdoaWxlIChk
YXRhLT5jb3VudCA+IDAgJiYgZGF0YS0+Y291bnQgPCBNQVhfV0FJVF9LRVlfVElNRSkKKyAgICAg
ICAgICAgICAgICAgZ19tYWluX2NvbnRleHRfaXRlcmF0aW9uIChOVUxMLCBUUlVFKTsKKyAgICAg
ICAgICAgICBpZiAoc291cmNlLT5yZWZfY291bnQgPiAwKSB7CisgICAgICAgICAgICAgICAgIC8q
IGdfc291cmNlX2dldF9pZCgpIGNvdWxkIGNhdXNlcyBhIFNFR1YgKi8KK0BAIC02MzQsNDYgKzY2
MCwzMyBAQCB4aW1fZm9yd2FyZF9ldmVudCAoWElNUyB4aW1zLCBJTUZvcndhcmRFdmVudFN0cnVj
dCAqY2FsbF9kYXRhKQorICAgICAgICAgICAgICAgICAgICAgICAgICJpc3N1ZSBpbiAlcC4iLCBz
b3VyY2UpOworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICByZXR2YWwgPSBkYXRhLT5yZXR2
YWw7CistICAgICAgICAgICAgZ19zbGljZV9mcmVlIChQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEs
IGRhdGEpOworLQorLSAgICAgICAgICAgIGlmIChnX2hhc2hfdGFibGVfbG9va3VwIChfY29ubmVj
dGlvbnMsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdJTlRfVE9fUE9J
TlRFUiAoKGdpbnQpY29ubmVjdF9pZCkpCistICAgICAgICAgICAgICAgID09IE5VTEwpIHsKKysg
ICAgICAgICAgICBpZiAoZGF0YS0+Y291bnQgPT0gMCkgeworKyAgICAgICAgICAgICAgICBnX3Ns
aWNlX2ZyZWUgKFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSwgZGF0YSk7CisgICAgICAgICAgICAg
ICAgIHJldHVybiAxOworICAgICAgICAgICAgIH0KKyAgICAgICAgIH0KKyAKKy0gICAgICAgIGlm
IChyZXR2YWwpIHsKKy0gICAgICAgICAgICBpZiAoISB4MTFpYy0+aGFzX3ByZWVkaXRfYXJlYSkg
eworLSAgICAgICAgICAgICAgICBfeGltX3NldF9jdXJzb3JfbG9jYXRpb24gKHgxMWljKTsKKy0g
ICAgICAgICAgICB9CistICAgICAgICAgICAgcmV0dXJuIDE7CisrICAgICAgICBnX3NsaWNlX2Zy
ZWUgKFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSwgZGF0YSk7CisrICAgICAgICBpZiAoZ19oYXNo
X3RhYmxlX2xvb2t1cCAoX2Nvbm5lY3Rpb25zLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIEdJTlRfVE9fUE9JTlRFUiAoKGdpbnQpY2FsbF9kYXRhLT5jb25uZWN0X2lkKSkKKysg
ICAgICAgICAgICAgICAgPT0gTlVMTCkgeworKyAgICAgICAgICAgICAgICByZXR1cm4gMTsKKyAg
ICAgICAgIH0KKy0KKy0gICAgICAgIG1lbXNldCAoJmZlLCAwLCBzaXplb2YgKGZlKSk7CistCist
ICAgICAgICBmZS5tYWpvcl9jb2RlID0gWElNX0ZPUldBUkRfRVZFTlQ7CistICAgICAgICBmZS5p
Y2lkID0geDExaWMtPmljaWQ7CistICAgICAgICBmZS5jb25uZWN0X2lkID0geDExaWMtPmNvbm5l
Y3RfaWQ7CistICAgICAgICBmZS5zeW5jX2JpdCA9IDA7CistICAgICAgICBmZS5zZXJpYWxfbnVt
YmVyID0gMEw7CistICAgICAgICBmZS5ldmVudCA9IGNhbGxfZGF0YS0+ZXZlbnQ7CistCistICAg
ICAgICBJTUZvcndhcmRFdmVudCAoX3hpbXMsIChYUG9pbnRlcikgJmZlKTsKKy0KKysgICAgICAg
IF94aW1fZm9yd2FyZF9rZXlfZXZlbnRfZG9uZSAoeDExaWMsICZjYWxsX2RhdGEtPmV2ZW50LCBy
ZXR2YWwpOworICAgICAgICAgcmV0dmFsID0gMTsKKyAgICAgICAgIGJyZWFrOworICAgICB9Cisg
ICAgIGRlZmF1bHQ6IHsKKy0gICAgICAgIElNRm9yd2FyZEV2ZW50U3RydWN0ICpwZmU7CisrICAg
ICAgICBQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEgKmRhdGE7CisgCistICAgICAgICBwZmUgPSBn
X3NsaWNlX25ldzAgKElNRm9yd2FyZEV2ZW50U3RydWN0KTsKKy0gICAgICAgIHBmZS0+bWFqb3Jf
Y29kZSA9IFhJTV9GT1JXQVJEX0VWRU5UOworLSAgICAgICAgcGZlLT5pY2lkID0geDExaWMtPmlj
aWQ7CistICAgICAgICBwZmUtPmNvbm5lY3RfaWQgPSB4MTFpYy0+Y29ubmVjdF9pZDsKKy0gICAg
ICAgIHBmZS0+c3luY19iaXQgPSAwOworLSAgICAgICAgcGZlLT5zZXJpYWxfbnVtYmVyID0gMEw7
CistICAgICAgICBwZmUtPmV2ZW50ID0gY2FsbF9kYXRhLT5ldmVudDsKKysgICAgICAgIGlmICgh
KGRhdGEgPSBnX3NsaWNlX25ldzAgKFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSkpKSB7CisrICAg
ICAgICAgICAgZ193YXJuaW5nICgiQ2Fubm90IGFsbG9jYXRlIGFzeW5jIGRhdGEiKTsKKysgICAg
ICAgICAgICBfeGltX2ZvcndhcmRfa2V5X2V2ZW50X2RvbmUgKHgxMWljLCAmY2FsbF9kYXRhLT5l
dmVudCwgMCk7CisrICAgICAgICAgICAgcmV0dXJuIDE7CisrICAgICAgICB9CisrICAgICAgICBk
YXRhLT5jb25uZWN0X2lkID0gY2FsbF9kYXRhLT5jb25uZWN0X2lkOworKyAgICAgICAgZGF0YS0+
eDExaWMgPSB4MTFpYzsKKysgICAgICAgIGRhdGEtPmV2ZW50ID0gY2FsbF9kYXRhLT5ldmVudDsK
KyAKKyAgICAgICAgIGlidXNfaW5wdXRfY29udGV4dF9wcm9jZXNzX2tleV9ldmVudF9hc3luYyAo
CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4MTFpYy0+Y29udGV4dCwK
K0BAIC02ODMsNyArNjk2LDcgQEAgeGltX2ZvcndhcmRfZXZlbnQgKFhJTVMgeGltcywgSU1Gb3J3
YXJkRXZlbnRTdHJ1Y3QgKmNhbGxfZGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIC0xLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVM
TCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9wcm9jZXNzX2tleV9l
dmVudF9kb25lLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZlKTsK
KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEpOworICAgICAgICAg
cmV0dmFsID0gMTsKKyAgICAgfQorICAgICB9CitAQCAtOTYyLDExICs5NzUsMTAgQEAgX3hpbV9m
b3J3YXJkX2tleV9ldmVudCAoWDExSUMgICAqeDExaWMsCisgICAgICAgICAgICAgICAgICAgICAg
ICAgZ3VpbnQgICAga2V5Y29kZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICBz
dGF0ZSkKKyB7CistICAgIGdfcmV0dXJuX2lmX2ZhaWwgKHgxMWljICE9IE5VTEwpOworLQorLSAg
ICBJTUZvcndhcmRFdmVudFN0cnVjdCBmZSA9IHswfTsKKyAgICAgWEV2ZW50IHhrcCA9IHswfTsK
KyAKKysgICAgZ19yZXR1cm5faWZfZmFpbCAoeDExaWMgIT0gTlVMTCk7CisrCisgICAgIHhrcC54
a2V5LnR5cGUgPSAoc3RhdGUgJiBJQlVTX1JFTEVBU0VfTUFTSykgPyBLZXlSZWxlYXNlIDogS2V5
UHJlc3M7CisgICAgIHhrcC54a2V5LnNlcmlhbCA9IDBMOworICAgICB4a3AueGtleS5zZW5kX2V2
ZW50ID0gRmFsc2U7CitAQCAtOTc1LDIwICs5ODcsMTQgQEAgX3hpbV9mb3J3YXJkX2tleV9ldmVu
dCAoWDExSUMgICAqeDExaWMsCisgICAgIHhrcC54a2V5LndpbmRvdyA9CisgICAgICAgICB4MTFp
Yy0+Zm9jdXNfd2luZG93ID8geDExaWMtPmZvY3VzX3dpbmRvdyA6IHgxMWljLT5jbGllbnRfd2lu
ZG93OworICAgICB4a3AueGtleS5zdWJ3aW5kb3cgPSBOb25lOworLSAgICB4a3AueGtleS5yb290
ID0gRGVmYXVsdFJvb3RXaW5kb3cgKEdES19ESVNQTEFZX1hESVNQTEFZIChnZGtfZGlzcGxheV9n
ZXRfZGVmYXVsdCAoKSkpOworKyAgICB4a3AueGtleS5yb290ID0gRGVmYXVsdFJvb3RXaW5kb3cg
KAorKyAgICAgICAgICAgIEdES19ESVNQTEFZX1hESVNQTEFZIChnZGtfZGlzcGxheV9nZXRfZGVm
YXVsdCAoKSkpOworIAorICAgICB4a3AueGtleS50aW1lID0gMDsKKyAgICAgeGtwLnhrZXkuc3Rh
dGUgPSBzdGF0ZTsKKyAgICAgeGtwLnhrZXkua2V5Y29kZSA9IChrZXljb2RlID09IDApID8gMCA6
IGtleWNvZGUgKyA4OworIAorLSAgICBmZS5tYWpvcl9jb2RlID0gWElNX0ZPUldBUkRfRVZFTlQ7
CistICAgIGZlLmljaWQgPSB4MTFpYy0+aWNpZDsKKy0gICAgZmUuY29ubmVjdF9pZCA9IHgxMWlj
LT5jb25uZWN0X2lkOworLSAgICBmZS5zeW5jX2JpdCA9IDA7CistICAgIGZlLnNlcmlhbF9udW1i
ZXIgPSAwTDsKKy0gICAgZmUuZXZlbnQgPSB4a3A7CistCistICAgIElNRm9yd2FyZEV2ZW50IChf
eGltcywgKFhQb2ludGVyKSAmIGZlKTsKKysgICAgX3hpbV9mb3J3YXJkX2tleV9ldmVudF9kb25l
ICh4MTFpYywgJnhrcCwgRkFMU0UpOworIH0KKyAKKyBzdGF0aWMgdm9pZAorLS0gCisyLjM4LjEK
KworRnJvbSA1YjVkMDc5NWYyOTdlMzMwZmRjODRiNmJlNmJlYWIxMzA1YjBjZGE5IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwu
Y29tPgorRGF0ZTogV2VkLCAxNSBNYXIgMjAyMyAxMDoyMjowNSArMDkwMAorU3ViamVjdDogW1BB
VENIXSB1dGlsL0lNZGtpdDogRGlzYWJsZSB3aGlsZSBsb29wIGJlZm9yZSBjYWxsCisgRm9yd2Fy
ZEV2ZW50TWVzc2FnZVByb2MoKQorCitTZWVtcyBQcm9jZXNzUXVldWUoKSBoYWQgYSB3cm9uZyBY
RnJlZSgpIHdpdGggYXN5bmMgcHJvY2Vzcy1rZXktZXZlbnQuCitGaXhlczogYzBmZWM4OWFlNzZm
OTUyMjMxOWY1ODEwN2FiMjM0OTkyYjI0OWVjNgorCitCVUc9aHR0cHM6Ly9naXRodWIuY29tL2li
dXMvaWJ1cy9pc3N1ZXMvMjQ4NAorLS0tCisgdXRpbC9JTWRraXQvaTE4blB0SGRyLmMgfCA5ICsr
Ky0tLS0tLQorIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0p
CisKK2RpZmYgLS1naXQgYS91dGlsL0lNZGtpdC9pMThuUHRIZHIuYyBiL3V0aWwvSU1ka2l0L2kx
OG5QdEhkci5jCitpbmRleCA4ZGM1MjcxNC4uZWMyMGUzMjIgMTAwNjQ0CistLS0gYS91dGlsL0lN
ZGtpdC9pMThuUHRIZHIuYworKysrIGIvdXRpbC9JTWRraXQvaTE4blB0SGRyLmMKK0BAIC0xNzQ3
LDExICsxNzQ3LDEzIEBAIHN0YXRpYyB2b2lkIFByb2Nlc3NRdWV1ZSAoWElNUyBpbXMsIENBUkQx
NiBjb25uZWN0X2lkKQorICAgICAgICAgWGltUHJvdG9IZHIgKmhkciA9IChYaW1Qcm90b0hkciAq
KSBjbGllbnQtPnBlbmRpbmctPnA7CisgICAgICAgICB1bnNpZ25lZCBjaGFyICpwMSA9ICh1bnNp
Z25lZCBjaGFyICopIChoZHIgKyAxKTsKKyAgICAgICAgIElNUHJvdG9jb2wgY2FsbF9kYXRhOwor
KyAgICAgICAgWElNUGVuZGluZyAqb2xkID0gY2xpZW50LT5wZW5kaW5nOworIAorICAgICAgICAg
Y2FsbF9kYXRhLm1ham9yX2NvZGUgPSBoZHItPm1ham9yX29wY29kZTsKKyAgICAgICAgIGNhbGxf
ZGF0YS5hbnkubWlub3JfY29kZSA9IGhkci0+bWlub3Jfb3Bjb2RlOworICAgICAgICAgY2FsbF9k
YXRhLmFueS5jb25uZWN0X2lkID0gY29ubmVjdF9pZDsKKyAKKysgICAgICAgIGNsaWVudC0+cGVu
ZGluZyA9IG9sZC0+bmV4dDsKKyAgICAgICAgIHN3aXRjaCAoaGRyLT5tYWpvcl9vcGNvZGUpCisg
ICAgICAgICB7CisgICAgICAgICBjYXNlIFhJTV9GT1JXQVJEX0VWRU5UOgorQEAgLTE3NjAsMTIg
KzE3NjIsNyBAQCBzdGF0aWMgdm9pZCBQcm9jZXNzUXVldWUgKFhJTVMgaW1zLCBDQVJEMTYgY29u
bmVjdF9pZCkKKyAgICAgICAgIH0KKyAgICAgICAgIC8qZW5kc3dpdGNoKi8KKyAgICAgICAgIFhG
cmVlIChoZHIpOworLSAgICAgICAgeworLSAgICAgICAgICAgIFhJTVBlbmRpbmcgKm9sZCA9IGNs
aWVudC0+cGVuZGluZzsKKy0KKy0gICAgICAgICAgICBjbGllbnQtPnBlbmRpbmcgPSBvbGQtPm5l
eHQ7CistICAgICAgICAgICAgWEZyZWUgKG9sZCk7CistICAgICAgICB9CisrICAgICAgICBYRnJl
ZSAob2xkKTsKKyAgICAgfQorICAgICAvKmVuZHdoaWxlKi8KKyAgICAgcmV0dXJuOworLS0gCisy
LjM5LjIKKwoKZGlmZiAtLWdpdCBhL2lidXMuc3BlYyBiL2lidXMuc3BlYwppbmRleCA4YTRkNzY0
Li41N2ZkMTk0IDEwMDY0NAotLS0gYS9pYnVzLnNwZWMKKysrIGIvaWJ1cy5zcGVjCkBAIC01MCw3
ICs1MCw3IEBACiAKIE5hbWU6ICAgICAgICAgICBpYnVzCiBWZXJzaW9uOiAgICAgICAgMS41LjI4
Ci1SZWxlYXNlOiAgICAgICAgMSV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgMiV7P2Rpc3R9CiBT
dW1tYXJ5OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5z
ZTogICAgICAgIExHUEwtMi4wLW9yLWxhdGVyCiBVUkw6ICAgICAgICAgICAgaHR0cHM6Ly9naXRo
dWIuY29tL2lidXMvJW5hbWUvd2lraQpAQCAtNTgsNiArNTgsNyBAQCBTb3VyY2UwOiAgICAgICAg
aHR0cHM6Ly9naXRodWIuY29tL2lidXMvJW5hbWUvcmVsZWFzZXMvZG93bmxvYWQvJXt2ZXJzaW9u
fS8le25hbQogU291cmNlMTogICAgICAgICV7bmFtZX0teGlucHV0CiBTb3VyY2UyOiAgICAgICAg
JXtuYW1lfS5jb25mLjUKICMgUGF0Y2gwOiAgICAgICAgICUle25hbWV9LUhFQUQucGF0Y2gKK1Bh
dGNoMDogICAgICAgICAle25hbWV9LUhFQUQucGF0Y2gKICMgVW5kZXIgdGVzdGluZyAjMTM0OTE0
OCAjMTM4NTM0OSAjMTM1MDI5MSAjMTQwNjY5OSAjMTQzMjI1MiAjMTYwMTU3NwogUGF0Y2gxOiAg
ICAgICAgICV7bmFtZX0tMTM4NTM0OS1zZWd2LWJ1cy1wcm94eS5wYXRjaAogJWlmIDAlez9mZWRv
cmE6MH0lez9yaGVsOjF9CkBAIC0yODIsNyArMjgzLDggQEAgZGVza3RvcCB0ZXN0aW5nIHJ1bm5l
ciBpbnRlcm5hbGx5LgogCiAlcGFja2FnZSAgdGVzdHMKIFN1bW1hcnk6ICAgICAgICBUZXN0cyBm
b3IgdGhlICV7bmFtZX0gcGFja2FnZQotUmVxdWlyZXM6ICAgICAgICV7bmFtZX0lez9faXNhfSA9
ICV7dmVyc2lvbn0tJXtyZWxlYXNlfQorUmVxdWlyZXM6ICAgICAgICV7bmFtZX0lez9faXNhfSAg
ICAgICAgPSAle3ZlcnNpb259LSV7cmVsZWFzZX0KK1JlcXVpcmVzOiAgICAgICAle25hbWV9LWxp
YnMlez9faXNhfSAgID0gJXt2ZXJzaW9ufS0le3JlbGVhc2V9CiAKICVkZXNjcmlwdGlvbiB0ZXN0
cwogVGhlICV7bmFtZX0tdGVzdHMgcGFja2FnZSBjb250YWlucyB0ZXN0cyB0aGF0IGNhbiBiZSB1
c2VkIHRvIHZlcmlmeQpAQCAtNTU1LDYgKzU1NywxMCBAQCBkY29uZiB1cGRhdGUgfHwgOgogJXtf
ZGF0YWRpcn0vaW5zdGFsbGVkLXRlc3RzL2lidXMKIAogJWNoYW5nZWxvZworKiBXZWQgTWFyIDE1
IDIwMjMgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjI4LTIKKy0g
Rml4IEtleSB0eXBpbmcgb3JkZXIgaW4gaWJ1cy14MTEKKy0gRGlzYWJsZSB3aGlsZSBsb29wIGJl
Zm9yZSBjYWxsIEZvcndhcmRFdmVudE1lc3NhZ2VQcm9jKCkgaW4gaWJ1cy14MTEKKwogKiBUdWUg
RmViIDIxIDIwMjMgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjI4
LTEKIC0gQnVtcCB0byAxLjUuMjgKIAo=