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: Enable preedit for compose keys Date: Sun, 31 May 2026 02:06:52 GMT Message-ID: <178019321276.1.6961473006381361942.rpms-ibus-716b06dccf12@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 716b06dccf124c6aabb2d2b9f47f6be41eb3a4ed ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiA3MTZiMDZkY2NmMTI0YzZhYWJiMmQyYjlmNDdmNmJlNDFlYjNhNGVkCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE4LTA2LTI3VDEyOjQwOjI1KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICs0MTgvLTEgaW4gNCBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzcxNmIwNmRjY2YxMjRjNmFhYmIyZDJi OWY0N2Y2YmU0MWViM2E0ZWQ/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIEVuYWJsZSBwcmVlZGl0IGZvciBjb21wb3NlIGtleXMKCi0gRml4IFNFR1YgaW4gcGFu ZWxfYmluZGluZ19wYXJzZV9hY2NlbGVyYXRvcgoKLS0tCmRpZmYgLS1naXQgYS8uZ2l0aWdub3Jl IGIvLmdpdGlnbm9yZQppbmRleCBlZWU2MDk1Li44YjYzMjNhIDEwMDY0NAotLS0gYS8uZ2l0aWdu b3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTU1LDMgKzU1LDQgQEAgaWJ1cy0xLjMuNi50YXIuZ3oK IC9pYnVzLTEuNS4xNi50YXIuZ3oKIC9pYnVzLTEuNS4xNy50YXIuZ3oKIC9pYnVzLTEuNS4xOC50 YXIuZ3oKKy9pYnVzLXBvLTEuNS4xOC0yMDE4MDYyNy50YXIuZ3oKCmRpZmYgLS1naXQgYS9pYnVz LUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggZTk1YzM0NC4uYzRjYmE5MSAxMDA2 NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVBRC5wYXRjaApAQCAtODk3Niwz ICs4OTc2LDQxMiBAQCBpbmRleCBjZDk4YzlkNy4uN2JlYjZmMGEgMTAwNjQ0CiAtLSAKIDIuMTQu MwogCitGcm9tIGY5ZTMwMzU5ZDMyODA1NDc5M2UxZTIyNWRjZjJmZTUzN2U2YzhjNDggTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFp bC5jb20+CitEYXRlOiBXZWQsIDI3IEp1biAyMDE4IDEyOjExOjQxICswOTAwCitTdWJqZWN0OiBb UEFUQ0hdIGlidXNlbmdpbmVzaW1wbGU6IEVuYWJsZSBwcmVlZGl0IGZvciBjb21wb3NlIGtleXMK KworQlVHPWh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvaXNzdWVzLzE5MzUKKy0tLQorIHNy Yy9pYnVzZW5naW5lc2ltcGxlLmMgfCAxNjYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLQorIDEgZmlsZSBjaGFuZ2VkLCAxMTUgaW5zZXJ0aW9ucygrKSwg NTEgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c2VuZ2luZXNpbXBsZS5jIGIv c3JjL2lidXNlbmdpbmVzaW1wbGUuYworaW5kZXggOTRjZTUzYjcuLjYxZGZiODlmIDEwMDY0NAor LS0tIGEvc3JjL2lidXNlbmdpbmVzaW1wbGUuYworKysrIGIvc3JjL2lidXNlbmdpbmVzaW1wbGUu YworQEAgLTE4OSwxMSArMTg5LDEyIEBAIGlidXNfZW5naW5lX3NpbXBsZV9yZXNldCAoSUJ1c0Vu Z2luZSAqZW5naW5lKQorICAgICAgICAgcHJpdi0+dGVudGF0aXZlX21hdGNoID0gMDsKKyAgICAg ICAgIHByaXYtPnRlbnRhdGl2ZV9tYXRjaF9sZW4gPSAwOworICAgICAgICAgaWJ1c19lbmdpbmVf aGlkZV9wcmVlZGl0X3RleHQgKChJQnVzRW5naW5lICopc2ltcGxlKTsKKy0gICAgfQorLSAgICBp ZiAocHJpdi0+dGVudGF0aXZlX2Vtb2ppIHx8IHByaXYtPmluX2Vtb2ppX3NlcXVlbmNlKSB7Cisr ICAgIH0gZWxzZSBpZiAocHJpdi0+dGVudGF0aXZlX2Vtb2ppIHx8IHByaXYtPmluX2Vtb2ppX3Nl cXVlbmNlKSB7CisgICAgICAgICBwcml2LT5pbl9lbW9qaV9zZXF1ZW5jZSA9IEZBTFNFOworICAg ICAgICAgZ19jbGVhcl9wb2ludGVyICgmcHJpdi0+dGVudGF0aXZlX2Vtb2ppLCBnX2ZyZWUpOwor ICAgICAgICAgaWJ1c19lbmdpbmVfaGlkZV9wcmVlZGl0X3RleHQgKChJQnVzRW5naW5lICopc2lt cGxlKTsKKysgICAgfSBlbHNlIGlmICghcHJpdi0+aW5faGV4X3NlcXVlbmNlICYmICFwcml2LT5p bl9lbW9qaV9zZXF1ZW5jZSkgeworKyAgICAgICAgaWJ1c19lbmdpbmVfaGlkZV9wcmVlZGl0X3Rl eHQgKChJQnVzRW5naW5lICopc2ltcGxlKTsKKyAgICAgfQorIH0KKyAKK0BAIC0yMDksMTggKzIx MCw3OCBAQCBpYnVzX2VuZ2luZV9zaW1wbGVfY29tbWl0X2NoYXIgKElCdXNFbmdpbmVTaW1wbGUg KnNpbXBsZSwKKyAgICAgICAgIHByaXYtPmluX2hleF9zZXF1ZW5jZSA9IEZBTFNFOworICAgICAg ICAgcHJpdi0+dGVudGF0aXZlX21hdGNoID0gMDsKKyAgICAgICAgIHByaXYtPnRlbnRhdGl2ZV9t YXRjaF9sZW4gPSAwOworLSAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9wcmVlZGl0 X3RleHQgKHNpbXBsZSk7CisgICAgIH0KKyAgICAgaWYgKHByaXYtPnRlbnRhdGl2ZV9lbW9qaSB8 fCBwcml2LT5pbl9lbW9qaV9zZXF1ZW5jZSkgeworICAgICAgICAgcHJpdi0+aW5fZW1vamlfc2Vx dWVuY2UgPSBGQUxTRTsKKyAgICAgICAgIGdfY2xlYXJfcG9pbnRlciAoJnByaXYtPnRlbnRhdGl2 ZV9lbW9qaSwgZ19mcmVlKTsKKy0gICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV91cGRhdGVfcHJl ZWRpdF90ZXh0IChzaW1wbGUpOworICAgICB9CistCisgICAgIGlidXNfZW5naW5lX2NvbW1pdF90 ZXh0ICgoSUJ1c0VuZ2luZSAqKXNpbXBsZSwKKyAgICAgICAgICAgICBpYnVzX3RleHRfbmV3X2Zy b21fdW5pY2hhciAoY2gpKTsKKyB9CisgCisrI2RlZmluZSBDT01QT1NFX0tFWVNZTV9UT19VTklD SEFSKGtleXN5bSwgdW5pY2hhcikgeyAgICAgICAgICAgICAgICAgICAgXAorKworK3N0YXRpYyBn dW5pY2hhcgorK2lidXNfa2V5c3ltX3RvX3VuaWNvZGUgKGd1aW50MTYga2V5c3ltKSB7CisrI2Rl ZmluZSBDQVNFKGtleXN5bV9zdWZmaXgsIHVuaWNvZGUpIFwKKysgICAgICAgIGNhc2UgSUJVU19L RVlfZGVhZF8jI2tleXN5bV9zdWZmaXg6IHJldHVybiB1bmljb2RlCisrICAgIHN3aXRjaCAoa2V5 c3ltKSB7CisrICAgIENBU0UoYSwgMHgwMzA0MSk7CisrICAgIENBU0UoQSwgMHgwMzA0Mik7Cisr ICAgIENBU0UoaSwgMHgwMzA0Myk7CisrICAgIENBU0UoSSwgMHgwMzA0NCk7CisrICAgIENBU0Uo dSwgMHgwMzA0NSk7CisrICAgIENBU0UoVSwgMHgwMzA0Nik7CisrICAgIENBU0UoZSwgMHgwMzA0 Nyk7CisrICAgIENBU0UoRSwgMHgwMzA0OCk7CisrICAgIENBU0UobywgMHgwMzA0OSk7CisrICAg IENBU0UoTywgMHgwMzA0YSk7CisrICAgIENBU0UoYWJvdmVjb21tYSwgICAgICAgICAgICAgICAg ICAgIDB4MDMxMyk7CisrICAgIENBU0UoYWJvdmVkb3QsICAgICAgICAgICAgICAgICAgICAgIDB4 MDMwNyk7CisrICAgIENBU0UoYWJvdmVyZXZlcnNlZGNvbW1hLCAgICAgICAgICAgIDB4MDMxNCk7 CisrICAgIENBU0UoYWJvdmVyaW5nLCAgICAgICAgICAgICAgICAgICAgIDB4MDMwYSk7CisrICAg IENBU0UoYWN1dGUsICAgICAgICAgICAgICAgICAgICAgICAgIDB4MDMwMSk7CisrICAgIENBU0Uo YmVsb3dicmV2ZSwgICAgICAgICAgICAgICAgICAgIDB4MDMyZSk7CisrICAgIENBU0UoYmVsb3dj aXJjdW1mbGV4LCAgICAgICAgICAgICAgIDB4MDMyZCk7CisrICAgIENBU0UoYmVsb3djb21tYSwg ICAgICAgICAgICAgICAgICAgIDB4MDMyNik7CisrICAgIENBU0UoYmVsb3dkaWFlcmVzaXMsICAg ICAgICAgICAgICAgIDB4MDMyNCk7CisrICAgIENBU0UoYmVsb3dkb3QsICAgICAgICAgICAgICAg ICAgICAgIDB4MDMyMyk7CisrICAgIENBU0UoYmVsb3dtYWNyb24sICAgICAgICAgICAgICAgICAg IDB4MDMzMSk7CisrICAgIENBU0UoYmVsb3dyaW5nLCAgICAgICAgICAgICAgICAgICAgIDB4MDMw YSk7CisrICAgIENBU0UoYmVsb3d0aWxkZSwgICAgICAgICAgICAgICAgICAgIDB4MDMzMCk7Cisr ICAgIENBU0UoYnJldmUsICAgICAgICAgICAgICAgICAgICAgICAgIDB4MDMwNik7CisrICAgIENB U0UoY2FwaXRhbF9zY2h3YSwgICAgICAgICAgICAgICAgIDB4MDE4Zik7CisrICAgIENBU0UoY2Fy b24sICAgICAgICAgICAgICAgICAgICAgICAgIDB4MDMwYyk7CisrICAgIENBU0UoY2VkaWxsYSwg ICAgICAgICAgICAgICAgICAgICAgIDB4MDMyNyk7CisrICAgIENBU0UoY2lyY3VtZmxleCwgICAg ICAgICAgICAgICAgICAgIDB4MDMwMik7CisrICAgIENBU0UoY3VycmVuY3ksICAgICAgICAgICAg ICAgICAgICAgIDB4MDBhNCk7CisrICAgIC8vIElCVVNfS0VZX2RlYWRfZGFzaWEgPT0gSUJVU19L RVlfZGVhZF9hYm92ZXJldmVyc2VkY29tbWEKKysgICAgQ0FTRShkaWFlcmVzaXMsICAgICAgICAg ICAgICAgICAgICAgMHgwMzA4KTsKKysgICAgQ0FTRShkb3VibGVhY3V0ZSwgICAgICAgICAgICAg ICAgICAgMHgwMzBiKTsKKysgICAgQ0FTRShkb3VibGVncmF2ZSwgICAgICAgICAgICAgICAgICAg MHgwMzBmKTsKKysgICAgQ0FTRShncmF2ZSwgICAgICAgICAgICAgICAgICAgICAgICAgMHgwMzAw KTsKKysgICAgQ0FTRShncmVlaywgICAgICAgICAgICAgICAgICAgICAgICAgMHgwM2IxKTsKKysg ICAgQ0FTRShob29rLCAgICAgICAgICAgICAgICAgICAgICAgICAgMHgwMzA5KTsKKysgICAgQ0FT RShob3JuLCAgICAgICAgICAgICAgICAgICAgICAgICAgMHgwMzFiKTsKKysgICAgQ0FTRShpbnZl cnRlZGJyZXZlLCAgICAgICAgICAgICAgICAgMHgwMzJmKTsKKysgICAgQ0FTRShpb3RhLCAgICAg ICAgICAgICAgICAgICAgICAgICAgMHgwMzQ1KTsKKysgICAgQ0FTRShtYWNyb24sICAgICAgICAg ICAgICAgICAgICAgICAgMHgwMzA0KTsKKysgICAgQ0FTRShvZ29uZWssICAgICAgICAgICAgICAg ICAgICAgICAgMHgwMzI4KTsKKysgICAgLy8gSUJVU19LRVlfZGVhZF9wZXJpc3BvbWVuaSA9PSBJ QlVTX0tFWV9kZWFkX3RpbGRlCisrICAgIC8vIElCVVNfS0VZX2RlYWRfcHNpbGkgPT0gSUJVU19L RVlfZGVhZF9hYm92ZWNvbW1hCisrICAgIENBU0Uoc2VtaXZvaWNlZF9zb3VuZCwgICAgICAgICAg ICAgIDB4MzA5YSk7CisrICAgIENBU0Uoc21hbGxfc2Nod2EsICAgICAgICAgICAgICAgICAgIDB4 MWQ0YSk7CisrICAgIENBU0Uoc3Ryb2tlLCAgICAgICAgICAgICAgICAgICAgICAgIDB4MjlmOCk7 CisrICAgIENBU0UodGlsZGUsICAgICAgICAgICAgICAgICAgICAgICAgIDB4MDMwMyk7CisrICAg IENBU0Uodm9pY2VkX3NvdW5kLCAgICAgICAgICAgICAgICAgIDB4MzA5OSk7CisrICAgIGNhc2Ug SUJVU19LRVlfTXVsdGlfa2V5OgorKyAgICAgICAgcmV0dXJuIDB4MjM4NDsKKysgICAgZGVmYXVs dDo7CisrICAgIH0KKysgICAgcmV0dXJuIDB4MDsKKysjdW5kZWYgQ0FTRQorK30KKysKKyBzdGF0 aWMgdm9pZAorIGlidXNfZW5naW5lX3NpbXBsZV9jb21taXRfc3RyIChJQnVzRW5naW5lU2ltcGxl ICpzaW1wbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAg ICAgKnN0cikKK0BAIC0yNzgsOCArMzM5LDcgQEAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9w cmVlZGl0X3RleHQgKElCdXNFbmdpbmVTaW1wbGUgKnNpbXBsZSkKKyAgICAgICAgICAgICBnX2Fz c2VydCAobGVuIDw9IElCVVNfTUFYX0NPTVBPU0VfTEVOICsgMSk7CisgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgZ19hc3NlcnQgKGxlbiA8PSBFTU9KSV9TT1VSQ0VfTEVOICsgMSk7CistICAg IH0KKy0gICAgZWxzZSBpZiAocHJpdi0+dGVudGF0aXZlX21hdGNoKSB7CisrICAgIH0gZWxzZSBp ZiAocHJpdi0+dGVudGF0aXZlX21hdGNoKSB7CisgICAgICAgICBvdXRidWZbbGVuKytdID0gcHJp di0+dGVudGF0aXZlX21hdGNoOworICAgICB9IGVsc2UgaWYgKHByaXYtPnRlbnRhdGl2ZV9lbW9q aSAmJiAqcHJpdi0+dGVudGF0aXZlX2Vtb2ppKSB7CisgICAgICAgICBJQnVzVGV4dCAqdGV4dCA9 IGlidXNfdGV4dF9uZXdfZnJvbV9zdHJpbmcgKHByaXYtPnRlbnRhdGl2ZV9lbW9qaSk7CitAQCAt Mjg4LDYgKzM0OCwyNCBAQCBpYnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRlX3ByZWVkaXRfdGV4dCAo SUJ1c0VuZ2luZVNpbXBsZSAqc2ltcGxlKQorICAgICAgICAgICAgICAgICBJQlVTX0FUVFJfVFlQ RV9VTkRFUkxJTkUsIElCVVNfQVRUUl9VTkRFUkxJTkVfU0lOR0xFLCAwLCBsZW4pOworICAgICAg ICAgaWJ1c19lbmdpbmVfdXBkYXRlX3ByZWVkaXRfdGV4dCAoKElCdXNFbmdpbmUgKilzaW1wbGUs IHRleHQsIGxlbiwgVFJVRSk7CisgICAgICAgICByZXR1cm47CisrICAgIH0gZWxzZSB7CisrICAg ICAgICBpbnQgaGV4Y2hhcnMgPSAwOworKyAgICAgICAgd2hpbGUgKHByaXYtPmNvbXBvc2VfYnVm ZmVyW2hleGNoYXJzXSAhPSAwKSB7CisrICAgICAgICAgICAgZ3VpbnQxNiBrZXlzeW09IHByaXYt PmNvbXBvc2VfYnVmZmVyW2hleGNoYXJzXTsKKysgICAgICAgICAgICBndW5pY2hhciB1bmljaGFy ID0gaWJ1c19rZXlzeW1fdG9fdW5pY29kZSAoa2V5c3ltKTsKKysgICAgICAgICAgICBpZiAodW5p Y2hhciA+IDApCisrICAgICAgICAgICAgICAgIG91dGJ1ZltsZW5dID0gdW5pY2hhcjsKKysgICAg ICAgICAgICBlbHNlCisrICAgICAgICAgICAgICAgIG91dGJ1ZltsZW5dID0gaWJ1c19rZXl2YWxf dG9fdW5pY29kZSAoa2V5c3ltKTsKKysgICAgICAgICAgICBpZiAoIW91dGJ1ZltsZW5dKSB7Cisr ICAgICAgICAgICAgICAgIGdfd2FybmluZyAoCisrICAgICAgICAgICAgICAgICAgICAgICAgIk5v dCBmb3VuZCBhbHRlcm5hdGl2ZSBjaGFyYWN0ZXIgb2YgY29tcG9zZSBrZXkgMHglWCIsCisrICAg ICAgICAgICAgICAgICAgICAgICAgcHJpdi0+Y29tcG9zZV9idWZmZXJbaGV4Y2hhcnNdKTsKKysg ICAgICAgICAgICB9CisrICAgICAgICAgICAgKytsZW47CisrICAgICAgICAgICAgKytoZXhjaGFy czsKKysgICAgICAgIH0KKysgICAgICAgIGdfYXNzZXJ0IChsZW4gPD0gSUJVU19NQVhfQ09NUE9T RV9MRU4gKyAxKTsKKyAgICAgfQorIAorICAgICBvdXRidWZbbGVuXSA9IEwnXDAnOworQEAgLTU2 OSw4ICs2NDcsOSBAQCBjaGVja190YWJsZSAoSUJ1c0VuZ2luZVNpbXBsZSAgICAgICAqc2ltcGxl LAorICAgICAgICAgfQorIAorICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX2NvbW1pdF9jaGFy IChzaW1wbGUsIHZhbHVlKTsKKy0gICAgICAgIC8vIGdfZGVidWcgKCJVKyUwNFhcbiIsIHZhbHVl KTsKKyAgICAgICAgIHByaXYtPmNvbXBvc2VfYnVmZmVyWzBdID0gMDsKKysgICAgICAgIGlidXNf ZW5naW5lX3NpbXBsZV91cGRhdGVfcHJlZWRpdF90ZXh0IChzaW1wbGUpOworKyAgICAgICAgLy8g Z19kZWJ1ZyAoIlUrJTA0WFxuIiwgdmFsdWUpOworICAgICB9CisgICAgIHJldHVybiBUUlVFOwor IH0KK0BAIC03NjgsNDQgKzg0NywxMCBAQCBpYnVzX2NoZWNrX2FsZ29yaXRobWljYWxseSAoY29u c3QgZ3VpbnQxNiAqY29tcG9zZV9idWZmZXIsCisgICAgICAgICBjb21iaW5hdGlvbl9idWZmZXJb bl9jb21wb3NlXSA9IDA7CisgICAgICAgICBpLS07CisgICAgICAgICB3aGlsZSAoaSA+PSAwKSB7 CistICAgICAgICBzd2l0Y2ggKGNvbXBvc2VfYnVmZmVyW2ldKSB7CistI2RlZmluZSBDQVNFKGtl eXN5bSwgdW5pY29kZSkgXAorLSAgICAgICAgY2FzZSBJQlVTX0tFWV9kZWFkXyMja2V5c3ltOiBc CistICAgICAgICAgICAgY29tYmluYXRpb25fYnVmZmVyW2krMV0gPSB1bmljb2RlOyBcCistICAg ICAgICAgICAgYnJlYWsKKy0gICAgICAgIENBU0UgKGdyYXZlLCAweDAzMDApOworLSAgICAgICAg Q0FTRSAoYWN1dGUsIDB4MDMwMSk7CistICAgICAgICBDQVNFIChjaXJjdW1mbGV4LCAweDAzMDIp OworLSAgICAgICAgQ0FTRSAodGlsZGUsIDB4MDMwMyk7ICAgIC8qIEFsc28gdXNlZCB3aXRoIHBl cmlzcG9tZW5pLCAweDM0Mi4gKi8KKy0gICAgICAgIENBU0UgKG1hY3JvbiwgMHgwMzA0KTsKKy0g ICAgICAgIENBU0UgKGJyZXZlLCAweDAzMDYpOworLSAgICAgICAgQ0FTRSAoYWJvdmVkb3QsIDB4 MDMwNyk7CistICAgICAgICBDQVNFIChkaWFlcmVzaXMsIDB4MDMwOCk7CistICAgICAgICBDQVNF IChob29rLCAweDAzMDkpOworLSAgICAgICAgQ0FTRSAoYWJvdmVyaW5nLCAweDAzMEEpOworLSAg ICAgICAgQ0FTRSAoZG91YmxlYWN1dGUsIDB4MDMwQik7CistICAgICAgICBDQVNFIChjYXJvbiwg MHgwMzBDKTsKKy0gICAgICAgIENBU0UgKGFib3ZlY29tbWEsIDB4MDMxMyk7ICAgICAgICAgLyog RXF1aXZhbGVudCB0byBwc2lsaSAqLworLSAgICAgICAgQ0FTRSAoYWJvdmVyZXZlcnNlZGNvbW1h LCAweDAzMTQpOyAvKiBFcXVpdmFsZW50IHRvIGRhc2lhICovCistICAgICAgICBDQVNFIChob3Ju LCAweDAzMUIpOyAgICAvKiBMZWdhY3kgdXNlIGZvciBwc2lsaSwgMHgzMTMgKG9yIDB4MzQzKS4g Ki8KKy0gICAgICAgIENBU0UgKGJlbG93ZG90LCAweDAzMjMpOworLSAgICAgICAgQ0FTRSAoY2Vk aWxsYSwgMHgwMzI3KTsKKy0gICAgICAgIENBU0UgKG9nb25laywgMHgwMzI4KTsgICAgLyogTGVn YWN5IHVzZSBmb3IgZGFzaWEsIDB4MzE0LiovCistICAgICAgICBDQVNFIChpb3RhLCAweDAzNDUp OworLSAgICAgICAgQ0FTRSAodm9pY2VkX3NvdW5kLCAweDMwOTkpOyAgICAvKiBQZXIgTWFya3Vz IEt1aG4ga2V5c3ltcy50eHQgZmlsZS4gKi8KKy0gICAgICAgIENBU0UgKHNlbWl2b2ljZWRfc291 bmQsIDB4MzA5QSk7ICAgIC8qIFBlciBNYXJrdXMgS3VobiBrZXlzeW1zLnR4dCBmaWxlLiAqLwor LQorLSAgICAgICAgLyogVGhlIGZvbGxvd2luZyBjYXNlcyBhcmUgdG8gYmUgcmVtb3ZlZCBvbmNl IHhrZXlib2FyZC1jb25maWcsCistICAgICAgICAgICogeG9yZyBhcmUgZnVsbHkgdXBkYXRlZC4K Ky0gICAgICAgICAgKi8KKy0gICAgICAgICAgICAvKiBXb3JrYXJvdW5kIGZvciB0eXBvIGluIDEu NC54IHhzZXJ2ZXIteG9yZyAqLworLSAgICAgICAgY2FzZSAweGZlNjY6IGNvbWJpbmF0aW9uX2J1 ZmZlcltpKzFdID0gMHgzMTQ7IGJyZWFrOworLSAgICAgICAgLyogQ0FTRSAoZGFzaWEsIDB4MzE0 KTsgKi8KKy0gICAgICAgIC8qIENBU0UgKHBlcmlzcG9tZW5pLCAweDM0Mik7ICovCistICAgICAg ICAvKiBDQVNFIChwc2lsaSwgMHgzNDMpOyAqLworLSN1bmRlZiBDQVNFCistICAgICAgICBkZWZh dWx0OgorLSAgICAgICAgICAgIGNvbWJpbmF0aW9uX2J1ZmZlcltpKzFdID0gaWJ1c19rZXl2YWxf dG9fdW5pY29kZSAoY29tcG9zZV9idWZmZXJbaV0pOworKyAgICAgICAgY29tYmluYXRpb25fYnVm ZmVyW2krMV0gPSBpYnVzX2tleXN5bV90b191bmljb2RlIChjb21wb3NlX2J1ZmZlcltpXSk7Cisr ICAgICAgICBpZiAoIWNvbWJpbmF0aW9uX2J1ZmZlcltpKzFdKSB7CisrICAgICAgICAgICAgY29t YmluYXRpb25fYnVmZmVyW2krMV0gPQorKyAgICAgICAgICAgICAgICAgICAgaWJ1c19rZXl2YWxf dG9fdW5pY29kZSAoY29tcG9zZV9idWZmZXJbaV0pOworICAgICAgICAgfQorICAgICAgICAgaS0t OworICAgICB9CitAQCAtODUzLDYgKzg5OCw3IEBAIG5vX3NlcXVlbmNlX21hdGNoZXMgKElCdXNF bmdpbmVTaW1wbGUgKnNpbXBsZSwKKyAKKyAgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV9jb21t aXRfY2hhciAoc2ltcGxlLCBwcml2LT50ZW50YXRpdmVfbWF0Y2gpOworICAgICAgICAgcHJpdi0+ Y29tcG9zZV9idWZmZXJbMF0gPSAwOworKyAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0 ZV9wcmVlZGl0X3RleHQgKHNpbXBsZSk7CisgCisgICAgICAgICBmb3IgKGk9MDsgaSA8IG5fY29t cG9zZSAtIGxlbiAtIDE7IGkrKykgeworICAgICAgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV9w cm9jZXNzX2tleV9ldmVudCAoCitAQCAtODcyLDIwICs5MTgsMjEgQEAgbm9fc2VxdWVuY2VfbWF0 Y2hlcyAoSUJ1c0VuZ2luZVNpbXBsZSAqc2ltcGxlLAorICAgICAgICAgaWYgKG5fY29tcG9zZSA+ IDEpIHsKKyAgICAgICAgICAgICAvKiBJbnZhbGlkIHNlcXVlbmNlICovCisgICAgICAgICAgICAg Ly8gRklYTUUgYmVlcF93aW5kb3cgKGV2ZW50LT53aW5kb3cpOworKyAgICAgICAgICAgIGlidXNf ZW5naW5lX3NpbXBsZV91cGRhdGVfcHJlZWRpdF90ZXh0IChzaW1wbGUpOworICAgICAgICAgICAg IHJldHVybiBUUlVFOworICAgICAgICAgfQorIAorKyAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxl X3VwZGF0ZV9wcmVlZGl0X3RleHQgKHNpbXBsZSk7CisgICAgICAgICBjaCA9IGlidXNfa2V5dmFs X3RvX3VuaWNvZGUgKGtleXZhbCk7CisgICAgICAgICAvKiBJQlVTX0NIQU5HRTogUkgjNzY5MTMz CisgICAgICAgICAgKiBTaW5jZSB3ZSB1c2UgaWJ1cyB4a2IgZW5naW5lcyBhcyB0aGUgZGlzYWJs ZSBzdGF0ZSwKKyAgICAgICAgICAqIGRvIG5vdCBjb21taXQgdGhlIGNoYXJhY3RlcnMgbG9jYWxs eSB3aXRob3V0IGluX2hleF9zZXF1ZW5jZS4gKi8KKyAgICAgICAgIGlmIChjaCAhPSAwICYmICFn X3VuaWNoYXJfaXNjbnRybCAoY2gpICYmCisgICAgICAgICAgICAgcHJpdi0+aW5faGV4X3NlcXVl bmNlKSB7CistICAgICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX2NvbW1pdF9jaGFyIChzaW1w bGUsIGNoKTsKKyAgICAgICAgICAgICByZXR1cm4gVFJVRTsKKy0gICAgICAgIH0KKy0gICAgICAg IGVsc2UKKysgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgcmV0dXJuIEZBTFNFOworKyAg ICAgICAgfQorICAgICB9CisgICAgIHJldHVybiBGQUxTRTsKKyB9CitAQCAtMTAyNyw2ICsxMDc0 LDcgQEAgaWJ1c19lbmdpbmVfc2ltcGxlX3Byb2Nlc3Nfa2V5X2V2ZW50IChJQnVzRW5naW5lICpl bmdpbmUsCisgICAgICAgICAgICAgaWYgKHByaXYtPnRlbnRhdGl2ZV9tYXRjaCAmJgorICAgICAg ICAgICAgICAgICBnX3VuaWNoYXJfdmFsaWRhdGUgKHByaXYtPnRlbnRhdGl2ZV9tYXRjaCkpIHsK KyAgICAgICAgICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX2NvbW1pdF9jaGFyIChzaW1wbGUs IHByaXYtPnRlbnRhdGl2ZV9tYXRjaCk7CisrICAgICAgICAgICAgICAgIGlidXNfZW5naW5lX3Np bXBsZV91cGRhdGVfcHJlZWRpdF90ZXh0IChzaW1wbGUpOworICAgICAgICAgICAgIH0gZWxzZSBp ZiAobl9jb21wb3NlID09IDApIHsKKyAgICAgICAgICAgICAgICAgcHJpdi0+bW9kaWZpZXJzX2Ry b3BwZWQgPSBUUlVFOworICAgICAgICAgICAgIH0gZWxzZSB7CitAQCAtMTE3NiwxMiArMTIyNCwy MSBAQCBpYnVzX2VuZ2luZV9zaW1wbGVfcHJvY2Vzc19rZXlfZXZlbnQgKElCdXNFbmdpbmUgKmVu Z2luZSwKKyAKKyAgICAgICAgIHJldHVybiBUUlVFOworICAgICB9CisrICAgIGlmICghcHJpdi0+ aW5faGV4X3NlcXVlbmNlICYmICFwcml2LT5pbl9lbW9qaV9zZXF1ZW5jZSAmJiBpc19iYWNrc3Bh Y2UpIHsKKysgICAgICAgIGlmIChuX2NvbXBvc2UgPiAwKSB7CisrICAgICAgICAgICAgbl9jb21w b3NlLS07CisrICAgICAgICAgICAgcHJpdi0+Y29tcG9zZV9idWZmZXJbbl9jb21wb3NlXSA9IDA7 CisrICAgICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9wcmVlZGl0X3RleHQgKHNp bXBsZSk7CisrICAgICAgICAgICAgcmV0dXJuIFRSVUU7CisrICAgICAgICB9CisrICAgIH0KKyAK KyAgICAgLyogQ2hlY2sgZm9yIGhleCBzZXF1ZW5jZSByZXN0YXJ0ICovCisgICAgIGlmIChwcml2 LT5pbl9oZXhfc2VxdWVuY2UgJiYgaGF2ZV9oZXhfbW9kcyAmJiBpc19oZXhfc3RhcnQpIHsKKyAg ICAgICAgIGlmIChwcml2LT50ZW50YXRpdmVfbWF0Y2ggJiYKKyAgICAgICAgICAgICBnX3VuaWNo YXJfdmFsaWRhdGUgKHByaXYtPnRlbnRhdGl2ZV9tYXRjaCkpIHsKKyAgICAgICAgICAgICBpYnVz X2VuZ2luZV9zaW1wbGVfY29tbWl0X2NoYXIgKHNpbXBsZSwgcHJpdi0+dGVudGF0aXZlX21hdGNo KTsKKysgICAgICAgICAgICBpYnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRlX3ByZWVkaXRfdGV4dCAo c2ltcGxlKTsKKyAgICAgICAgIH0KKyAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgIC8qIGlu dmFsaWQgaGV4IHNlcXVlbmNlICovCitAQCAtMTI4Myw2ICsxMzQwLDEyIEBAIGlidXNfZW5naW5l X3NpbXBsZV9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0VuZ2luZSAqZW5naW5lLAorICAgICAgICAg ICAgIHJldHVybiBUUlVFOworICAgICAgICAgfQorICAgICB9IGVsc2UgeworKyAgICAgICAgaWYg KGlzX2VzY2FwZSkgeworKyAgICAgICAgICAgIGlmIChuX2NvbXBvc2UgPiAwKSB7CisrICAgICAg ICAgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV9yZXNldCAoZW5naW5lKTsKKysgICAgICAgICAg ICAgICAgcmV0dXJuIFRSVUU7CisrICAgICAgICAgICAgfQorKyAgICAgICAgfQorICAgICAgICAg U0VUX0NPTVBPU0VfQlVGRkVSX0VMRU1FTlRfTkVYVCAocHJpdi0+Y29tcG9zZV9idWZmZXIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuX2NvbXBvc2UsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXl2YWwpOworQEAgLTEzMDIs NiArMTM2NSw3IEBAIGlidXNfZW5naW5lX3NpbXBsZV9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0Vu Z2luZSAqZW5naW5lLAorICAgICAgICAgICAgICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX2Nv bW1pdF9jaGFyIChzaW1wbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaXYtPnRl bnRhdGl2ZV9tYXRjaCk7CisgICAgICAgICAgICAgICAgICAgICBwcml2LT5jb21wb3NlX2J1ZmZl clswXSA9IDA7CisrICAgICAgICAgICAgICAgICAgICBpYnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRl X3ByZWVkaXRfdGV4dCAoc2ltcGxlKTsKKyAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgICAgICAgICAgIC8vIEZJWE1FCisgICAgICAgICAgICAgICAgICAgICAvKiBpbnZhbGlk IGhleCBzZXF1ZW5jZSAqLworQEAgLTE0MTcsOSArMTQ4MSw4IEBAIGlidXNfZW5naW5lX3NpbXBs ZV9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0VuZ2luZSAqZW5naW5lLAorICAgICAgICAgICAgIGlm IChjb21wb3NlX2ZpbmlzaCkgeworICAgICAgICAgICAgICAgICBpYnVzX2VuZ2luZV9zaW1wbGVf Y29tbWl0X2NoYXIgKHNpbXBsZSwgb3V0cHV0X2NoYXIpOworICAgICAgICAgICAgICAgICBwcml2 LT5jb21wb3NlX2J1ZmZlclswXSA9IDA7CistICAgICAgICAgICAgfSBlbHNlIHsKKy0gICAgICAg ICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9wcmVlZGl0X3RleHQgKHNpbXBsZSk7 CisgICAgICAgICAgICAgfQorKyAgICAgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV91cGRhdGVf cHJlZWRpdF90ZXh0IChzaW1wbGUpOworICAgICAgICAgICAgIHJldHVybiBUUlVFOworICAgICAg ICAgfQorIAorQEAgLTE0MzAsNiArMTQ5Myw3IEBAIGlidXNfZW5naW5lX3NpbXBsZV9wcm9jZXNz X2tleV9ldmVudCAoSUJ1c0VuZ2luZSAqZW5naW5lLAorICAgICAgICAgICAgICAgICBpYnVzX2Vu Z2luZV9zaW1wbGVfY29tbWl0X2NoYXIgKHNpbXBsZSwgb3V0cHV0X2NoYXIpOworICAgICAgICAg ICAgICAgICBwcml2LT5jb21wb3NlX2J1ZmZlclswXSA9IDA7CisgICAgICAgICAgICAgfQorKyAg ICAgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV91cGRhdGVfcHJlZWRpdF90ZXh0IChzaW1wbGUp OworICAgICAgICAgICAgIHJldHVybiBUUlVFOworICAgICAgICAgfQorICAgICB9CistLSAKKzIu MTQuMworCitGcm9tIDliMjZhNGI0NmZhMjYzNTAzM2QzMTVlOGJhYmI4YzRjYTk4Njk4OTggTW9u IFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBn bWFpbC5jb20+CitEYXRlOiBXZWQsIDI3IEp1biAyMDE4IDEyOjE4OjI2ICswOTAwCitTdWJqZWN0 OiBbUEFUQ0hdIHBhbmVsYmluZGluZzogRml4IFNFR1YgaW4gcGFuZWxfYmluZGluZ19wYXJzZV9h Y2NlbGVyYXRvcgorCitwYW5lbF9iaW5kaW5nX3BhcnNlX2FjY2VsZXJhdG9yKCkgY291bGQgcmV0 dXJuIE5VTEwgb2YgdGhlIHVub3duZWQKK0lCdXMuUHJvY2Vzc0tleUV2ZW50RGF0YSB3aXRoIGdj YyBvcHRpbWl6YXRpb24uCitTaW5jZSBWYWxhIGRvZXMgbm90IHByb3ZpY2UgYSBzdGF0aWMgbG9j YWwgdmFyaWFibGUsIHRoZSB2YXJpYWJsZSBpcworbW92ZWQgdG8gdGhlIGNsYXNzIG1lbWJlciB0 byBmaXggdGhpcyBTRUdWLgorQWxzbyBhIE5VTEwgcHJlZWRpdCBpcyBmaXhlZCBpbiB0aGUgZmly c3QgZW1vamkgY2FuZGlkYXRlIGZyb20gdGhlCitlbW9qaSBjYXRlZ29yeSB3aW5kb3cuCistLS0K KyB1aS9ndGszL3BhbmVsYmluZGluZy52YWxhIHwgMjggKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLQorIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK KworZGlmZiAtLWdpdCBhL3VpL2d0azMvcGFuZWxiaW5kaW5nLnZhbGEgYi91aS9ndGszL3BhbmVs YmluZGluZy52YWxhCitpbmRleCA1MmI3OGMxNy4uOTUxMTViMTMgMTAwNjQ0CistLS0gYS91aS9n dGszL3BhbmVsYmluZGluZy52YWxhCisrKysgYi91aS9ndGszL3BhbmVsYmluZGluZy52YWxhCitA QCAtMjI3LDYgKzIyNyw4IEBAIGNsYXNzIFBhbmVsQmluZGluZyA6IElCdXMuUGFuZWxTZXJ2aWNl IHsKKyAgICAgcHJpdmF0ZSBib29sIG1fZW5hYmxlX2V4dGVuc2lvbjsKKyAgICAgcHJpdmF0ZSBz dHJpbmcgbV9leHRlbnNpb25fbmFtZSA9ICIiOworICAgICBwcml2YXRlIFByZWVkaXQgbV9wcmVl ZGl0OworKyAgICBwcml2YXRlIElCdXMuUHJvY2Vzc0tleUV2ZW50RGF0YSBtX2tleV9ldmVudF9k YXRhID0KKysgICAgICAgICAgICBJQnVzLlByb2Nlc3NLZXlFdmVudERhdGEoKTsKKyAKKyAgICAg cHVibGljIFBhbmVsQmluZGluZyhJQnVzLkJ1cyBidXMsCisgICAgICAgICAgICAgICAgICAgICAg ICAgR3RrLkFwcGxpY2F0aW9uIGFwcGxpY2F0aW9uKSB7CitAQCAtMzExLDI0ICszMTMsMjQgQEAg Y2xhc3MgUGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICB9CisgCisgCist ICAgIHByaXZhdGUgdW5vd25lZAorLSAgICBJQnVzLlByb2Nlc3NLZXlFdmVudERhdGE/IHBhcnNl X2FjY2VsZXJhdG9yKHN0cmluZyBhY2NlbGVyYXRvcikgeworLSAgICAgICAgSUJ1cy5Qcm9jZXNz S2V5RXZlbnREYXRhIGtleSA9IHt9OworKyAgICAvLyBSZXR1cm5pbmcgdW5vd25lZCBJQnVzLktl eUV2ZW50RGF0YSBjYXVzZXMgTlVMTCB3aXRoIGdjYyBvcHRpbWl6YXRpb24KKysgICAgLy8gYW5k IHVzZSBtX2tleV9ldmVudF9kYXRhLgorKyAgICBwcml2YXRlIHZvaWQgcGFyc2VfYWNjZWxlcmF0 b3Ioc3RyaW5nIGFjY2VsZXJhdG9yKSB7CisrICAgICAgICBtX2tleV9ldmVudF9kYXRhID0ge307 CisgICAgICAgICB1aW50IGtleXN5bSA9IDA7CisgICAgICAgICBJQnVzLk1vZGlmaWVyVHlwZSBt b2RpZmllcnMgPSAwOworICAgICAgICAgSUJ1cy5hY2NlbGVyYXRvcl9wYXJzZShhY2NlbGVyYXRv ciwKKyAgICAgICAgICAgICAgICAgb3V0IGtleXN5bSwgb3V0IG1vZGlmaWVycyk7CisgICAgICAg ICBpZiAoa2V5c3ltID09IDBVICYmIG1vZGlmaWVycyA9PSAwKSB7CisgICAgICAgICAgICAgd2Fy bmluZygiRmFpbGVkIHRvIHBhcnNlIHNob3J0Y3V0IGtleSAnJXMnIi5wcmludGYoYWNjZWxlcmF0 b3IpKTsKKy0gICAgICAgICAgICByZXR1cm4gbnVsbDsKKysgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICB9CisgICAgICAgICBpZiAoKG1vZGlmaWVycyAmIElCdXMuTW9kaWZpZXJUeXBlLlNV UEVSX01BU0spICE9IDApIHsKKyAgICAgICAgICAgICBtb2RpZmllcnMgXj0gSUJ1cy5Nb2RpZmll clR5cGUuU1VQRVJfTUFTSzsKKyAgICAgICAgICAgICBtb2RpZmllcnMgfD0gSUJ1cy5Nb2RpZmll clR5cGUuTU9ENF9NQVNLOworICAgICAgICAgfQorLSAgICAgICAga2V5LmtleXZhbCA9IGtleXN5 bTsKKy0gICAgICAgIGtleS5zdGF0ZSA9IG1vZGlmaWVyczsKKy0gICAgICAgIHJldHVybiBrZXk7 CisrICAgICAgICBtX2tleV9ldmVudF9kYXRhLmtleXZhbCA9IGtleXN5bTsKKysgICAgICAgIG1f a2V5X2V2ZW50X2RhdGEuc3RhdGUgPSBtb2RpZmllcnM7CisgICAgIH0KKyAKKyAKK0BAIC0zMzcs OCArMzM5LDggQEAgY2xhc3MgUGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAg ICAgICAgSUJ1cy5Qcm9jZXNzS2V5RXZlbnREYXRhIGtleTsKKyAgICAgICAgIHN0cmluZ1tdIGFj Y2VsZXJhdG9ycyA9IG1fc2V0dGluZ3NfZW1vamkuZ2V0X3N0cnYoImhvdGtleSIpOworICAgICAg ICAgZm9yZWFjaCAodmFyIGFjY2VsZXJhdG9yIGluIGFjY2VsZXJhdG9ycykgeworLSAgICAgICAg ICAgIGtleSA9IHBhcnNlX2FjY2VsZXJhdG9yKGFjY2VsZXJhdG9yKTsKKy0gICAgICAgICAgICBl bW9qaV9rZXlzICs9IGtleTsKKysgICAgICAgICAgICBwYXJzZV9hY2NlbGVyYXRvcihhY2NlbGVy YXRvcik7CisrICAgICAgICAgICAgZW1vamlfa2V5cyArPSBtX2tleV9ldmVudF9kYXRhOworICAg ICAgICAgfQorIAorICAgICAgICAgLyogU2luY2Uge30gaXMgbm90IGFsbG9jYXRlZCwgcGFyc2Vf YWNjZWxlcmF0b3IoKSBzaG91bGQgYmUgdW5vd25lZC4gKi8KK0BAIC0zNDgsOCArMzUwLDggQEAg Y2xhc3MgUGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAgICAgSUJ1cy5Q cm9jZXNzS2V5RXZlbnREYXRhW10gdW5pY29kZV9rZXlzID0ge307CisgICAgICAgICBhY2NlbGVy YXRvcnMgPSBtX3NldHRpbmdzX2Vtb2ppLmdldF9zdHJ2KCJ1bmljb2RlLWhvdGtleSIpOworICAg ICAgICAgZm9yZWFjaCAodmFyIGFjY2VsZXJhdG9yIGluIGFjY2VsZXJhdG9ycykgeworLSAgICAg ICAgICAgIGtleSA9IHBhcnNlX2FjY2VsZXJhdG9yKGFjY2VsZXJhdG9yKTsKKy0gICAgICAgICAg ICB1bmljb2RlX2tleXMgKz0ga2V5OworKyAgICAgICAgICAgIHBhcnNlX2FjY2VsZXJhdG9yKGFj Y2VsZXJhdG9yKTsKKysgICAgICAgICAgICB1bmljb2RlX2tleXMgKz0gbV9rZXlfZXZlbnRfZGF0 YTsKKyAgICAgICAgIH0KKyAgICAgICAgIGtleSA9IHt9OworICAgICAgICAgdW5pY29kZV9rZXlz ICs9IGtleTsKK0BAIC01NDQsOCArNTQ2LDEwIEBAIGNsYXNzIFBhbmVsQmluZGluZyA6IElCdXMu UGFuZWxTZXJ2aWNlIHsKKyAgICAgcHJpdmF0ZSBib29sIGtleV9wcmVzc19lbnRlcigpIHsKKyAg ICAgICAgIGlmIChtX2V4dGVuc2lvbl9uYW1lICE9ICJ1bmljb2RlIiAmJiBpc19lbW9qaV9sb29r dXBfdGFibGUoKSkgeworICAgICAgICAgICAgIC8vIENoZWNrIGlmIHZhcmlhdHMgZXhpc3QKKy0g ICAgICAgICAgICBpZiAobV9lbW9qaWVyLmtleV9wcmVzc19lbnRlcigpKQorKyAgICAgICAgICAg IGlmIChtX2Vtb2ppZXIua2V5X3ByZXNzX2VudGVyKCkpIHsKKysgICAgICAgICAgICAgICAgY29u dmVydF9wcmVlZGl0X3RleHQoKTsKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisrICAg ICAgICAgICAgfQorICAgICAgICAgfQorICAgICAgICAgSUJ1cy5UZXh0IHRleHQgPSBtX3ByZWVk aXQuZ2V0X2NvbW1pdF90ZXh0KCk7CisgICAgICAgICBjb21taXRfdGV4dF91cGRhdGVfZmF2b3Jp dGVzKHRleHQpOworLS0gCisyLjE0LjMKKwoKZGlmZiAtLWdpdCBhL2lidXMuc3BlYyBiL2lidXMu c3BlYwppbmRleCA4Y2NjOThlLi45ZmEzNDhiIDEwMDY0NAotLS0gYS9pYnVzLnNwZWMKKysrIGIv aWJ1cy5zcGVjCkBAIC0zOSw3ICszOSw3IEBACiAKIE5hbWU6ICAgICAgICAgICBpYnVzCiBWZXJz aW9uOiAgICAgICAgMS41LjE4Ci1SZWxlYXNlOiAgICAgICAgNyV7P2Rpc3R9CitSZWxlYXNlOiAg ICAgICAgOCV7P2Rpc3R9CiBTdW1tYXJ5OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZv ciBMaW51eCBPUwogTGljZW5zZTogICAgICAgIExHUEx2MisKIEdyb3VwOiAgICAgICAgICBTeXN0 ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVzCkBAIC00Nyw2ICs0Nyw3IEBAIFVSTDogICAgICAgICAg ICBodHRwczovL2dpdGh1Yi5jb20vaWJ1cy8lbmFtZS93aWtpCiBTb3VyY2UwOiAgICAgICAgaHR0 cHM6Ly9naXRodWIuY29tL2lidXMvJW5hbWUvcmVsZWFzZXMvZG93bmxvYWQvJXt2ZXJzaW9ufS8l e25hbWV9LSV7dmVyc2lvbn0udGFyLmd6CiBTb3VyY2UxOiAgICAgICAgJXtuYW1lfS14aW5wdXQK IFNvdXJjZTI6ICAgICAgICAle25hbWV9LmNvbmYuNQorU291cmNlMzogICAgICAgICV7bmFtZX0t cG8tMS41LjE4LTIwMTgwNjI3LnRhci5negogIyBXaWxsIHJlbW92ZSB0aGUgYW5ub3RhdGlvbiB0 YXJiYWxsIG9uY2UgdGhlIHJwbSBpcyBhdmFpbGFibGUgb24gRmVkb3JhCiAjIFVwc3RyZWFtZWQg cGF0Y2hlcy4KICMgUGF0Y2gwOiAgICAgICAgICUle25hbWV9LUhFQUQucGF0Y2gKQEAgLTI1MSw2 ICsyNTIsNyBAQCBUaGUgaWJ1cy1kZXZlbC1kb2NzIHBhY2thZ2UgY29udGFpbnMgZGV2ZWxvcGVy IGRvY3VtZW50YXRpb24gZm9yIElCdXMKIAogJXByZXAKICVhdXRvc2V0dXAgLVMgZ2l0Cit6Y2F0 ICVTT1VSQ0UzIHwgdGFyIHhmdiAtCiAjIGNwIGNsaWVudC9ndGsyL2lidXNpbWNvbnRleHQuYyBj bGllbnQvZ3RrMy9pYnVzaW1jb250ZXh0LmMgfHwKIAogIyBwcmVwIHRlc3QKQEAgLTQzMyw2ICs0 MzUsMTAgQEAgZGNvbmYgdXBkYXRlIHx8IDoKICV7X2RhdGFkaXJ9L2d0ay1kb2MvaHRtbC8qCiAK ICVjaGFuZ2Vsb2cKKyogV2VkIEp1biAyNyAyMDE4IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckBy ZWRoYXQuY29tPiAtIDEuNS4xOC04CistIEVuYWJsZSBwcmVlZGl0IGZvciBjb21wb3NlIGtleXMK Ky0gRml4IFNFR1YgaW4gcGFuZWxfYmluZGluZ19wYXJzZV9hY2NlbGVyYXRvcgorCiAqIFdlZCBK dW4gMjAgMjAxOCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuMTgt NwogLSBNb3ZlZCBpbnB1dCBmb2N1cyBvbiBFbW9qaWVyIHRvIGVuZ2luZXMnIHByZWVkaXQKIC0g UmVtb3ZlZCBpYnVzLXh4LWVtb2ppLWhhcmZidXp6LnBhdGNoIG5vdCB0byBjaGFuZ2Ugc2Vzc2lv biBlbW9qaSBmb250CgpkaWZmIC0tZ2l0IGEvc291cmNlcyBiL3NvdXJjZXMKaW5kZXggMWU3YmNl Zi4uN2FkMjc1ZCAxMDA2NDQKLS0tIGEvc291cmNlcworKysgYi9zb3VyY2VzCkBAIC0xICsxLDIg QEAKIFNIQTUxMiAoaWJ1cy0xLjUuMTgudGFyLmd6KSA9IDM0NTE5YzM0NjRlYWYyY2FjMzMyMGUx NTY4ZmM3NmY0ZWRiMjgxYWZhNzBmMzM1YzAxNWI4MjhmZjRlODZiMzIyNGQ3N2I5NWNkYzBiMmU3 NmU0MjQ1OWM1NGIxMDQ0MjY0ZmYyMjY5NjNmZTczOWRkNTUzYWM3MzI2ZDJmMmQzCitTSEE1MTIg KGlidXMtcG8tMS41LjE4LTIwMTgwNjI3LnRhci5neikgPSBiZDU1ODgzZmM3YjA4MTBlNTljYzBk ZTBhMWEwZTM5ZTlhOWVlM2Y4ZDIwMDAxNDIwYjlkNmYyYWVmZTVmZTAwYTgyMWRhZThhZjNkMWUz YzNiOGIwNTZmOGNiMGRjYzYyNWY2ZGMxNDIwNWI3MmYxMmE4NzRiOTU2ZDRlNzEzYgo=