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: Fix some bug fixes in Fedora and upstream Date: Sun, 31 May 2026 02:09:08 GMT Message-ID: <178019334830.1.16467660454623119513.rpms-ibus-41fe4ec09aed@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 41fe4ec09aed95b00933345a0a66da58a3e081a1 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiA0MWZlNGVjMDlhZWQ5NWIwMDkzMzM0NWEwYTY2ZGE1OGEzZTA4MWExCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDI2LTAxLTEwVDIyOjAxOjA3KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICs3NTQvLTI5IGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy80MWZlNGVjMDlhZWQ5NWIwMDkzMzM0 NWEwYTY2ZGE1OGEzZTA4MWExP2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBGaXggc29tZSBidWcgZml4ZXMgaW4gRmVkb3JhIGFuZCB1cHN0cmVhbQoKLSBSZXNv bHZlczogIzI0MTk0NjkgRml4IFNFR1Ygd2l0aCBkb3VibGUgYnVzX25hbWVfYWNxdWlyZWRfY2Io KQotIFJlc29sdmVzOiAjMjQyNDI1NiBEZWxldGUgUmVxdWlyZXMgZGVza3RvcC1maWxlLXV0aWxz IGluIHNwZWMKLSBSZXNvbHZlczogIzI0MjU1ODUgU2VwYXJhdGUgbHhxdC13YXlsYW5kLXNlc3Np b24gYW5kIGx4cXQteDExLXNlc3Npb24gaW4gc3BlYwotIFJlc29sdmVzOiAjMjQyODIzOCBBZGQg YXdlc29tZSBpbiBzcGVjCi0gUmViYXNlOiAjMTc5NzEyMCBGaXggYXNzZXJ0aW9uIGluIHBhbmVs X2JpbmRpbmdfY29uc3RydWN0KCkKLSBDb25uZWN0IGRlbGV0ZSBzdXJyb3VuZGluZyB0ZXh0IGlu IGlidXMtd2F5bGFuZAotIEZpeCBCYWNrc3BhY2UgYWZ0ZXIgY29tbWl0LXRleHQgaW4gR2hvc3R0 eSBpbiBpYnVzLXdheWxhbmQKCi0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy0xMzg1MzQ5LXNlZ3YtYnVz LXByb3h5LnBhdGNoIGIvaWJ1cy0xMzg1MzQ5LXNlZ3YtYnVzLXByb3h5LnBhdGNoCmluZGV4IDJk OTE5YjIuLjkwODRlZTAgMTAwNjQ0Ci0tLSBhL2lidXMtMTM4NTM0OS1zZWd2LWJ1cy1wcm94eS5w YXRjaAorKysgYi9pYnVzLTEzODUzNDktc2Vndi1idXMtcHJveHkucGF0Y2gKQEAgLTMyLDkgKzMy LDYgQEAgcmhieiMxNzcxMjM4IFNFR1YgaW4gYXNzZXJ0KG1fbG9vcCA9PSBudWxsKSBpbiBzd2l0 Y2hlci52YWxhLgogR3JhYmJpbmcga2V5Ym9hcmQgY291bGQgYmUgZmFpbGVkIGFuZCBzd2l0Y2hl ciByZWNlaXZlZCB0aGUga2V5Ym9hcmQKIGV2ZW50cyBhbmQgbV9sb29wIHdhcyBub3QgcmVsZWFz ZWQuCiAKLXJoYnojMTc5NzEyMCBTRUdWIGluIGFzc2VydChidXMuaXNfY29ubmVjdGVkKCkpIGlu IHBhbmVsX2JpbmRpbmdfY29uc3RydWN0KCkKLUNoZWNrIG1faWJ1cyBpbiBleHRlbnNpb24udmFs YTpidXNfbmFtZV9hY3F1aXJlZF9jYigpCi0KIHJoYnojMjE1MTM0NCBTRUdWIHdpdGggcG9ydGFs X2NvbnRleHQtPm93bmVyIGluIG5hbWVfb3duZXJfY2hhbmdlZCgpCiBNYXliZSBnX29iamVjdF91 bnJlZigpIGlzIGNhbGxlZCBidXQgbm90IGZpbmFsaXplZCB5ZXQuCiAKQEAgLTQ4LDcgKzQ1LDYg QEAgQlVHPXJoYnojMTY2MzUyOAogQlVHPXJoYnojMTc5NTQ5OQogQlVHPXJoYnojMTc3MTIzOAog QlVHPXJoYnojMTc2Nzk3NgotQlVHPXJoYnojMTc5NzEyMAogQlVHPXJoYnojMjE1MTM0NAogQlVH PXJoYnojMjE5NTg5NQogQlVHPXJoYnojMjIzOTYzMwpAQCAtNTksOSArNTUsOCBAQCBCVUc9cmhi eiMyMjM5NjMzCiAgY2xpZW50L3gxMS9tYWluLmMgICAgICB8IDQ5ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLQogIHBvcnRhbC9wb3J0YWwuYyAgICAgICAgfCAyNSAr KysrKysrKysrKysrKysrLS0tLS0KICBzcmMvaWJ1c2J1cy5jICAgICAgICAgIHwgIDYgKysrKysr Ci0gdWkvZ3RrMy9leHRlbnNpb24udmFsYSB8ICA0ICsrKysKICB1aS9ndGszL3N3aXRjaGVyLnZh bGEgIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KLSA4IGZp bGVzIGNoYW5nZWQsIDE4OCBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKKyA3IGZpbGVz IGNoYW5nZWQsIDE4OCBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKIAogZGlmZiAtLWdp dCBhL2J1cy9kYnVzaW1wbC5jIGIvYnVzL2RidXNpbXBsLmMKIGluZGV4IDcwNzkyYmU4Li45YzUz NWJmMiAxMDA2NDQKQEAgLTUwOCwyMSArNTAzLDYgQEAgaW5kZXggNTQwZDFkYTMuLmRlZmRiNzNi IDEwMDY0NAogICAgICAgICAgZ19vYmplY3RfdW5yZWYgKGJ1cy0+cHJpdi0+bW9uaXRvcik7CiAg ICAgICAgICBidXMtPnByaXYtPm1vbml0b3IgPSBOVUxMOwogICAgICB9Ci1kaWZmIC0tZ2l0IGEv dWkvZ3RrMy9leHRlbnNpb24udmFsYSBiL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEKLWluZGV4IDVj ZDFhNmFkLi4zYWNkNzZlYSAxMDA2NDQKLS0tLSBhL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEKLSsr KyBiL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEKLUBAIC03Myw2ICs3MywxMCBAQCBjbGFzcyBFeHRl bnNpb25HdGsgOiBHdGsuQXBwbGljYXRpb24gewotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3RyaW5nICAgICAgICAgc2lnbmFsX25hbWUsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBWYXJpYW50ICAgICAgICBwYXJhbWV0ZXJzKSB7Ci0gICAg ICAgICBkZWJ1Zygic2lnbmFsX25hbWUgPSAlcyIsIHNpZ25hbF9uYW1lKTsKLSsgICAgICAgIC8q IHJoYnojMTc5NzEyMCBGaXggYXNzZXJ0KGJ1cy5pc19jb25uZWN0ZWQoKSkgaW4KLSsgICAgICAg ICAqIHBhbmVsX2JpbmRpbmdfY29uc3RydWN0KCkKLSsgICAgICAgICAqLwotKyAgICAgICAgcmV0 dXJuX2lmX2ZhaWwobV9idXMuaXNfY29ubmVjdGVkKCkpOwotICAgICAgICAgbV9wYW5lbCA9IG5l dyBQYW5lbEJpbmRpbmcobV9idXMsIHRoaXMpOwotICAgICAgICAgbV9wYW5lbC5sb2FkX3NldHRp bmdzKCk7Ci0gICAgIH0KIGRpZmYgLS1naXQgYS91aS9ndGszL3N3aXRjaGVyLnZhbGEgYi91aS9n dGszL3N3aXRjaGVyLnZhbGEKIGluZGV4IGQ0YTVmYTExLi43ODhlZWEwNiAxMDA2NDQKIC0tLSBh L3VpL2d0azMvc3dpdGNoZXIudmFsYQoKZGlmZiAtLWdpdCBhL2lidXMtSEVBRC5wYXRjaCBiL2li dXMtSEVBRC5wYXRjaAppbmRleCAzZmQyYjMyLi40YjJhZjE1IDEwMDY0NAotLS0gYS9pYnVzLUhF QUQucGF0Y2gKKysrIGIvaWJ1cy1IRUFELnBhdGNoCkBAIC0yNjI4LDMgKzI2MjgsNzQzIEBAIGlu ZGV4IDAwMDAwMDAwLi43MWY1MzBkYQogLS0gCiAyLjUyLjAKIAorRnJvbSBkNzdkNjk5ODAwMTU1 N2M4MGM0YWMwYTFlZWMzMWYwYTE4YWNmZDY1IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJv bTogRGF2aWQgRWRtdW5kc29uIDxrZGVAZGF2aWRlZG11bmRzb24uY28udWs+CitEYXRlOiBUaHUs IDggSmFuIDIwMjYgMjM6MTA6MTYgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gY2xpZW50L3dheWxh bmQ6IENvbm5lY3QgZGVsZXRlIHN1cnJvdW5kaW5nIHRleHQKKworVGhpcyB3YXNuJ3QgaG9va2Vk IHVwIGluIHRoZSB3YXlsYW5kIGJyaWRnZSBsZWFkaW5nIHRvIHR5cGluZyBub3QKK3dvcmtpbmcg Y29ycmVjdGx5IHdoZW4gdGhlIGJhY2tlbmQgcmVsaWVzIG9uIGl0LgorCitBcyB3ZWxsIGFzIGJy aWRnaW5nIHdlIG5lZWQgdG8gdHJhbnNsYXRlIHRoZSBvZmZzZXQgaW4gbnVtYmVyIG9mIHVuaWNv ZGUKK2NoYXJhY3RlcnMgaW50byBhIG51bWJlciBvZiBieXRlcyBmb3IgdGhlIHdheWxhbmQgd2ly ZSBmb3JtYXQuIFRoZSBsb2dpYworZm9yIHRoaXMgdHJhbnNsYXRpb24gaXMgaW5zcGlyZWQgYnkg aG93IGl0IHdvcmtzIGluIE11dHRlciB3aGljaAorY29udmVydHMgSUJ1cy0+VGV4dElucHV0IGRp cmVjdGx5LgorCitOb3RlIHRoYXQgSW5wdXRNZXRob2RWMSB0YWtlcyBhbiBvZmZzZXQgKyBsZW5n dGgsIHdoZXJlYXMgVjIgaGFzIGEKK2xlbmd0aCBiZWZvcmUgYW5kIGFmdGVyLgorCitCVUc9aHR0 cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9wdWxsLzI4MzAKKy0tLQorIGNsaWVudC93YXlsYW5k L2lidXN3YXlsYW5kaW0uYyB8IDg4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0K KyAxIGZpbGUgY2hhbmdlZCwgODYgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlm ZiAtLWdpdCBhL2NsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0uYyBiL2NsaWVudC93YXlsYW5k L2lidXN3YXlsYW5kaW0uYworaW5kZXggMmQ5ZjgyMmUuLjY1ODBiOGE0IDEwMDY0NAorLS0tIGEv Y2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCisrKysgYi9jbGllbnQvd2F5bGFuZC9pYnVz d2F5bGFuZGltLmMKK0BAIC0xMjQsNiArMTI0LDExIEBAIHN0cnVjdCBfSUJ1c1dheWxhbmRJTVBy aXZhdGUKKyAgICAgZ3VpbnQgcHJlZWRpdF9tb2RlOworICAgICBJQnVzTW9kaWZpZXJUeXBlIG1v ZGlmaWVyczsKKyAKKysjaWYgRU5BQkxFX1NVUlJPVU5ESU5HCisrICAgIElCdXNUZXh0ICpzdXJy b3VuZGluZ190ZXh0OworKyAgICBndWludCBzdXJyb3VuZGluZ19jdXJzb3JfcG9zOworKyNlbmRp ZgorKworICAgICBzdHJ1Y3QgeGtiX2NvbnRleHQgKnhrYl9jb250ZXh0OworIAorICAgICBzdHJ1 Y3QgeGtiX2tleW1hcCAqa2V5bWFwOworQEAgLTYxNiw2ICs2MjEsNyBAQCBpYnVzX3dheWxhbmRf aW1fdXBkYXRlX3ByZWVkaXRfc3R5bGUgKElCdXNXYXlsYW5kSU0gKndsaW0pCisgICAgIH0KKyB9 CisgCisrCisgc3RhdGljIHZvaWQKKyBfY29udGV4dF9zaG93X3ByZWVkaXRfdGV4dF9jYiAoSUJ1 c0lucHV0Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg SUJ1c1dheWxhbmRJTSAgICAqd2xpbSkKK0BAIC03MDYsNiArNzEyLDYxIEBAIF9jb250ZXh0X3Vw ZGF0ZV9wcmVlZGl0X3RleHRfY2IgKElCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisgfQorIAor IAorKyNpZiBFTkFCTEVfU1VSUk9VTkRJTkcKKytzdGF0aWMgdm9pZAorK19jb250ZXh0X2RlbGV0 ZV9zdXJyb3VuZGluZ190ZXh0X2NiIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaW50ICAgICAgICAgICAgICBvZmZzZXQs CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50ICAgICAgICAgICAg IG5jaGFycywKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSUJ1c1dheWxh bmRJTSAgICAqd2xpbSkKKyt7CisrICAgIElCdXNXYXlsYW5kSU1Qcml2YXRlICpwcml2OworKyAg ICBjb25zdCBjaGFyICpzdGFydCwgKmVuZDsKKysgICAgY29uc3QgY2hhciAqYmVmb3JlLCAqYWZ0 ZXI7CisrICAgIGNvbnN0IGNoYXIgKmN1cnNvcjsKKysgICAgdWludDMyX3QgYmVmb3JlX2xlbmd0 aDsKKysgICAgdWludDMyX3QgYWZ0ZXJfbGVuZ3RoOworKworKyAgICBnX3JldHVybl9pZl9mYWls IChJQlVTX0lTX1dBWUxBTkRfSU0gKHdsaW0pKTsKKysgICAgcHJpdiA9IGlidXNfd2F5bGFuZF9p bV9nZXRfaW5zdGFuY2VfcHJpdmF0ZSAod2xpbSk7CisrCisrICAgIGlmICghcHJpdi0+c3Vycm91 bmRpbmdfdGV4dCkKKysgICAgICAgIHJldHVybjsKKysKKysgICAgb2Zmc2V0ID0gTUlOIChvZmZz ZXQsIDApOworKworKyAgICBzdGFydCA9IHByaXYtPnN1cnJvdW5kaW5nX3RleHQtPnRleHQ7Cisr ICAgIGVuZCA9IHN0YXJ0ICsgc3RybGVuIChwcml2LT5zdXJyb3VuZGluZ190ZXh0LT50ZXh0KTsK KysgICAgY3Vyc29yID0gc3RhcnQgKyBwcml2LT5zdXJyb3VuZGluZ19jdXJzb3JfcG9zOworKwor KyAgICBiZWZvcmUgPSBnX3V0Zjhfb2Zmc2V0X3RvX3BvaW50ZXIgKGN1cnNvciwgb2Zmc2V0KTsK KysgICAgZ19yZXR1cm5faWZfZmFpbCAoYmVmb3JlID49IHN0YXJ0KTsKKysgICAgYWZ0ZXIgPSBn X3V0Zjhfb2Zmc2V0X3RvX3BvaW50ZXIgKGN1cnNvciwgb2Zmc2V0ICsgbmNoYXJzKTsKKysgICAg Z19yZXR1cm5faWZfZmFpbCAoYWZ0ZXIgPD0gZW5kKTsKKysKKysgICAgYmVmb3JlX2xlbmd0aCA9 IGN1cnNvciAtIGJlZm9yZTsKKysgICAgYWZ0ZXJfbGVuZ3RoID0gYWZ0ZXIgLSBjdXJzb3I7Cisr CisrICAgIHN3aXRjaCAocHJpdi0+dmVyc2lvbikgeworKyAgICBjYXNlIElOUFVUX01FVEhPRF9W MToKKysgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfY29udGV4dF92MV9kZWxldGVfc3Vycm91bmRp bmdfdGV4dCAoCisrICAgICAgICAgICAgICAgIHByaXYtPmNvbnRleHQsCisrICAgICAgICAgICAg ICAgIC1iZWZvcmVfbGVuZ3RoLAorKyAgICAgICAgICAgICAgICBiZWZvcmVfbGVuZ3RoICsgYWZ0 ZXJfbGVuZ3RoKTsKKysgICAgICAgIGJyZWFrOworKyAgICBjYXNlIElOUFVUX01FVEhPRF9WMjoK KysgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfdjJfZGVsZXRlX3N1cnJvdW5kaW5nX3RleHQgKAor KyAgICAgICAgICAgICAgICBwcml2LT5zZWF0LT5pbnB1dF9tZXRob2RfdjIsCisrICAgICAgICAg ICAgICAgIGJlZm9yZV9sZW5ndGgsCisrICAgICAgICAgICAgICAgIGFmdGVyX2xlbmd0aCk7Cisr ICAgICAgICB6d3BfaW5wdXRfbWV0aG9kX3YyX2NvbW1pdCAocHJpdi0+c2VhdC0+aW5wdXRfbWV0 aG9kX3YyLCBwcml2LT5zZXJpYWwpOworKyAgICAgICAgYnJlYWs7CisrICAgIGRlZmF1bHQ6Cisr ICAgICAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCAoKTsKKysgICAgfQorK30KKysjZW5kaWYKKysK KysKKyBzdGF0aWMgdm9pZAorIGhhbmRsZV9zdXJyb3VuZGluZ190ZXh0ICh2b2lkICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICpkYXRhLAorICAgICAgICAgICAgICAgICAgICAgICAg ICBzdHJ1Y3QgendwX2lucHV0X21ldGhvZF9jb250ZXh0X3VuaW9uICpjb250ZXh0LAorQEAgLTcx NiwxNSArNzc3LDIzIEBAIGhhbmRsZV9zdXJyb3VuZGluZ190ZXh0ICh2b2lkICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICpkYXRhLAorICNpZiBFTkFCTEVfU1VSUk9VTkRJTkcKKyAg ICAgSUJ1c1dheWxhbmRJTSAqd2xpbSA9IGRhdGE7CisgICAgIElCdXNXYXlsYW5kSU1Qcml2YXRl ICpwcml2OworKyAgICBJQnVzVGV4dCAqaWJ1c3RleHQ7CisgCisgICAgIGdfcmV0dXJuX2lmX2Zh aWwgKElCVVNfSVNfV0FZTEFORF9JTSAod2xpbSkpOworICAgICBwcml2ID0gaWJ1c193YXlsYW5k X2ltX2dldF9pbnN0YW5jZV9wcml2YXRlICh3bGltKTsKKysKKysgICAgaWJ1c3RleHQgPSBpYnVz X3RleHRfbmV3X2Zyb21fc3RyaW5nICh0ZXh0KTsKKysKKysgICAgaWYgKHByaXYtPnN1cnJvdW5k aW5nX3RleHQpCisrICAgICAgICBnX29iamVjdF91bnJlZiAocHJpdi0+c3Vycm91bmRpbmdfdGV4 dCk7CisrICAgIHByaXYtPnN1cnJvdW5kaW5nX3RleHQgPSBnX29iamVjdF9yZWZfc2luayAoaWJ1 c3RleHQpOworKyAgICBwcml2LT5zdXJyb3VuZGluZ19jdXJzb3JfcG9zID0gY3Vyc29yOworKwor ICAgICBpZiAocHJpdi0+aWJ1c2NvbnRleHQgIT0gTlVMTCAmJgorICAgICAgICAgaWJ1c19pbnB1 dF9jb250ZXh0X25lZWRzX3N1cnJvdW5kaW5nX3RleHQgKHByaXYtPmlidXNjb250ZXh0KSkgewor ICAgICAgICAgLyogQ1VSU09SX1BPUyBhbmQgQU5DSE9SX1BPUyBhcmUgY2hhcmFjdGVyIG9mZnNl dC4gICovCisgICAgICAgICBndWludCBjdXJzb3JfcG9zID0gZ191dGY4X3BvaW50ZXJfdG9fb2Zm c2V0ICh0ZXh0LCB0ZXh0ICsgY3Vyc29yKTsKKyAgICAgICAgIGd1aW50IGFuY2hvcl9wb3MgPSBn X3V0ZjhfcG9pbnRlcl90b19vZmZzZXQgKHRleHQsIHRleHQgKyBhbmNob3IpOworLSAgICAgICAg SUJ1c1RleHQgKmlidXN0ZXh0ID0gaWJ1c190ZXh0X25ld19mcm9tX3N0cmluZyAodGV4dCk7Cisg CisgICAgICAgICBpYnVzX2lucHV0X2NvbnRleHRfc2V0X3N1cnJvdW5kaW5nX3RleHQgKHByaXYt PmlidXNjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpYnVzdGV4dCwKK0BAIC0xNzYyLDggKzE4MzEsMTIgQEAgX2NyZWF0ZV9pbnB1dF9j b250ZXh0X2RvbmUgKEdPYmplY3QgICAgICAqb2JqZWN0LAorICAgICAgICAgZ19zaWduYWxfY29u bmVjdCAocHJpdi0+aWJ1c2NvbnRleHQsICJoaWRlLXByZWVkaXQtdGV4dCIsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICBHX0NBTExCQUNLIChfY29udGV4dF9oaWRlX3ByZWVkaXRfdGV4dF9j YiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICB3bGltKTsKKy0gICAgCisrCisgI2lmZGVm IEVOQUJMRV9TVVJST1VORElORworKyAgICAgICAgZ19zaWduYWxfY29ubmVjdCAocHJpdi0+aWJ1 c2NvbnRleHQsICJkZWxldGUtc3Vycm91bmRpbmctdGV4dCIsCisrICAgICAgICAgICAgICAgICAg ICAgICAgICBHX0NBTExCQUNLIChfY29udGV4dF9kZWxldGVfc3Vycm91bmRpbmdfdGV4dF9jYiks CisrICAgICAgICAgICAgICAgICAgICAgICAgICB3bGltKTsKKysKKyAgICAgICAgIGNhcGFiaWxp dGllcyB8PSBJQlVTX0NBUF9TVVJST1VORElOR19URVhUOworICNlbmRpZgorICAgICAgICAgaWYg KF91c2Vfc3luY19tb2RlID09IDEpCitAQCAtMTg4Miw3ICsxOTU1LDE0IEBAIGlucHV0X21ldGhv ZF9kZWFjdGl2YXRlICh2b2lkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpkYXRhLAor ICAgICAgICAgICAgICAgICBwcml2LT5pYnVzY29udGV4dCwKKyAgICAgICAgICAgICAgICAgR19D QUxMQkFDSyAoX2NvbnRleHRfaGlkZV9wcmVlZGl0X3RleHRfY2IpLAorICAgICAgICAgICAgICAg ICB3bGltKTsKKysjaWZkZWYgRU5BQkxFX1NVUlJPVU5ESU5HCisrICAgICAgICBnX3NpZ25hbF9o YW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMgKAorKyAgICAgICAgICAgICAgICBwcml2LT5pYnVz Y29udGV4dCwKKysgICAgICAgICAgICAgICAgR19DQUxMQkFDSyAoX2NvbnRleHRfZGVsZXRlX3N1 cnJvdW5kaW5nX3RleHRfY2IpLAorKyAgICAgICAgICAgICAgICB3bGltKTsKKysjZW5kaWYKKyAg ICAgICAgIGdfY2xlYXJfb2JqZWN0ICgmcHJpdi0+aWJ1c2NvbnRleHQpOworKworICAgICAgICAg Z19zaWduYWxfZW1pdCAod2xpbSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHdheWxhbmRfaW1f c2lnbmFsc1tJQlVTX0ZPQ1VTX09VVF0sCisgICAgICAgICAgICAgICAgICAgICAgICAwLAorQEAg LTE4OTIsNiArMTk3MiwxMCBAQCBpbnB1dF9tZXRob2RfZGVhY3RpdmF0ZSAodm9pZCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAqZGF0YSwKKyAKKyAgICAgaWYgKHByaXYtPnByZWVkaXRf dGV4dCkKKyAgICAgICAgIGdfY2xlYXJfb2JqZWN0ICgmcHJpdi0+cHJlZWRpdF90ZXh0KTsKKysj aWYgRU5BQkxFX1NVUlJPVU5ESU5HCisrICAgIGlmIChwcml2LT5zdXJyb3VuZGluZ190ZXh0KQor KyAgICAgICAgZ19jbGVhcl9vYmplY3QgKCZwcml2LT5zdXJyb3VuZGluZ190ZXh0KTsKKysjZW5k aWYKKyAKKyAgICAgc3dpdGNoIChwcml2LT52ZXJzaW9uKSB7CisgICAgIGNhc2UgSU5QVVRfTUVU SE9EX1YxOgorLS0gCisyLjUyLjAKKworRnJvbSA2OTYyNjExMDhjODgzMGUxZTMwMzI3YTBhNDdj ZmIzMGJhNWRhN2QxIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0 YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogRnJpLCAyNiBEZWMgMjAyNSAxMDoxNToz MCArMDkwMAorU3ViamVjdDogW1BBVENIXSBjbGllbnQvd2F5bGFuZDogRml4IEJhY2tzcGFjZSBh ZnRlciBjb21taXQtdGV4dCBpbiBHaG9zdHR5CisKK0dob3N0dHkgcmVxdWlyZXMgdG8gaGlkZSB0 aGUgcHJlZWRpdC10ZXh0IHRvIHJlY292ZXIgdG8gY29tbWl0IHRoZQorY29udHJvbCBjaGFyYWN0 ZXJzLiBHdGtJTUNvbnRleHRXYXlsYW5kIGNhbiBlbWl0IHRoZSAncHJlZWRpdC1lbmQnCitzaWdu YWwgaW4gY2FzZSB6d3BfdGV4dF9pbnB1dF92M19saXN0ZW5lci5kb25lIGlzIGVtaXR0ZWQuCitV bmZvcnR1bmF0ZWx5IHp3cF9pbnB1dF9tZXRob2RfdjJfc2V0X3ByZWVkaXRfc3RyaW5nKCkgZG9l cyBub3Qgc3VwcG9ydAordG8gc2VuZCBhICVOVUxMIHN0cmluZyB3aGlsZSB6d3BfdGV4dF9pbnB1 dF92M19saXN0ZW5lci5wcmVlZGl0X3N0cmluZygpCisqZG9lcyogc3VwcG9ydCBhICVOVUxMIHN0 cmluZy4KK1RvIG1ha2Ugc3VyZSB0aGUgaGlkaW5nIHByZWVkaXQtdGV4dCwgaWJ1cy13YXlsYW5k IGNhbGxzCit6d3BfaW5wdXRfbWV0aG9kX3YyX2NvbW1pdCgpIGFmdGVyIHRoZSBpbV9zZXJpYWwg aXMgdXBkYXRlZC4KKworQlVHPWh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvaXNzdWVzLzI4 MTkKKy0tLQorIGNsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0uYyB8IDkxICsrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0KKyAxIGZpbGUgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygr KSwgMzQgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9jbGllbnQvd2F5bGFuZC9pYnVzd2F5 bGFuZGltLmMgYi9jbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMKK2luZGV4IDJkOWY4MjJl Li5iY2UwNTBkNCAxMDA2NDQKKy0tLSBhL2NsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0uYwor KysrIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCitAQCAtMTIzLDYgKzEyMyw3IEBA IHN0cnVjdCBfSUJ1c1dheWxhbmRJTVByaXZhdGUKKyAgICAgZ3VpbnQgcHJlZWRpdF9jdXJzb3Jf cG9zOworICAgICBndWludCBwcmVlZGl0X21vZGU7CisgICAgIElCdXNNb2RpZmllclR5cGUgbW9k aWZpZXJzOworKyAgICBnYm9vbGVhbiBoaWRpbmdfcHJlZWRpdF90ZXh0OworIAorICNpZiBFTkFC TEVfU1VSUk9VTkRJTkcKKyAgICAgSUJ1c1RleHQgKnN1cnJvdW5kaW5nX3RleHQ7CitAQCAtMTQ3 LDcgKzE0OCw3IEBAIHN0cnVjdCBfSUJ1c1dheWxhbmRJTVByaXZhdGUKKyAgICAgeGtiX21vZF9t YXNrX3QgaHlwZXJfbWFzazsKKyAgICAgeGtiX21vZF9tYXNrX3QgbWV0YV9tYXNrOworIAorLSAg ICB1aW50MzJfdCBzZXJpYWw7CisrICAgIHVpbnQzMl90IGltX3NlcmlhbDsKKyAgICAgaW50MzJf dCByZXBlYXRfcmF0ZTsKKyAgICAgaW50MzJfdCByZXBlYXRfZGVsYXk7CisgCitAQCAtMTU3LDcg KzE1OCw3IEBAIHN0cnVjdCBfSUJ1c1dheWxhbmRJTVByaXZhdGUKKyBzdHJ1Y3QgX0lCdXNXYXls YW5kS2V5RXZlbnQKKyB7CisgICAgIHN0cnVjdCB6d3BfaW5wdXRfbWV0aG9kX2NvbnRleHRfdjEg KmNvbnRleHQ7CistICAgIHVpbnQzMl90IHNlcmlhbDsKKysgICAgdWludDMyX3Qga2V5X3Nlcmlh bDsKKyAgICAgdWludDMyX3QgdGltZTsKKyAgICAgdWludDMyX3Qga2V5OworICAgICBlbnVtIHds X2tleWJvYXJkX2tleV9zdGF0ZSBzdGF0ZTsKK0BAIC0zMjQsMTIgKzMyNSwxMyBAQCBpYnVzX3dh eWxhbmRfaW1fY29tbWl0X3RleHQgKElCdXNXYXlsYW5kSU0gKndsaW0sCisgICAgIHN3aXRjaCAo cHJpdi0+dmVyc2lvbikgeworICAgICBjYXNlIElOUFVUX01FVEhPRF9WMToKKyAgICAgICAgIHp3 cF9pbnB1dF9tZXRob2RfY29udGV4dF92MV9jb21taXRfc3RyaW5nIChwcml2LT5jb250ZXh0LAor LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaXYt PnNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcml2LT5pbV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RyKTsKKyAgICAgICAgIGJyZWFrOworICAgICBjYXNlIElOUFVU X01FVEhPRF9WMjoKKyAgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfdjJfY29tbWl0X3N0cmluZyAo cHJpdi0+c2VhdC0+aW5wdXRfbWV0aG9kX3YyLCBzdHIpOworLSAgICAgICAgendwX2lucHV0X21l dGhvZF92Ml9jb21taXQgKHByaXYtPnNlYXQtPmlucHV0X21ldGhvZF92MiwgcHJpdi0+c2VyaWFs KTsKKysgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfdjJfY29tbWl0IChwcml2LT5zZWF0LT5pbnB1 dF9tZXRob2RfdjIsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpdi0+ aW1fc2VyaWFsKTsKKyAgICAgICAgIGJyZWFrOworICAgICBkZWZhdWx0OgorICAgICAgICAgZ19h c3NlcnRfbm90X3JlYWNoZWQgKCk7CitAQCAtMzM5LDcgKzM0MSw3IEBAIGlidXNfd2F5bGFuZF9p bV9jb21taXRfdGV4dCAoSUJ1c1dheWxhbmRJTSAqd2xpbSwKKyAKKyBzdGF0aWMgdm9pZAorIGli dXNfd2F5bGFuZF9pbV9rZXkgKElCdXNXYXlsYW5kSU0gKndsaW0sCistICAgICAgICAgICAgICAg ICAgICAgdWludDMyX3QgICAgICAgc2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgIHVpbnQz Ml90ICAgICAgIGtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAg ICAgdGltZSwKKyAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAgICAgICBrZXksCisgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgc3RhdGUpCitAQCAtMzUwLDcgKzM1Miw3 IEBAIGlidXNfd2F5bGFuZF9pbV9rZXkgKElCdXNXYXlsYW5kSU0gKndsaW0sCisgICAgIHN3aXRj aCAocHJpdi0+dmVyc2lvbikgeworICAgICBjYXNlIElOUFVUX01FVEhPRF9WMToKKyAgICAgICAg IHp3cF9pbnB1dF9tZXRob2RfY29udGV4dF92MV9rZXkgKHByaXYtPmNvbnRleHQsCistICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXJpYWwsCisrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXlfc2VyaWFsLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGtleSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0YXRlKTsKK0BAIC0zNjcsNyArMzY5LDcgQEAgaWJ1c193YXlsYW5kX2ltX2tl eSAoSUJ1c1dheWxhbmRJTSAqd2xpbSwKKyAKKyBzdGF0aWMgdm9pZAorIGlidXNfd2F5bGFuZF9p bV9rZXlzeW0gKElCdXNXYXlsYW5kSU0gKndsaW0sCistICAgICAgICAgICAgICAgICAgICAgICAg dWludDMyX3QgICAgICAgc2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90 ICAgICAgIGltX3NlcmlhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICAgICAg ICBrZXl2YWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgc3RhdGUs CisgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQgICAgICAgICAgbW9kaWZpZXJzKQorQEAg LTM3OCw3ICszODAsNyBAQCBpYnVzX3dheWxhbmRfaW1fa2V5c3ltIChJQnVzV2F5bGFuZElNICp3 bGltLAorICAgICBzd2l0Y2ggKHByaXYtPnZlcnNpb24pIHsKKyAgICAgY2FzZSBJTlBVVF9NRVRI T0RfVjE6CisgICAgICAgICB6d3BfaW5wdXRfbWV0aG9kX2NvbnRleHRfdjFfa2V5c3ltIChwcml2 LT5jb250ZXh0LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW1f c2VyaWFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleXZhbCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLAorQEAgLTQy MCw3ICs0MjIsNyBAQCBfY29udGV4dF9mb3J3YXJkX2tleV9ldmVudF9jYiAoSUJ1c0lucHV0Q29u dGV4dCAqY29udGV4dCwKKyAgICAgICAgIHN0YXRlID0gV0xfS0VZQk9BUkRfS0VZX1NUQVRFX1BS RVNTRUQ7CisgCisgICAgIGlidXNfd2F5bGFuZF9pbV9rZXlzeW0gKHdsaW0sCistICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHByaXYtPnNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcHJpdi0+aW1fc2VyaWFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXl2 YWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtb2RpZmllcnMpOworQEAgLTY0NSw3ICs2NDcsNyBAQCBfY29udGV4dF9z aG93X3ByZWVkaXRfdGV4dF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vyc29yKTsKKyAg ICAgICAgIGlidXNfd2F5bGFuZF9pbV91cGRhdGVfcHJlZWRpdF9zdHlsZSAod2xpbSk7CisgICAg ICAgICB6d3BfaW5wdXRfbWV0aG9kX2NvbnRleHRfdjFfcHJlZWRpdF9zdHJpbmcgKHByaXYtPmNv bnRleHQsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHByaXYtPnNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcHJpdi0+aW1fc2VyaWFsLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcml2LT5wcmVlZGl0X3RleHQtPnRleHQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1p dCk7CisgICAgICAgICBicmVhazsKK0BAIC02NTUsNyArNjU3LDkgQEAgX2NvbnRleHRfc2hvd19w cmVlZGl0X3RleHRfY2IgKElCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisgICAgICAgICAgICAg ICAgIHByaXYtPnByZWVkaXRfdGV4dC0+dGV4dCwKKyAgICAgICAgICAgICAgICAgY3Vyc29yLAor ICAgICAgICAgICAgICAgICBzdHJsZW4gKHByaXYtPnByZWVkaXRfdGV4dC0+dGV4dCkpOworLSAg ICAgICAgendwX2lucHV0X21ldGhvZF92Ml9jb21taXQgKHByaXYtPnNlYXQtPmlucHV0X21ldGhv ZF92MiwgcHJpdi0+c2VyaWFsKTsKKysgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfdjJfY29tbWl0 IChwcml2LT5zZWF0LT5pbnB1dF9tZXRob2RfdjIsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcHJpdi0+aW1fc2VyaWFsKTsKKysgICAgICAgIHByaXYtPmhpZGluZ19wcmVl ZGl0X3RleHQgPSBGQUxTRTsKKyAgICAgICAgIGJyZWFrOworICAgICBkZWZhdWx0OgorICAgICAg ICAgZ19hc3NlcnRfbm90X3JlYWNoZWQgKCk7CitAQCAtNjczLDE0ICs2NzcsMTYgQEAgX2NvbnRl eHRfaGlkZV9wcmVlZGl0X3RleHRfY2IgKElCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisgICAg IHN3aXRjaCAocHJpdi0+dmVyc2lvbikgeworICAgICBjYXNlIElOUFVUX01FVEhPRF9WMToKKyAg ICAgICAgIHp3cF9pbnB1dF9tZXRob2RfY29udGV4dF92MV9wcmVlZGl0X3N0cmluZyAocHJpdi0+ Y29udGV4dCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcHJpdi0+c2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwcml2LT5pbV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIiLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIik7CisgICAgICAgICBicmVhazsKKyAg ICAgY2FzZSBJTlBVVF9NRVRIT0RfVjI6CisgICAgICAgICB6d3BfaW5wdXRfbWV0aG9kX3YyX3Nl dF9wcmVlZGl0X3N0cmluZyAgKHByaXYtPnNlYXQtPmlucHV0X21ldGhvZF92MiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiIsIDAsIDApOworLSAg ICAgICAgendwX2lucHV0X21ldGhvZF92Ml9jb21taXQgKHByaXYtPnNlYXQtPmlucHV0X21ldGhv ZF92MiwgcHJpdi0+c2VyaWFsKTsKKysgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfdjJfY29tbWl0 IChwcml2LT5zZWF0LT5pbnB1dF9tZXRob2RfdjIsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcHJpdi0+aW1fc2VyaWFsKTsKKysgICAgICAgIHByaXYtPmhpZGluZ19wcmVl ZGl0X3RleHQgPSBUUlVFOworICAgICAgICAgYnJlYWs7CisgICAgIGRlZmF1bHQ6CisgICAgICAg ICBnX2Fzc2VydF9ub3RfcmVhY2hlZCAoKTsKK0BAIC03NTgsNyArNzY0LDggQEAgX2NvbnRleHRf ZGVsZXRlX3N1cnJvdW5kaW5nX3RleHRfY2IgKElCdQorICAgICAgICAgICAgICAgICBwcml2LT5z ZWF0LT5pbnB1dF9tZXRob2RfdjIsCisgICAgICAgICAgICAgICAgIGJlZm9yZV9sZW5ndGgsCisg ICAgICAgICAgICAgICAgIGFmdGVyX2xlbmd0aCk7CistICAgICAgICB6d3BfaW5wdXRfbWV0aG9k X3YyX2NvbW1pdCAocHJpdi0+c2VhdC0+aW5wdXRfbWV0aG9kX3YyLCBwcml2LT5zZXJpYWwpOwor KyAgICAgICAgendwX2lucHV0X21ldGhvZF92Ml9jb21taXQgKHByaXYtPnNlYXQtPmlucHV0X21l dGhvZF92MiwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcml2LT5pbV9z ZXJpYWwpOworICAgICAgICAgYnJlYWs7CisgICAgIGRlZmF1bHQ6CisgICAgICAgICBnX2Fzc2Vy dF9ub3RfcmVhY2hlZCAoKTsKK0BAIC04NTEsNyArODU4LDcgQEAgY29udGV4dF9jb21taXRfc3Rh dGVfdjEgKHZvaWQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKmRhdGEsCisgICAgIElC dXNXYXlsYW5kSU1Qcml2YXRlICpwcml2OworICAgICBnX3JldHVybl9pZl9mYWlsIChJQlVTX0lT X1dBWUxBTkRfSU0gKHdsaW0pKTsKKyAgICAgcHJpdiA9IGlidXNfd2F5bGFuZF9pbV9nZXRfaW5z dGFuY2VfcHJpdmF0ZSAod2xpbSk7CistICAgIHByaXYtPnNlcmlhbCA9IHNlcmlhbDsKKysgICAg cHJpdi0+aW1fc2VyaWFsID0gc2VyaWFsOworIH0KKyAKKyAKK0BAIC0xMTUxLDcgKzExNTgsNyBA QCBfcHJvY2Vzc19rZXlfZXZlbnRfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCisgICAgIC8q IENoZWNrIHJldHJhbCBmcm9tIGlidXNfd2F5bGFuZF9pbV9wb3N0X2tleSgpICovCisgICAgIGlm IChwcml2LT5pYnVzY29udGV4dCAmJiAhcmV0dmFsKSB7CisgICAgICAgICBpYnVzX3dheWxhbmRf aW1fa2V5IChldmVudC0+d2xpbSwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50 LT5zZXJpYWwsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudC0+a2V5X3Nlcmlh bCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LT50aW1lLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXZlbnQtPmtleSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGV2ZW50LT5zdGF0ZSk7CitAQCAtMTIzNCw3ICsxMjQxLDcgQEAgX3Byb2Nlc3Nfa2V5 X2V2ZW50X3N5bmMgKElCdXNXYXlsYW5kSU0gICAgICAgKndsaW0sCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dmFsKTsKKyAgICAgaWYgKCFyZXR2YWwpIHsKKyAg ICAgICAgIGlidXNfd2F5bGFuZF9pbV9rZXkgKHdsaW0sCistICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBldmVudC0+c2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZl bnQtPmtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudC0+dGlt ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LT5rZXksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBldmVudC0+c3RhdGUpOworQEAgLTEyNjQsNyArMTI3MSw3IEBA IF9wcm9jZXNzX2tleV9ldmVudF9hc3luYyAoSUJ1c1dheWxhbmRJTSAgICAgICAqd2xpbSwKKyAg ICAgICAgIHJldHVybjsKKyAgICAgfQorICAgICBhc3luY19ldmVudC0+Y29udGV4dCA9IHByaXYt PmNvbnRleHQ7CistICAgIGFzeW5jX2V2ZW50LT5zZXJpYWwgPSBldmVudC0+c2VyaWFsOworKyAg ICBhc3luY19ldmVudC0+a2V5X3NlcmlhbCA9IGV2ZW50LT5rZXlfc2VyaWFsOworICAgICBhc3lu Y19ldmVudC0+dGltZSA9IGV2ZW50LT50aW1lOworICAgICBhc3luY19ldmVudC0+a2V5ID0gZXZl bnQtPmtleTsKKyAgICAgYXN5bmNfZXZlbnQtPm1vZGlmaWVycyA9IGV2ZW50LT5tb2RpZmllcnMg JiB+SUJVU19SRUxFQVNFX01BU0s7CitAQCAtMTMzNiw3ICsxMzQzLDcgQEAgX3Byb2Nlc3Nfa2V5 X2V2ZW50X2h5YnJpZF9hc3luYyAoSUJ1c1dheWxhbmRJTSAgICAgICAqd2xpbSwKKyAgICAgfQor ICAgICBpZiAocHJpdi0+aWJ1c2NvbnRleHQgJiYgIWFzeW5jX2V2ZW50LT5yZXR2YWwpIHsKKyAg ICAgICAgIGlidXNfd2F5bGFuZF9pbV9rZXkgKHdsaW0sCistICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBldmVudC0+c2VyaWFsLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZl bnQtPmtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudC0+dGlt ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LT5rZXksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBldmVudC0+c3RhdGUpOworQEAgLTE1MDYsNyArMTUxMyw3IEBA IGtleV9ldmVudF9jaGVja19yZXBlYXQgKElCdXNXYXlsYW5kSU0gICAgICAgKndsaW0sCisgc3Rh dGljIHZvaWQKKyBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfa2V5ICh2b2lkICAgICAgICAgICAgICAg ICAgICAgICpkYXRhLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCB6d3Bfa2V5 Ym9hcmRfdW5pb24gKmtleWJvYXJkLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQz Ml90ICAgICAgICAgICAgICAgICAgIHNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICB1aW50MzJfdCAgICAgICAgICAgICAgICAgICBrZXlfc2VyaWFsLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQzMl90ICAgICAgICAgICAgICAgICAgIHRpbWUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgICAgICAgICAgICAga2V5LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90ICAgICAgICAgICAgICAgICAgIHN0YXRlKQor QEAgLTE1MjgsMTEgKzE1MzUsMTEgQEAgaW5wdXRfbWV0aG9kX2tleWJvYXJkX2tleSAodm9pZCAg ICAgICAgICAgICAgICAgICAgICAqZGF0YSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZBTFNFKTsKKyAgICAgICAgIGlmICghcmV0dmFs KQorLSAgICAgICAgICAgIGlidXNfd2F5bGFuZF9pbV9rZXkgKHdsaW0sIHNlcmlhbCwgdGltZSwg a2V5LCBzdGF0ZSk7CisrICAgICAgICAgICAgaWJ1c193YXlsYW5kX2ltX2tleSAod2xpbSwga2V5 X3NlcmlhbCwgdGltZSwga2V5LCBzdGF0ZSk7CisgICAgICAgICByZXR1cm47CisgICAgIH0KKyAK Ky0gICAgZXZlbnQuc2VyaWFsID0gc2VyaWFsOworKyAgICBldmVudC5rZXlfc2VyaWFsID0ga2V5 X3NlcmlhbDsKKyAgICAgZXZlbnQudGltZSA9IHRpbWU7CisgICAgIGV2ZW50LmtleSA9IGtleTsK KyAgICAgZXZlbnQuc3RhdGUgPSBzdGF0ZTsKK0BAIC0xNTYzLDcgKzE1NzAsNyBAQCBpbnB1dF9t ZXRob2Rfa2V5Ym9hcmRfa2V5ICh2b2lkICAgICAgICAgICAgICAgICAgICAgICpkYXRhLAorIHN0 YXRpYyB2b2lkCisgaW5wdXRfbWV0aG9kX2tleWJvYXJkX21vZGlmaWVycyAodm9pZCAgICAgICAg ICAgICAgICAgICAgICAqZGF0YSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dHJ1Y3QgendwX2tleWJvYXJkX3VuaW9uICprZXlib2FyZCwKKy0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1aW50MzJfdCAgICAgICAgICAgICAgICAgICBzZXJpYWwsCisrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgICAgICAgICAgICAga2V5 X3NlcmlhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAgICAg ICAgICAgICAgICAgICBtb2RzX2RlcHJlc3NlZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1aW50MzJfdCAgICAgICAgICAgICAgICAgICBtb2RzX2xhdGNoZWQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgICAgICAgICAgICAgbW9k c19sb2NrZWQsCitAQCAtMTYwNyw3ICsxNjE0LDcgQEAgaW5wdXRfbWV0aG9kX2tleWJvYXJkX21v ZGlmaWVycyAodm9pZCAgICAgICAgICAgICAgICAgICAgICAqZGF0YSwKKyAKKyAgICAgc3dpdGNo IChwcml2LT52ZXJzaW9uKSB7CisgICAgIGNhc2UgSU5QVVRfTUVUSE9EX1YxOgorLSAgICAgICAg endwX2lucHV0X21ldGhvZF9jb250ZXh0X3YxX21vZGlmaWVycyAocHJpdi0+Y29udGV4dCwgc2Vy aWFsLAorKyAgICAgICAgendwX2lucHV0X21ldGhvZF9jb250ZXh0X3YxX21vZGlmaWVycyAocHJp di0+Y29udGV4dCwga2V5X3NlcmlhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1vZHNfZGVwcmVzc2VkLCBtb2RzX2xhdGNoZWQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb2RzX2xvY2tlZCwgZ3JvdXAp OworICAgICAgICAgYnJlYWs7CitAQCAtMTY1OSwyMSArMTY2NiwyMSBAQCBpbnB1dF9tZXRob2Rf a2V5Ym9hcmRfa2V5bWFwX3YxICh2b2lkICAgICAgICAgICAgICAgKmRhdGEsCisgc3RhdGljIHZv aWQKKyBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfa2V5X3YxICh2b2lkICAgICAgICAgICAgICAgKmRh dGEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IHdsX2tleWJvYXJkICpr ZXlib2FyZF92MSwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAgICAg ICAgICAgIHNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAg ICAgICAgICAgIGtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWlu dDMyX3QgICAgICAgICAgICB0aW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVp bnQzMl90ICAgICAgICAgICAga2V5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVp bnQzMl90ICAgICAgICAgICAgc3RhdGUpCisgeworICAgICBzdHJ1Y3QgendwX2tleWJvYXJkX3Vu aW9uIGtleWJvYXJkOworICAgICBrZXlib2FyZC51LmtleWJvYXJkX3YxID0ga2V5Ym9hcmRfdjE7 CistICAgIGlucHV0X21ldGhvZF9rZXlib2FyZF9rZXkgKGRhdGEsICZrZXlib2FyZCwgc2VyaWFs LCB0aW1lLCBrZXksIHN0YXRlKTsKKysgICAgaW5wdXRfbWV0aG9kX2tleWJvYXJkX2tleSAoZGF0 YSwgJmtleWJvYXJkLCBrZXlfc2VyaWFsLCB0aW1lLCBrZXksIHN0YXRlKTsKKyB9CisgCisgCisg c3RhdGljIHZvaWQKKyBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfbW9kaWZpZXJzX3YxICh2b2lkICAg ICAgICAgICAgICAgKmRhdGEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RydWN0IHdsX2tleWJvYXJkICprZXlib2FyZF92MSwKKy0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1aW50MzJfdCAgICAgICAgICAgIHNlcmlhbCwKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAgICAgICAgICAgIGtleV9zZXJpYWwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgICAgICAgICAgICBt b2RzX2RlcHJlc3NlZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50 MzJfdCAgICAgICAgICAgIG1vZHNfbGF0Y2hlZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1aW50MzJfdCAgICAgICAgICAgIG1vZHNfbG9ja2VkLAorQEAgLTE2ODMsNyAr MTY5MCw3IEBAIGlucHV0X21ldGhvZF9rZXlib2FyZF9tb2RpZmllcnNfdjEgKHZvaWQgICAgICAg ICAgICAgICAqZGF0YSwKKyAgICAga2V5Ym9hcmQudS5rZXlib2FyZF92MSA9IGtleWJvYXJkX3Yx OworICAgICBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfbW9kaWZpZXJzIChkYXRhLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAma2V5Ym9hcmQsCistICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNlcmlhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAga2V5X3NlcmlhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbW9kc19kZXByZXNzZWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1vZHNfbGF0Y2hlZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bW9kc19sb2NrZWQsCitAQCAtMTcyMSwxNCArMTcyOCwxNCBAQCBzdGF0aWMgdm9pZAorIGlucHV0 X21ldGhvZF9rZXlib2FyZF9rZXlfdjIgKHZvaWQgICAgKmRhdGEsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc3RydWN0IHp3cF9pbnB1dF9tZXRob2Rfa2V5Ym9hcmRfZ3JhYl92Mgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKmtleWJvYXJkX3YyLAorLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IHNlcmlhbCwKKysgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBrZXlfc2VyaWFsLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHVpbnQzMl90IHRpbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdWludDMyX3Qga2V5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQz Ml90IHN0YXRlKQorIHsKKyAgICAgc3RydWN0IHp3cF9rZXlib2FyZF91bmlvbiBrZXlib2FyZDsK KyAgICAga2V5Ym9hcmQudS5rZXlib2FyZF92MiA9IGtleWJvYXJkX3YyOworLSAgICBpbnB1dF9t ZXRob2Rfa2V5Ym9hcmRfa2V5IChkYXRhLCAma2V5Ym9hcmQsIHNlcmlhbCwgdGltZSwga2V5LCBz dGF0ZSk7CisrICAgIGlucHV0X21ldGhvZF9rZXlib2FyZF9rZXkgKGRhdGEsICZrZXlib2FyZCwg a2V5X3NlcmlhbCwgdGltZSwga2V5LCBzdGF0ZSk7CisgfQorIAorIAorQEAgLTE3MzYsNyArMTc0 Myw3IEBAIHN0YXRpYyB2b2lkCisgaW5wdXRfbWV0aG9kX2tleWJvYXJkX21vZGlmaWVyc192MiAo dm9pZCAgICAqZGF0YSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1 Y3QgendwX2lucHV0X21ldGhvZF9rZXlib2FyZF9ncmFiX3YyCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAqa2V5Ym9hcmRfdjIsCistICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdWludDMyX3Qgc2VyaWFsLAorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbW9kc19kZXByZXNzZWQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbW9kc19sYXRjaGVkLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IG1vZHNfbG9ja2VkLAorQEAg LTE3NDYsNyArMTc1Myw3IEBAIGlucHV0X21ldGhvZF9rZXlib2FyZF9tb2RpZmllcnNfdjIgKHZv aWQgICAgKmRhdGEsCisgICAgIGtleWJvYXJkLnUua2V5Ym9hcmRfdjIgPSBrZXlib2FyZF92MjsK KyAgICAgaW5wdXRfbWV0aG9kX2tleWJvYXJkX21vZGlmaWVycyAoZGF0YSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJmtleWJvYXJkLAorLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZXJpYWwsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGtleV9zZXJpYWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1vZHNfZGVwcmVzc2VkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtb2RzX2xhdGNoZWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1v ZHNfbG9ja2VkLAorQEAgLTE4NzUsNyArMTg4Miw3IEBAIGlucHV0X21ldGhvZF9hY3RpdmF0ZSAo dm9pZCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqZGF0YSwKKyAKKyAgICAgcHJpdi0+ Y29udGV4dCA9IGNvbnRleHQ7CisgICAgIGlmIChjb250ZXh0KQorLSAgICAgICAgcHJpdi0+c2Vy aWFsID0gMDsKKysgICAgICAgIHByaXYtPmltX3NlcmlhbCA9IDA7CisgCisgICAgIHN3aXRjaCAo cHJpdi0+dmVyc2lvbikgeworICAgICBjYXNlIElOUFVUX01FVEhPRF9WMToKK0BAIC0yMDg4LDkg KzIwOTUsMjYgQEAgaW5wdXRfbWV0aG9kX2RvbmVfdjIgKHZvaWQgICAgICAgICAgICAgICAgICAg ICAgICpkYXRhLAorIAorICAgICBnX3JldHVybl9pZl9mYWlsIChJQlVTX0lTX1dBWUxBTkRfSU0g KHdsaW0pKTsKKyAgICAgcHJpdiA9IGlidXNfd2F5bGFuZF9pbV9nZXRfaW5zdGFuY2VfcHJpdmF0 ZSAod2xpbSk7CistICAgIHByaXYtPnNlcmlhbCsrOworKyAgICBwcml2LT5pbV9zZXJpYWwrKzsK KyAgICAgaW5wdXRfbWV0aG9kLnUuaW5wdXRfbWV0aG9kX3YyID0gaW5wdXRfbWV0aG9kX3YyOwor IAorKyAgICAvKiBHaG9zdHR5IHJlcXVpcmVzIHRvIHJlY2VpdmUgdGhlICdpbV9wcmVlZGl0X2Vu ZCcgc2lnbmFsIHdpdGgKKysgICAgICogendwX2lucHV0X21ldGhvZF92Ml9zZXRfcHJlZWRpdF9z dHJpbmcoKSB0byByZWNvdmVyIHRoZSAnaW1fY29tbWl0JworKyAgICAgKiBzaWduYWwgYnV0IEd0 a0lNQ29udGV4dFdheWxhbmQ6OnRleHRfaW5wdXRfcHJlZWRpdF9hcHBseSgpIGNhbiBlbWl0Cisr ICAgICAqIHRoZSAncHJlZWRpdC1lbmQnIHNpZ25hbCBpbiBjYXNlIHRoYXQKKysgICAgICogR3Rr SU1Db250ZXh0V2F5bGFuZC0+Y3VycmVudF9wcmVlZGl0LnRleHQgaXMgJU5VTEwgYW5kIGl0IGhh cHBlbnMKKysgICAgICogaWYgendwX3RleHRfaW5wdXRfdjNfbGlzdGVuZXIuZG9uZSBpcyBlbWl0 dGVkLgorKyAgICAgKiBUbyBtYWtlIHN1cmUgendwX3RleHRfaW5wdXRfdjNfbGlzdGVuZXIuZG9u ZSwKKysgICAgICogendwX2lucHV0X21ldGhvZF92Ml9jb21taXQoKSBpcyBjYWxsZWQgYWZ0ZXIg dGhlIGltX3NlcmlhbCBpcyBidW1wZWQuCisrICAgICAqLworKyAgICBpZiAocHJpdi0+aGlkaW5n X3ByZWVkaXRfdGV4dCAmJgorKyAgICAgICAgIXByaXYtPnNlYXQtPnBlbmRpbmdfYWN0aXZhdGUg JiYKKysgICAgICAgIHByaXYtPnNlYXQtPmFjdGl2ZSkgeworKyAgICAgICAgendwX2lucHV0X21l dGhvZF92Ml9jb21taXQgKHByaXYtPnNlYXQtPmlucHV0X21ldGhvZF92MiwKKysgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwcml2LT5pbV9zZXJpYWwpOworKyAgICAgICAgcHJp di0+aGlkaW5nX3ByZWVkaXRfdGV4dCA9IEZBTFNFOworKyAgICB9CisrCisgICAgIGlmIChwcml2 LT5zZWF0LT5wZW5kaW5nX2FjdGl2YXRlICYmICFwcml2LT5zZWF0LT5hY3RpdmUpIHsKKyAgICAg ICAgIHByaXYtPnNlYXQtPmFjdGl2ZSA9IFRSVUU7CisgICAgICAgICBpbnB1dF9tZXRob2RfYWN0 aXZhdGUgKGRhdGEsICZpbnB1dF9tZXRob2QsIE5VTEwpOworQEAgLTIxNjksNyArMjE5Myw3IEBA IHJlZ2lzdHJ5X2hhbmRsZV9nbG9iYWwgKHZvaWQgICAgICAgICAgICAgICAqZGF0YSwKKyAgICAg ICAgICAgICAgICAgIGludGVyZmFjZSwgbmFtZSwgdmVyc2lvbik7CisgICAgICAgICBmZmx1c2gg KHByaXYtPmxvZyk7CisgICAgIH0KKy0gICAgcHJpdi0+c2VyaWFsID0gMDsKKysgICAgcHJpdi0+ aW1fc2VyaWFsID0gMDsKKyAgICAgaWYgKCFnX3N0cmNtcDAgKGludGVyZmFjZSwgendwX2lucHV0 X21ldGhvZF9tYW5hZ2VyX3YyX2ludGVyZmFjZS5uYW1lKSkgeworICAgICAgICAgcHJpdi0+dmVy c2lvbiA9IElOUFVUX01FVEhPRF9WMjsKKyAgICAgICAgIHByaXYtPmlucHV0X21ldGhvZF9tYW5h Z2VyX3YyID0KKy0tIAorMi41Mi4wCisKK0Zyb20gNjNiYmUwYjQzNDA4YTEzMDhiZTc5N2NmYWI3 OWM5ZDU0YmQxYzE0NCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8 dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFRodSwgOCBKYW4gMjAyNiAxOTo0ODoz NSArMDkwMAorU3ViamVjdDogW1BBVENIIDEvMl0gdWkvZ3RrMy9leHRlbnNpb246IEZpeCBhc3Nl cnRpb24gaW4gcGFuZWxfYmluZGluZ19jb25zdHJ1Y3QoKQorCitDaGVjayBtX2lidXMgaW4gZXh0 ZW5zaW9uLnZhbGE6YnVzX25hbWVfYWNxdWlyZWRfY2IoKS4KKworQlVHPXJoYnojMTc5NzEyMAor LS0tCisgdWkvZ3RrMy9leHRlbnNpb24udmFsYSB8IDQgKysrKworIDEgZmlsZSBjaGFuZ2VkLCA0 IGluc2VydGlvbnMoKykKKworZGlmZiAtLWdpdCBhL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEgYi91 aS9ndGszL2V4dGVuc2lvbi52YWxhCitpbmRleCA1Y2QxYTZhZC4uM2FjZDc2ZWEgMTAwNjQ0Cist LS0gYS91aS9ndGszL2V4dGVuc2lvbi52YWxhCisrKysgYi91aS9ndGszL2V4dGVuc2lvbi52YWxh CitAQCAtNzMsNiArNzMsMTAgQEAgY2xhc3MgRXh0ZW5zaW9uR3RrIDogR3RrLkFwcGxpY2F0aW9u IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cmluZyAgICAgICAg IHNpZ25hbF9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmFy aWFudCAgICAgICAgcGFyYW1ldGVycykgeworICAgICAgICAgZGVidWcoInNpZ25hbF9uYW1lID0g JXMiLCBzaWduYWxfbmFtZSk7CisrICAgICAgICAvKiByaGJ6IzE3OTcxMjAgRml4IGFzc2VydChi dXMuaXNfY29ubmVjdGVkKCkpIGluCisrICAgICAgICAgKiBwYW5lbF9iaW5kaW5nX2NvbnN0cnVj dCgpCisrICAgICAgICAgKi8KKysgICAgICAgIHJldHVybl9pZl9mYWlsKG1fYnVzLmlzX2Nvbm5l Y3RlZCgpKTsKKyAgICAgICAgIG1fcGFuZWwgPSBuZXcgUGFuZWxCaW5kaW5nKG1fYnVzLCB0aGlz KTsKKyAgICAgICAgIG1fcGFuZWwubG9hZF9zZXR0aW5ncygpOworICAgICB9CistLSAKKzIuNTIu MAorCitGcm9tIGU4NjI4ZjUwNjQwNTY3ODkwZTA4ZDJlNWZiMDIzMGU4OTFiYmUwZmQgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFp bC5jb20+CitEYXRlOiBUaHUsIDggSmFuIDIwMjYgMTk6NTI6MTIgKzA5MDAKK1N1YmplY3Q6IFtQ QVRDSCAyLzJdIHVpL2d0azM6IEZpeCBTRUdWIHdpdGggZG91YmxlIGJ1c19uYW1lX2FjcXVpcmVk X2NiKCkKKworV2hlbiBQYW5lbEJpbmRpbmcoKSBpcyBjYWxsZWQgdHdpY2UsIGdfZGJ1c19jb25u ZWN0aW9uX3JlZ2lzdGVyX29iamVjdCgpCitpcyBmYWlsZWQgaW4gaWJ1c19zZXJ2aWNlX3JlZ2lz dGVyKCkgZHVlIHRvIHRoZSBkdXBsaWNhdGVkIG9iamVjdCBwYXRoCithbmQgaXQgY2FsbHMgdW5u ZWNlc3NhcnkgZ19vYmplY3RfdW5yZWYoKSBhbHRob3VnaCBnX29iamVjdF91bnJlZigpIGlzCitj YWxsZWQgaW4gZ19kYnVzX2Nvbm5lY3Rpb25fcmVnaXN0ZXJfb2JqZWN0KCkgYW5kIGl0IGNhdXNl cyBhIFNFR1YuCisKK0J1dCBAdXNlcl9kYXRhX2ZyZWVfZnVuYyBpbiBnX2RidXNfY29ubmVjdGlv bl9yZWdpc3Rlcl9vYmplY3QoKSBpcyBub3QKK2NhbGxlZCB3aXRoIGdfZGJ1c19jb25uZWN0aW9u X3VucmVnaXN0ZXJfb2JqZWN0KCkgaW1tZWRpYXRlbHkgYW5kIEknZAordGhpbmsgbm90IHRvIHVz ZSBAdXNlcl9kYXRhX2ZyZWVfZnVuYy4KKworQlVHPXJoYnojMjQxOTQ2OQorLS0tCisgc3JjL2li dXNzZXJ2aWNlLmMgICAgICAgIHwgMTggKysrKysrKysrKysrKysrKy0tCisgdWkvZ3RrMy9hcHBs aWNhdGlvbi52YWxhIHwgMTYgKysrKysrKysrKysrKystLQorIHVpL2d0azMvZXh0ZW5zaW9uLnZh bGEgICB8IDE2ICsrKysrKysrKysrKysrLS0KKyAzIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlv bnMoKyksIDYgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c3NlcnZpY2UuYyBi L3NyYy9pYnVzc2VydmljZS5jCitpbmRleCA1MWJkMmVlNC4uM2M3YzA0YTQgMTAwNjQ0CistLS0g YS9zcmMvaWJ1c3NlcnZpY2UuYworKysrIGIvc3JjL2lidXNzZXJ2aWNlLmMKK0BAIC0yLDcgKzIs NyBAQAorIC8qIHZpbTpzZXQgZXQgc3RzPTQ6ICovCisgLyogaWJ1cyAtIFRoZSBJbnB1dCBCdXMK KyAgKiBDb3B5cmlnaHQgKEMpIDIwMDgtMjAxNSBQZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdt YWlsLmNvbT4KKy0gKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAyMyBUYWthbyBGdWppd2FyYSA8dGFr YW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KKysgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAyNiBUYWth byBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KKyAgKiBDb3B5cmlnaHQgKEMp IDIwMDgtMjAxOSBSZWQgSGF0LCBJbmMuCisgICoKKyAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBz b2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCitAQCAtNDk1LDkgKzQ5NSwx NSBAQCBpYnVzX3NlcnZpY2VfdW5yZWdpc3Rlcl9jYiAoR0RCdXNDb25uZWN0aW9uICAgICpjb25u ZWN0aW9uLAorICAgICBndWludCAqcCA9IGlkczsKKyAgICAgd2hpbGUgKCpwICE9IDApIHsKKyAg ICAgICAgIGdfZGJ1c19jb25uZWN0aW9uX3VucmVnaXN0ZXJfb2JqZWN0IChjb25uZWN0aW9uLCAq cCsrKTsKKysgICAgICAgIC8qIGdfZGJ1c19jb25uZWN0aW9uX3JlZ2lzdGVyX29iamVjdChjb25u ZWN0aW9uKSBjYWxscworKyAgICAgICAgICogZ19vYmplY3RfcmVmKHNlcnZpY2UpLgorKyAgICAg ICAgICovCisrICAgICAgICBnX29iamVjdF91bnJlZiAoc2VydmljZSk7CisgICAgIH0KKyAgICAg Z19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jIChjb25uZWN0aW9uLAorICAgICAg ICAgICAgICAgICAgICAgR19DQUxMQkFDSyAoaWJ1c19zZXJ2aWNlX2Nvbm5lY3Rpb25fY2xvc2Vk X2NiKSwgc2VydmljZSk7CisrICAgIC8qIGdfaGFzaF90YWJsZV9pbnNlcnQoc2VydmljZS0+cHJp di0+dGFibGUpIGNhbGxzIGdfb2JqZWN0X3JlZihjb25uZWN0aW9uKQorKyAgICAgKi8KKyAgICAg Z19vYmplY3RfdW5yZWYgKGNvbm5lY3Rpb24pOworICAgICBnX2ZyZWUgKGlkcyk7CisgfQorQEAg LTU2NiwxMiArNTcyLDE5IEBAIGlidXNfc2VydmljZV9yZWdpc3RlciAoSUJ1c1NlcnZpY2UgICAg ICpzZXJ2aWNlLAorIAorICAgICBhcnJheSA9IGdfYXJyYXlfbmV3IChUUlVFLCBUUlVFLCBzaXpl b2YgKGd1aW50KSk7CisgICAgIHdoaWxlICgqcCAhPSBOVUxMKSB7CisrICAgICAgICAvKiBQcm9i YWJseSBJIHRoaW5rIEB1c2VyX2RhdGFfZnJlZV9mdW5jIGluCisrICAgICAgICAgKiBnX2RidXNf Y29ubmVjdGlvbl9yZWdpc3Rlcl9vYmplY3QoKSBpcyBub3QgdXNlZnVsIGluIHRoaXMgY2FzZQor KyAgICAgICAgICogc2luY2UgdGhlIGZyZWUgZnVuYyBpcyBub3QgY2FsbGVkIHVudGlsIHRoZSBA Y29ubmVjdGlvbiBpcyBjbG9zZWQKKysgICAgICAgICAqIGJ1dCB0aGUgQGNvbm5lY3Rpb24gaXMg c2hhcmVkIHdpdGggb3RoZXIgaW5zdGFuY2VzCisrICAgICAgICAgKiBzbyBpdCB3b3VsZCBiZSBi ZXR0ZXIgdG8gY2FsbCBnX29iamVjdF91bnJlZihzZXJ2aWNlKQorKyAgICAgICAgICogYWZ0ZXIg Z19kYnVzX2Nvbm5lY3Rpb25fdW5yZWdpc3Rlcl9vYmplY3QoKSBpcyBjYWxsZWQuCisrICAgICAg ICAgKi8KKyAgICAgICAgIGd1aW50IGlkID0gZ19kYnVzX2Nvbm5lY3Rpb25fcmVnaXN0ZXJfb2Jq ZWN0IChjb25uZWN0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNlcnZpY2UtPnByaXYtPm9iamVjdF9wYXRoLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpwLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpYnVzX3NlcnZp Y2VfaW50ZXJmYWNlX3Z0YWJsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBnX29iamVjdF9yZWYgKHNlcnZpY2UpLAorLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChHRGVzdHJveU5vdGlm eSlnX29iamVjdF91bnJlZiwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGVycm9yKTsKKyAgICAgICAgIGlmIChpZCAhPSAwKSB7Cisg ICAgICAgICAgICAgZ19hcnJheV9hcHBlbmRfdmFsIChhcnJheSwgaWQpOworQEAgLTU5NCw2ICs2 MDcsNyBAQCBlcnJvcl9vdXQ6CisgICAgICAgICBndWludCAqaWRzID0gKGd1aW50KikgYXJyYXkt PmRhdGE7CisgICAgICAgICB3aGlsZSAoKmlkcyAhPSAwKSB7CisgICAgICAgICAgICAgZ19kYnVz X2Nvbm5lY3Rpb25fdW5yZWdpc3Rlcl9vYmplY3QgKGNvbm5lY3Rpb24sICppZHMrKyk7CisrICAg ICAgICAgICAgZ19vYmplY3RfdW5yZWYgKHNlcnZpY2UpOworICAgICAgICAgfQorICAgICAgICAg Z19hcnJheV9mcmVlIChhcnJheSwgVFJVRSk7CisgICAgIH0KK2RpZmYgLS1naXQgYS91aS9ndGsz L2FwcGxpY2F0aW9uLnZhbGEgYi91aS9ndGszL2FwcGxpY2F0aW9uLnZhbGEKK2luZGV4IDY1YWI0 M2NmLi5kY2FiYzg5MiAxMDA2NDQKKy0tLSBhL3VpL2d0azMvYXBwbGljYXRpb24udmFsYQorKysr IGIvdWkvZ3RrMy9hcHBsaWNhdGlvbi52YWxhCitAQCAtMyw3ICszLDcgQEAKKyAgKiBpYnVzIC0g VGhlIElucHV0IEJ1cworICAqCisgICogQ29weXJpZ2h0KGMpIDIwMTEgUGVuZyBIdWFuZyA8c2hh d24ucC5odWFuZ0BnbWFpbC5jb20+CistICogQ29weXJpZ2h0KGMpIDIwMTctMjAyNSBUYWthbyBG dWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KKysgKiBDb3B5cmlnaHQoYykgMjAx Ny0yMDI2IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorICAqCisg ICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vcgorICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIg R2VuZXJhbCBQdWJsaWMKK0BAIC05OCw2ICs5OCwxNiBAQCBjbGFzcyBBcHBsaWNhdGlvbiB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJpbmcgICAgICAgICBzaWdu YWxfbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZhcmlhbnQg ICAgICAgIHBhcmFtZXRlcnMpIHsKKyAgICAgICAgIGRlYnVnKCJzaWduYWxfbmFtZSA9ICVzIiwg c2lnbmFsX25hbWUpOworKyAgICAgICAgaWYgKG1fcGFuZWwgIT0gbnVsbCkgeworKyAgICAgICAg ICAgIC8vIGlidXNfb2JqZWN0X2Rlc3Ryb3koKSBpcyBuZWVkZWQgYmVjYXVzZSBnX29iamVjdF91 bnJlZigpIGlzCisrICAgICAgICAgICAgLy8gY2FsbGVkIGJ5IGlidXNfc2VydmljZV91bnJlZ2lz dGVyX2NiKCkgYnV0IGFub3RoZXIKKysgICAgICAgICAgICAvLyBnX29iamVjdF91bnJlZigpIGlz IGFsc28gY2FsbGVkIGJ5IGdfb2JqZWN0X3J1bl9kaXNwb3NlKCkKKysgICAgICAgICAgICAvLyBh bmQgb25lIGdfb2JqZWN0X3VucmVmKCkgaXMgbm90IG5lZWRlZCBiZWNhdXNlIFZhbGEgY2FsbHMg aXQKKysgICAgICAgICAgICAvLyB3aXRoIGBtX3BhbmVsID0gbnVsbGAuCisrICAgICAgICAgICAg bV9wYW5lbC5yZWYoKTsKKysgICAgICAgICAgICAoKElCdXMuT2JqZWN0KW1fcGFuZWwpLmRlc3Ry b3koKTsKKysgICAgICAgICAgICBtX3BhbmVsLmRpc2Nvbm5lY3Rfc2lnbmFscygpOworKyAgICAg ICAgfQorICAgICAgICAgbV9wYW5lbCA9IG5ldyBQYW5lbChidXMsIG1fZW5hYmxlX3dheWxhbmRf aW0pOworICAgICAgICAgaWYgKG1fbG9nICE9IG51bGwpCisgICAgICAgICAgICAgbV9wYW5lbC5z ZXRfbG9nKG1fbG9nLCBtX3ZlcmJvc2UpOworQEAgLTEyOCw3ICsxMzgsOCBAQCBjbGFzcyBBcHBs aWNhdGlvbiB7CisgICAgICAgICAvLyBnX2RidXNfY29ubmVjdGlvbl9yZWdpc3Rlcl9vYmplY3Qo KQorICAgICAgICAgZGVidWcoInNpZ25hbF9uYW1lID0gJXMiLCBzaWduYWxfbmFtZSk7CisgCist ICAgICAgICAvLyB1bnJlZiBtX3BhbmVsCisrICAgICAgICBtX3BhbmVsLnJlZigpOworKyAgICAg ICAgKChJQnVzLk9iamVjdCltX3BhbmVsKS5kZXN0cm95KCk7CisgICAgICAgICBtX3BhbmVsLmRp c2Nvbm5lY3Rfc2lnbmFscygpOworICNpZiBVU0VfR0RLX1dBWUxBTkQKKyAgICAgICAgIGlmICht X3JlYWxpemVfc3VyZmFjZV9pZCAhPSAwKSB7CitAQCAtMTQ0LDYgKzE1NSw3IEBAIGNsYXNzIEFw cGxpY2F0aW9uIHsKKyAgICAgICAgICAgICBtX2lidXNfZm9jdXNfb3V0X2lkID0gMDsKKyAgICAg ICAgIH0KKyAjZW5kaWYKKysgICAgICAgIC8vIHVucmVmIG1fcGFuZWwKKyAgICAgICAgIG1fcGFu ZWwgPSBudWxsOworICAgICB9CisgCitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9leHRlbnNpb24udmFs YSBiL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEKK2luZGV4IDNhY2Q3NmVhLi43ZWU1NGNkMyAxMDA2 NDQKKy0tLSBhL3VpL2d0azMvZXh0ZW5zaW9uLnZhbGEKKysrKyBiL3VpL2d0azMvZXh0ZW5zaW9u LnZhbGEKK0BAIC0zLDcgKzMsNyBAQAorICAqIGlidXMgLSBUaGUgSW5wdXQgQnVzCisgICoKKyAg KiBDb3B5cmlnaHQoYykgMjAxOCBQZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdtYWlsLmNvbT4K Ky0gKiBDb3B5cmlnaHQoYykgMjAxOC0yMDI1IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2Fy YTFAZ21haWwuY29tPgorKyAqIENvcHlyaWdodChjKSAyMDE4LTIwMjYgVGFrYW8gRnVqaXdhcmEg PHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CisgICoKKyAgKiBUaGlzIGxpYnJhcnkgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICogbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworQEAgLTc3 LDYgKzc3LDE2IEBAIGNsYXNzIEV4dGVuc2lvbkd0ayA6IEd0ay5BcHBsaWNhdGlvbiB7CisgICAg ICAgICAgKiBwYW5lbF9iaW5kaW5nX2NvbnN0cnVjdCgpCisgICAgICAgICAgKi8KKyAgICAgICAg IHJldHVybl9pZl9mYWlsKG1fYnVzLmlzX2Nvbm5lY3RlZCgpKTsKKysgICAgICAgIGlmIChtX3Bh bmVsICE9IG51bGwpIHsKKysgICAgICAgICAgICAvLyBpYnVzX29iamVjdF9kZXN0cm95KCkgaXMg bmVlZGVkIGJlY2F1c2UgZ19vYmplY3RfdW5yZWYoKSBpcworKyAgICAgICAgICAgIC8vIGNhbGxl ZCBieSBpYnVzX3NlcnZpY2VfdW5yZWdpc3Rlcl9jYigpIGJ1dCBhbm90aGVyCisrICAgICAgICAg ICAgLy8gZ19vYmplY3RfdW5yZWYoKSBpcyBhbHNvIGNhbGxlZCBieSBnX29iamVjdF9ydW5fZGlz cG9zZSgpCisrICAgICAgICAgICAgLy8gYW5kIG9uZSBnX29iamVjdF91bnJlZigpIGlzIG5vdCBu ZWVkZWQgYmVjYXVzZSBWYWxhIGNhbGxzIGl0CisrICAgICAgICAgICAgLy8gd2l0aCBgbV9wYW5l bCA9IG51bGxgLgorKyAgICAgICAgICAgIG1fcGFuZWwucmVmKCk7CisrICAgICAgICAgICAgKChJ QnVzLk9iamVjdCltX3BhbmVsKS5kZXN0cm95KCk7CisrICAgICAgICAgICAgbV9wYW5lbC5kaXNj b25uZWN0X3NpZ25hbHMoKTsKKysgICAgICAgIH0KKyAgICAgICAgIG1fcGFuZWwgPSBuZXcgUGFu ZWxCaW5kaW5nKG1fYnVzLCB0aGlzKTsKKyAgICAgICAgIG1fcGFuZWwubG9hZF9zZXR0aW5ncygp OworICAgICB9CitAQCAtOTUsOCArMTA1LDEwIEBAIGNsYXNzIEV4dGVuc2lvbkd0ayA6IEd0ay5B cHBsaWNhdGlvbiB7CisgICAgICAgICAvLyBnX2RidXNfY29ubmVjdGlvbl9yZWdpc3Rlcl9vYmpl Y3QoKQorICAgICAgICAgZGVidWcoInNpZ25hbF9uYW1lID0gJXMiLCBzaWduYWxfbmFtZSk7Cisg CistICAgICAgICAvLyB1bnJlZiBtX3BhbmVsCisrICAgICAgICBtX3BhbmVsLnJlZigpOworKyAg ICAgICAgKChJQnVzLk9iamVjdCltX3BhbmVsKS5kZXN0cm95KCk7CisgICAgICAgICBtX3BhbmVs LmRpc2Nvbm5lY3Rfc2lnbmFscygpOworKyAgICAgICAgLy8gdW5yZWYgbV9wYW5lbAorICAgICAg ICAgbV9wYW5lbCA9IG51bGw7CisgICAgIH0KKyAKKy0tIAorMi41Mi4wCisKCmRpZmYgLS1naXQg YS9pYnVzLnNwZWMgYi9pYnVzLnNwZWMKaW5kZXggYmM5YTFmOC4uODhlNThhNyAxMDA2NDQKLS0t IGEvaWJ1cy5zcGVjCisrKyBiL2lidXMuc3BlYwpAQCAtMjIsMTEgKzIyLDExIEBACiAKICVnbG9i YWwgaWJ1c194aW5pdF9jb25kaXRpb24gKCVwY2QxIG9yICVwY2QyIG9yICVwY2QzKQogIyBGSVhN RTogSG93IHRvIHdyaXRlIGEgY29uZGl0aW9uIHdpdGggbXVsdGlwbGUgbGluZXMKLSVnbG9iYWwg aWJ1c19wYW5lbF9jb25kaXRpb24gKCVwY2QxIG9yICVwY2QyIG9yICVwY2QzIG9yICVwY2Q0KQor JWdsb2JhbCBpYnVzX3BhbmVsX2NvbmRpdGlvbiAoJXBjZDEgb3IgJXBjZDIgb3IgJXBjZDMgb3Ig JXdjZDEpCiAlZ2xvYmFsIHBjZDEgYnVkZ2llLWRlc2t0b3Agb3IgY2lubmFtb24gb3IgZGVlcGlu LWRlc2t0b3Agb3IgaTMKLSVnbG9iYWwgcGNkMiBseHF0LXNlc3Npb24gb3IgbHhzZXNzaW9uIG9y IG1hdGUtcGFuZWwgb3IgcGhvc2gKKyVnbG9iYWwgcGNkMiBseHF0LXgxMS1zZXNzaW9uIG9yIGx4 c2Vzc2lvbiBvciBtYXRlLXBhbmVsIG9yIHBob3NoIG9yIGF3ZXNvbWUKICVnbG9iYWwgcGNkMyBw bGFzbWEtd29ya3NwYWNlIG9yIHN1Z2FyIG9yIHhmY2U0LXNlc3Npb24KLSVnbG9iYWwgcGNkNCBj b3NtaWMtcGFuZWwgb3IgaHlwcmxhbmQgb3Igc3dheSBvciB3YXliYXIKKyVnbG9iYWwgd2NkMSBj b3NtaWMtcGFuZWwgb3IgaHlwcmxhbmQgb3Igc3dheSBvciB3YXliYXIgb3IgbHhxdC13YXlsYW5k LXNlc3Npb24KIAogJWlmICV3aXRoX3BrZ19jb25maWcKICVpZiAle3dpdGggZ3RrMn0KQEAgLTUz LDcgKzUzLDcgQEAKIE5hbWU6ICAgICAgICAgICBpYnVzCiBWZXJzaW9uOiAgICAgICAgMS41LjM0 fmFscGhhMQogIyBodHRwczovL2dpdGh1Yi5jb20vZmVkb3JhLWluZnJhL3JwbWF1dG9zcGVjL2lz c3Vlcy8xMDEKLVJlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAgICA0JXs/ ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBJbnRlbGxpZ2VudCBJbnB1dCBCdXMgZm9yIExpbnV4IE9T CiBMaWNlbnNlOiAgICAgICAgTEdQTC0yLjEtb3ItbGF0ZXIKIFVSTDogICAgICAgICAgICBodHRw czovL2dpdGh1Yi5jb20vaWJ1cy8lbmFtZS93aWtpCkBAIC0xMTAsMTMgKzExMCw5IEBAIFJlcXVp cmVzOiAgICAgICBweXRob24zLWlidXMgICAgICAgICAgID0gJXt2ZXJzaW9ufS0le3JlbGVhc2V9 CiBSZWNvbW1lbmRzOiAgICAgJXtuYW1lfS1zZXR1cCAgICAgICAgICA9ICV7dmVyc2lvbn0tJXty ZWxlYXNlfQogCiBSZXF1aXJlczogICAgICAgaXNvLWNvZGVzCi1SZXF1aXJlczogICAgICAgZGNv bmYKICMgcnBtbGludCBhc2tzIHRvIGRlbGV0ZSBsaWJyc3ZnMgogI1JlcXVpcmVzOiAgICAgICBs aWJyc3ZnMgogCi1SZXF1aXJlczogICAgICAgICAgICAgICBkZXNrdG9wLWZpbGUtdXRpbHMKLVJl cXVpcmVzKHBvc3QpOiAgICAgICAgIGRlc2t0b3AtZmlsZS11dGlscwotUmVxdWlyZXMocG9zdHVu KTogICAgICAgZGVza3RvcC1maWxlLXV0aWxzCiBSZXF1aXJlczogICAgICAgICAgICAgICBkY29u ZgogUmVxdWlyZXMocG9zdHVuKTogICAgICAgZGNvbmYKIFJlcXVpcmVzKHBvc3R0cmFucyk6ICAg IGRjb25mCkBAIC01NzksNiArNTc1LDE1IEBAIGRjb25mIHVwZGF0ZSB8fCA6CiAle19kYXRhZGly fS9pbnN0YWxsZWQtdGVzdHMvaWJ1cwogCiAlY2hhbmdlbG9nCisqIEZyaSBKYW4gMDkgMjAyNiBU YWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuMzR+YWxwaGExLTQKKy0g UmVzb2x2ZXM6ICMyNDE5NDY5IEZpeCBTRUdWIHdpdGggZG91YmxlIGJ1c19uYW1lX2FjcXVpcmVk X2NiKCkKKy0gUmVzb2x2ZXM6ICMyNDI0MjU2IERlbGV0ZSBSZXF1aXJlcyBkZXNrdG9wLWZpbGUt dXRpbHMgaW4gc3BlYworLSBSZXNvbHZlczogIzI0MjU1ODUgU2VwYXJhdGUgbHhxdC13YXlsYW5k LXNlc3Npb24gYW5kIGx4cXQteDExLXNlc3Npb24gaW4gc3BlYworLSBSZXNvbHZlczogIzI0Mjgy MzggQWRkIGF3ZXNvbWUgaW4gc3BlYworLSBSZWJhc2U6ICMxNzk3MTIwIEZpeCBhc3NlcnRpb24g aW4gcGFuZWxfYmluZGluZ19jb25zdHJ1Y3QoKQorLSBDb25uZWN0IGRlbGV0ZSBzdXJyb3VuZGlu ZyB0ZXh0IGluIGlidXMtd2F5bGFuZAorLSBGaXggQmFja3NwYWNlIGFmdGVyIGNvbW1pdC10ZXh0 IGluIEdob3N0dHkgaW4gaWJ1cy13YXlsYW5kCisKICogU3VuIERlYyAyMSAyMDI1IFRha2FvIEZ1 aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNS4zNH5hbHBoYTEtMwogLSBSZXNvbHZl czogIzIzMjE5OTAjYzEwIEtlZXAgeGluaXQgcG9zdHVuIGluIGlidXMgZm9yIGJhY2sgY29tcGF0 aWJpbGl0eQogLSBSZXNvbHZlczogIzI0MTg1NjQgRG8gbm90IGluc3RhbGwgaWJ1cy14aW5pdCBp biBDT1NNSUMgZGVza3RvcAo=