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: Pavol Sloboda To: git-commits@fedoraproject.org Subject: [rpms/mysql8.4] f44: Fixed the compilation with openssl 4 Date: Tue, 23 Jun 2026 18:24:46 GMT Message-ID: <178223908612.1.14875162687795006822.rpms-mysql8.4-de693db342f0@fedoraproject.org> List-ID: X-Git-Repo: rpms/mysql8.4 X-Git-Branch: f44 X-Git-Rev: de693db342f091f48c5829b213363f170c81ff67 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvbXlzcWw4LjQKICAgICAgICAgICAgQnJhbmNoIDogZjQ0CiAgICAgICAgICAg IENvbW1pdCA6IGRlNjkzZGIzNDJmMDkxZjQ4YzU4MjliMjEzMzYzZjE3MGM4MWZmNjcKICAgICAg ICAgICAgQXV0aG9yIDogUGF2b2wgU2xvYm9kYSA8cHNsb2JvZGFAcmVkaGF0LmNvbT4KICAgICAg ICAgICAgRGF0ZSAgIDogMjAyNi0wNS0xOFQxMDoyNzoyNiswMjowMAogICAgICAgICAgICBTdGF0 cyAgOiArMjYwLy0wIGluIDIgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3Ny Yy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL215c3FsOC40L2MvZGU2OTNkYjM0MmYwOTFmNDhjNTgy OWIyMTMzNjNmMTcwYzgxZmY2Nz9icmFuY2g9ZjQ0CgogICAgICAgICAgICBMb2c6CiAgICAgICAg ICAgIEZpeGVkIHRoZSBjb21waWxhdGlvbiB3aXRoIG9wZW5zc2wgNAp0aGlzIGlzIGFsc28gY29t cGF0aWJsZSB3aXRoIG9sZGVyIHZlcnNpb25zIG9mIG9wZW5zc2wgc2luY2UgdGhlCmltcGxlbWVu dGF0aW9uIGlzIGF2YWlsYWJsZSBzaW5jZSBvcGVuc3NsIDEuMS4wCgpUaGlzIHBhdGNoIG1vc3Rs eSBqdXN0IGZpeGVzIGVycm9ycyB3aXRoIHRoZSBYNTA5X25hbWVfc3Qgc3RydWN0IGJlaW5nCmZv cmNlZCB0byBiZSB1c2VkIGFzIHRoZSBvcGFxdWUgaW1wbGVtZW5hdGlvbjogWDUwOV9OQU1FCgov YnVpbGRkaXIvYnVpbGQvQlVJTEQvbXlzcWw4LjQtOC40LjktYnVpbGQvbXlzcWwtOC40Ljkvc3Fs L2F1dGgvc3FsX2F1dGhlbnRpY2F0aW9uLmNjOjUyNzk6Mzc6IGVycm9yOiBpbnZhbGlkIGNvbnZl cnNpb24gZnJvbSDigJhjb25zdCBYNTA5X05BTUUq4oCZIHtha2Eg4oCYY29uc3QgWDUwOV9uYW1l X3N0KuKAmX0gdG8g4oCYWDUwOV9OQU1FKuKAmSB7YWthIOKAmFg1MDlfbmFtZV9zdCrigJl9IFst ZnBlcm1pc3NpdmVdCiA1Mjc5IHwgICAgIGlmICghWDUwOV9OQU1FX2FkZF9lbnRyeV9ieV90eHQo bmFtZSwgIkNOIiwgTUJTVFJJTkdfQVNDLAogICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIF5+fn4KICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8CiAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg WDUwOV9OQU1FKiB7YWthIGNvbnN0IFg1MDlfbmFtZV9zdCp9CgphbmQgc2ltaWxhciBpc3N1ZXMg d2l0aCB0aGUgQVNOMV9TVFJJTkcsIHdoaWNoIGNhbiBubyBsb25nZXIgYmUgYWNjZXNzZWQKZGly ZWN0bHkgYW5kIGdldHRlciBhbmQgc2V0dGVyIGZ1bmN0aW9ucyBtdXN0IGJlIHVzZWQgaW5zdGVh ZDoKCi9idWlsZGRpci9idWlsZC9CVUlMRC9teXNxbDguNC04LjQuOC1idWlsZC9teXNxbC04LjQu OC9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwvTm9kZUNlcnRpZmljYXRlLmNwcDo2MDU6NTI6 IGVycm9yOiBpbnZhbGlkIHVzZSBvZiBpbmNvbXBsZXRlIHR5cGUg4oCYY29uc3QgQVNOMV9TVFJJ TkfigJkge2FrYSDigJhjb25zdCBzdHJ1Y3QgYXNuMV9zdHJpbmdfc3TigJl9CiAgNjA1IHwgICAg IG9mZnNldCArPSBzcHJpbnRmKGJ1ZiArIG9mZnNldCwgIiUwMlg6Iiwgc2VyaWFsLT5kYXRhW2ld KTsKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBefgoKLS0tCmRpZmYgLS1naXQgYS9teXNxbC1maXgtY29tcGlsYXRpb24td2l0aC1vcGVu c3NsNC5wYXRjaCBiL215c3FsLWZpeC1jb21waWxhdGlvbi13aXRoLW9wZW5zc2w0LnBhdGNoCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMwODc1N2QKLS0tIC9kZXYvbnVsbAor KysgYi9teXNxbC1maXgtY29tcGlsYXRpb24td2l0aC1vcGVuc3NsNC5wYXRjaApAQCAtMCwwICsx LDI1OSBAQAorQSBwYXRjaCBmaXhpbmcgdGhlIGNvbXBpbGF0aW9uIHdpdGggb3BlbnNzbDQgYnkg dXNpbmcgdGhlIG9wYXF1ZQoraW1wbGVtZW50YXRpb24gb2YgdGhlIFg1MDlfbmFtZV9zdCBzdHJ1 Y3QgYXMgWDUwOV9OQU1FCit3aGljaCB3YXMgaW50cm9kdWNlZCBpbiBvcGVuc3NsLTEuMS4wIGFz IGNhbiBiZSBzZWVuIGhlcmU6CitodHRwczovL3dpa2kub3BlbnNzbC5vcmcvaW5kZXgucGhwL09w ZW5TU0xfMS4xLjBfQ2hhbmdlcwordGhpcyBtZWFucyB0aGF0IHRoZSBmaXggaXMgYXBwbGljYWJs ZSBpbiBvcGVuc3NsIHZlcnNpb25zIG9sZGVyIHRoYW4gNC4wCithcyB3ZWxsIGFuZCB3b24ndCBi cmVhayBhbnl0aGluZworCitBbHNvIGNoYW5nZWQgdGhlIG9wZW5zc2wgbWFqb3IgdmVyc2lvbiBj aGVja2luZyBpbiBjbWFrZSAgdG8gY2hlY2sgZm9yCit2ZXJzaW9ucyBncmVhdGVyIHRoYW4gMiBy YXRoZXIgdGhhbiBlcXVhbCB0byAzIHRvIGVuc3VyZSBvcGVuc3NsNCBpcyBiZWluZworYWNjZXB0 ZWQgYXMgd2VsbAorZGlmZiAtTmF1ciBteXNxbC04LjQuOS9jbWFrZS9zc2wuY21ha2UgbXlzcWwt OC40LjlfcGF0Y2hlZC9jbWFrZS9zc2wuY21ha2UKKy0tLSBteXNxbC04LjQuOS9jbWFrZS9zc2wu Y21ha2UJMjAyNi0wNC0wNyAxNzo0NzozOC4wMDAwMDAwMDAgKzAyMDAKKysrKyBteXNxbC04LjQu OV9wYXRjaGVkL2NtYWtlL3NzbC5jbWFrZQkyMDI2LTA1LTEyIDEyOjE4OjQ1LjIzMDcyNTY1NiAr MDIwMAorQEAgLTE1MSw3ICsxNTEsNyBAQAorICAgICAgICR7dmVyc2lvbl9wYXJ0fSAiJHske3Zl cnNpb25fcGFydH19IikKKyAgIEVOREZPUkVBQ0goKQorICAgU0VUKE9QRU5TU0xfVkVSU0lPTl9N QUpPUiAke09QRU5TU0xfVkVSU0lPTl9NQUpPUn0gQ0FDSEUgSU5URVJOQUwgIiIgRk9SQ0UpCist ICBJRihPUEVOU1NMX1ZFUlNJT05fTUFKT1IgVkVSU0lPTl9FUVVBTCAzKQorKyAgSUYoT1BFTlNT TF9WRVJTSU9OX01BSk9SIFZFUlNJT05fR1JFQVRFUiAyKQorICAgICAjIE9wZW5TU0wgMworICAg ICBTRVQoT1BFTlNTTF9GSVhfVkVSU0lPTiAiJHtPUEVOU1NMX1ZFUlNJT05fUEFUQ0h9IikKKyAg IEVMU0UoKQorZGlmZiAtTmF1ciBteXNxbC04LjQuOS9zcWwvYXV0aC9zcWxfYXV0aGVudGljYXRp b24uY2MgbXlzcWwtOC40LjlfcGF0Y2hlZC9zcWwvYXV0aC9zcWxfYXV0aGVudGljYXRpb24uY2MK Ky0tLSBteXNxbC04LjQuOS9zcWwvYXV0aC9zcWxfYXV0aGVudGljYXRpb24uY2MJMjAyNi0wNC0w NyAxNzo0NzozOC4wMDAwMDAwMDAgKzAyMDAKKysrKyBteXNxbC04LjQuOV9wYXRjaGVkL3NxbC9h dXRoL3NxbF9hdXRoZW50aWNhdGlvbi5jYwkyMDI2LTA1LTEyIDE0OjIwOjM1LjI5NzgyNTgyOSAr MDIwMAorQEAgLTUyNTEsNyArNTI1MSw3IEBACisgICAgIFg1MDkgKng1MDkgPSBYNTA5X25ldygp OworICAgICBYNTA5X0VYVEVOU0lPTiAqZXh0ID0gbnVsbHB0cjsKKyAgICAgWDUwOVYzX0NUWCB2 M2N0eDsKKy0gICAgWDUwOV9OQU1FICpuYW1lID0gbnVsbHB0cjsKKysgICAgY29uc3QgWDUwOV9O QU1FICpuYW1lID0gbnVsbHB0cjsKKyAKKyAgICAgYXNzZXJ0KGNuLmxlbmd0aCgpIDw9IE1BWF9D Tl9OQU1FX0xFTkdUSCk7CisgICAgIGFzc2VydChzZXJpYWwgIT0gMCk7CitAQCAtNTI3Niw3ICs1 Mjc2LDcgQEAKKyAgICAgbmFtZSA9IFg1MDlfZ2V0X3N1YmplY3RfbmFtZSh4NTA5KTsKKyAgICAg aWYgKCFuYW1lKSBnb3RvIGVycjsKKyAKKy0gICAgaWYgKCFYNTA5X05BTUVfYWRkX2VudHJ5X2J5 X3R4dChuYW1lLCAiQ04iLCBNQlNUUklOR19BU0MsCisrICAgIGlmICghWDUwOV9OQU1FX2FkZF9l bnRyeV9ieV90eHQoKFg1MDlfTkFNRSopbmFtZSwgIkNOIiwgTUJTVFJJTkdfQVNDLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjb25zdCB1bnNpZ25lZCBjaGFyICopY24u Y19zdHIoKSwgLTEsIC0xLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAp KQorICAgICAgIGdvdG8gZXJyOworZGlmZiAtTmF1ciBteXNxbC04LjQuOS9zdG9yYWdlL25kYi9p bmNsdWRlL3V0aWwvTm9kZUNlcnRpZmljYXRlLmhwcCBteXNxbC04LjQuOV9wYXRjaGVkL3N0b3Jh Z2UvbmRiL2luY2x1ZGUvdXRpbC9Ob2RlQ2VydGlmaWNhdGUuaHBwCistLS0gbXlzcWwtOC40Ljkv c3RvcmFnZS9uZGIvaW5jbHVkZS91dGlsL05vZGVDZXJ0aWZpY2F0ZS5ocHAJMjAyNi0wNC0wNyAx Nzo0NzozOC4wMDAwMDAwMDAgKzAyMDAKKysrKyBteXNxbC04LjQuOV9wYXRjaGVkL3N0b3JhZ2Uv bmRiL2luY2x1ZGUvdXRpbC9Ob2RlQ2VydGlmaWNhdGUuaHBwCTIwMjYtMDUtMTIgMTI6MTg6NDUu MjMxNDE5MzYwICswMjAwCitAQCAtMzEsNiArMzEsNyBAQAorICNpbmNsdWRlICJ1dGlsL0Jhc2VT dHJpbmcuaHBwIgorICNpbmNsdWRlICJ1dGlsL1ZlY3Rvci5ocHAiCisgI2luY2x1ZGUgInV0aWwv Y3N0cmJ1Zi5oIgorKyNpbmNsdWRlIDxvcGVuc3NsL3g1MDkuaD4KKyAKKyBzdHJ1Y3QgUGtpRmls ZSB7CisgICB1c2luZyBGaWxlTmFtZSA9IGNzdHJidWY8MzI+OworQEAgLTIwNSw3ICsyMDYsNyBA QAorICAgfkNlcnRTdWJqZWN0KCkgPSBkZWZhdWx0OworIAorICAgLyogQ2xhc3MgTWV0aG9kcyAq LworLSAgc3RhdGljIGludCBzZXRfY29tbW9uX25hbWUoc3RydWN0IFg1MDlfbmFtZV9zdCAqLCBj b25zdCBjaGFyICopOworKyAgc3RhdGljIGludCBzZXRfY29tbW9uX25hbWUoY29uc3QgWDUwOV9O QU1FICosIGNvbnN0IGNoYXIgKik7CisgCisgICAvKiBQdWJsaWMgSW5zdGFuY2UgTWV0aG9kcyAq LworICAgYm9vbCBiaW5kX2hvc3RuYW1lKGNvbnN0IGNoYXIgKik7CitAQCAtMjI1LDcgKzIyNiw3 IEBACisgICBzaXplX3QgdGltZXN0YW1wKHRpbWVfdCwgY2hhciAqbSwgc2l6ZV90KSBjb25zdDsK KyAgIHNpemVfdCB0aW1lc3RhbXAoY2hhciAqLCBzaXplX3QpIGNvbnN0OworICAgc2l6ZV90IHBy aW50X25hbWUoY2hhciAqLCBzaXplX3QpIGNvbnN0OworLSAgYm9vbCBwYXJzZV9uYW1lKHN0cnVj dCBYNTA5X25hbWVfc3QgKik7CisrICBib29sIHBhcnNlX25hbWUoY29uc3QgWDUwOV9OQU1FICop OworICAgYm9vbCBwYXJzZV9uYW1lKGNvbnN0IHN0cnVjdCBhc24xX3N0cmluZ19zdCAqKTsKKyAK KyAgIC8qIE1lbWJlciB2YXJpYWJsZXMgKi8KK2RpZmYgLU5hdXIgbXlzcWwtOC40Ljkvc3RvcmFn ZS9uZGIvc3JjL2NvbW1vbi91dGlsL05vZGVDZXJ0aWZpY2F0ZS5jcHAgbXlzcWwtOC40LjlfcGF0 Y2hlZC9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwvTm9kZUNlcnRpZmljYXRlLmNwcAorLS0t IG15c3FsLTguNC45L3N0b3JhZ2UvbmRiL3NyYy9jb21tb24vdXRpbC9Ob2RlQ2VydGlmaWNhdGUu Y3BwCTIwMjYtMDQtMDcgMTc6NDc6MzguMDAwMDAwMDAwICswMjAwCisrKysgbXlzcWwtOC40Ljlf cGF0Y2hlZC9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwvTm9kZUNlcnRpZmljYXRlLmNwcAky MDI2LTA1LTEyIDEyOjE4OjQ1LjIzMTU2MDA0OCArMDIwMAorQEAgLTIzLDYgKzIzLDcgQEAKKyAg ICBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdCwgRmlmdGggRmxvb3IsIEJvc3Rvbiwg TUEgMDIxMTAtMTMwMSAgVVNBCisgKi8KKyAjaW5jbHVkZSA8YXNzZXJ0Lmg+CisrI2luY2x1ZGUg PG9wZW5zc2wvYXNuMS5oPgorICNpbmNsdWRlIDxzdGRsaWIuaD4KKyAjaW5jbHVkZSA8c3lzL3N0 YXQuaD4KKyAjaW5jbHVkZSA8dGltZS5oPgorQEAgLTU1OCw3ICs1NTksNyBAQAorICAgaWYgKCFj ZXJ0KSByZXR1cm4gbnVsbHB0cjsKKyAKKyAgIC8qIENvcHkgbmFtZSBmcm9tIGNzciB0byBjZXJ0 ICovCistICBYNTA5X05BTUUgKm5hbWUgPSBYNTA5X1JFUV9nZXRfc3ViamVjdF9uYW1lKG1fcmVx KTsKKysgIGNvbnN0IFg1MDlfTkFNRSAqbmFtZSA9IFg1MDlfUkVRX2dldF9zdWJqZWN0X25hbWUo bV9yZXEpOworICAgaWYgKFg1MDlfc2V0X3N1YmplY3RfbmFtZShjZXJ0LCBuYW1lKSAhPSAxKSBy ZXR1cm4gbnVsbHB0cjsKKyAKKyAgIC8qIFNldCBzZXJpYWwgbnVtYmVyIGluIHg1MDkgKi8KK0BA IC01NzgsNyArNTc5LDcgQEAKKyAKKyBib29sIFNpZ25pbmdSZXF1ZXN0OjpwYXJzZV9uYW1lKCkg eworICAgaWYgKG1fcmVxID09IG51bGxwdHIpIHJldHVybiBmYWxzZTsKKy0gIFg1MDlfTkFNRSAq bmFtZSA9IFg1MDlfUkVRX2dldF9zdWJqZWN0X25hbWUobV9yZXEpOworKyAgY29uc3QgWDUwOV9O QU1FICpuYW1lID0gWDUwOV9SRVFfZ2V0X3N1YmplY3RfbmFtZShtX3JlcSk7CisgICByZXR1cm4g Q2VydFN1YmplY3Q6OnBhcnNlX25hbWUobmFtZSk7CisgfQorIAorQEAgLTYwMSw4ICs2MDIsOCBA QAorIAorIGludCBTZXJpYWxOdW1iZXI6OnByaW50KGNoYXIgKmJ1ZiwgaW50IGxlbiwgY29uc3Qg QVNOMV9TVFJJTkcgKnNlcmlhbCkgeworICAgaW50IG9mZnNldCA9IDA7CistICBmb3IgKGludCBp ID0gMDsgaSA8IHNlcmlhbC0+bGVuZ3RoICYmIG9mZnNldCA8IChsZW4gLSA0KTsgaSsrKQorLSAg ICBvZmZzZXQgKz0gc3ByaW50ZihidWYgKyBvZmZzZXQsICIlMDJYOiIsIHNlcmlhbC0+ZGF0YVtp XSk7CisrICBmb3IgKGludCBpID0gMDsgaSA8IEFTTjFfU1RSSU5HX2xlbmd0aChzZXJpYWwpICYm IG9mZnNldCA8IChsZW4gLSA0KTsgaSsrKQorKyAgICBvZmZzZXQgKz0gc3ByaW50ZihidWYgKyBv ZmZzZXQsICIlMDJYOiIsIEFTTjFfU1RSSU5HX2dldDBfZGF0YShzZXJpYWwpW2ldKTsKKyAgIGlm IChvZmZzZXQpIGJ1ZltvZmZzZXQgLSAxXSA9ICdcMCc7CisgICByZXR1cm4gb2Zmc2V0OworIH0K K0BAIC02MTIsOCArNjEzLDggQEAKKyBTZXJpYWxOdW1iZXI6OkhleFN0cmluZzo6SGV4U3RyaW5n KGNvbnN0IEFTTjFfU1RSSU5HICpzZXJpYWwpIHsKKyAgIGJ1Zi5hcHBlbmQoIjB4Iik7CisgICBp bnQgdHJ1bmNhdGVkIFtbbWF5YmVfdW51c2VkXV0gPSAwOworLSAgZm9yIChpbnQgaSA9IDA7IGkg PCBzZXJpYWwtPmxlbmd0aDsgaSsrKQorLSAgICB0cnVuY2F0ZWQgPSBidWYuYXBwZW5kZigiJTAy eCIsIHNlcmlhbC0+ZGF0YVtpXSk7CisrICBmb3IgKGludCBpID0gMDsgaSA8IEFTTjFfU1RSSU5H X2xlbmd0aChzZXJpYWwpOyBpKyspCisrICAgIHRydW5jYXRlZCA9IGJ1Zi5hcHBlbmRmKCIlMDJ4 IiwgQVNOMV9TVFJJTkdfZ2V0MF9kYXRhKHNlcmlhbClbaV0pOworICAgYXNzZXJ0KCF0cnVuY2F0 ZWQpOworIH0KKyAKK0BAIC02MzgsNyArNjM5LDcgQEAKKyB9CisgCisgaW50IENlcnRpZmljYXRl OjpzZXRfY29tbW9uX25hbWUoWDUwOSAqY2VydCwgY29uc3QgY2hhciAqQ04pIHsKKy0gIFg1MDlf TkFNRSAqbmFtZSA9IFg1MDlfZ2V0X3N1YmplY3RfbmFtZShjZXJ0KTsKKysgIGNvbnN0IFg1MDlf TkFNRSAqbmFtZSA9IFg1MDlfZ2V0X3N1YmplY3RfbmFtZShjZXJ0KTsKKyAgIHJldHVybiBDZXJ0 U3ViamVjdDo6c2V0X2NvbW1vbl9uYW1lKG5hbWUsIENOKTsKKyB9CisgCitAQCAtNjUyLDggKzY1 Myw4IEBACisgICBjb25zdCBBU04xX0JJVF9TVFJJTkcgKnNpZyA9IG51bGxwdHI7CisgICBjb25z dCBYNTA5X0FMR09SICphbGdvcml0aG07CisgICBYNTA5X2dldDBfc2lnbmF0dXJlKCZzaWcsICZh bGdvcml0aG0sIGNlcnQpOworLSAgaWYgKHNpZyAmJiBzaWctPmRhdGEpCistICAgIHByZWZpeCA9 IChzaWctPmRhdGFbMF0gPDwgMTYpIHwgKHNpZy0+ZGF0YVsxXSA8PCA4KSB8IHNpZy0+ZGF0YVsy XTsKKysgIGlmIChzaWcgJiYgQVNOMV9TVFJJTkdfZ2V0MF9kYXRhKHNpZykpCisrICAgIHByZWZp eCA9IChBU04xX1NUUklOR19nZXQwX2RhdGEoc2lnKVswXSA8PCAxNikgfCAoQVNOMV9TVFJJTkdf Z2V0MF9kYXRhKHNpZylbMV0gPDwgOCkgfCBBU04xX1NUUklOR19nZXQwX2RhdGEoc2lnKVsyXTsK KyAgIHJldHVybiBwcmVmaXg7CisgfQorIAorQEAgLTc2Niw4ICs3NjcsOCBAQAorICAgaWYgKHIx ID09IDApIHJldHVybiBmYWxzZTsKKyAKKyAgIC8qIFNldCBzdWJqZWN0IG5hbWUgKi8KKy0gIFg1 MDlfTkFNRSAqbmFtZSA9IFg1MDlfZ2V0X3N1YmplY3RfbmFtZShjZXJ0KTsKKy0gIHIxID0gWDUw OV9OQU1FX2FkZF9lbnRyeV9ieV90eHQobmFtZSwgIkNOIiwgTUJTVFJJTkdfQVNDLCBzdWJqZWN0 LCAtMSwgLTEsIDApOworKyAgY29uc3QgWDUwOV9OQU1FICpuYW1lID0gWDUwOV9nZXRfc3ViamVj dF9uYW1lKGNlcnQpOworKyAgcjEgPSBYNTA5X05BTUVfYWRkX2VudHJ5X2J5X3R4dCgoWDUwOV9O QU1FKiluYW1lLCAiQ04iLCBNQlNUUklOR19BU0MsIHN1YmplY3QsIC0xLCAtMSwgMCk7CisgICBp ZiAocjEgPT0gMCkgcmV0dXJuIGZhbHNlOworIAorICAgLyogQWRkIGV4dGVuc2lvbiAqLworQEAg LTg3NCw4ICs4NzUsOCBAQAorICAgbV9uYW1lc19vd25lciA9IGZhbHNlOworIH0KKyAKKy1pbnQg Q2VydFN1YmplY3Q6OnNldF9jb21tb25fbmFtZShYNTA5X05BTUUgKm5hbWUsIGNvbnN0IGNoYXIg KnRleHQpIHsKKy0gIHJldHVybiBYNTA5X05BTUVfYWRkX2VudHJ5X2J5X3R4dChuYW1lLCAiQ04i LCBNQlNUUklOR19BU0MsCisraW50IENlcnRTdWJqZWN0OjpzZXRfY29tbW9uX25hbWUoY29uc3Qg WDUwOV9OQU1FICpuYW1lLCBjb25zdCBjaGFyICp0ZXh0KSB7CisrICByZXR1cm4gWDUwOV9OQU1F X2FkZF9lbnRyeV9ieV90eHQoKFg1MDlfTkFNRSopbmFtZSwgIkNOIiwgTUJTVFJJTkdfQVNDLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjb25zdCB1bnNpZ25lZCBjaGFy ICopdGV4dCwgLTEsIC0xLCAwKTsKKyB9CisgCitAQCAtOTAzLDggKzkwNCw4IEBACisgICAgICAg QVNOMV9TVFJJTkcgKnN0ciA9CisgICAgICAgICAgIHN0YXRpY19jYXN0PEFTTjFfU1RSSU5HICo+ KEdFTkVSQUxfTkFNRV9nZXQwX3ZhbHVlKG5hbWUsICZuYW1lX3R5cGUpKTsKKyAgICAgICBpZiAo bmFtZV90eXBlID09IEdFTl9ETlMpIHsKKy0gICAgICAgIGlmIChzdHItPmxlbmd0aCA8IHNpemUp IHNpemUgPSBzdHItPmxlbmd0aDsKKy0gICAgICAgIG1lbWNweShidWZmZXIsIHN0ci0+ZGF0YSwg c2l6ZSk7CisrICAgICAgICBpZiAoQVNOMV9TVFJJTkdfbGVuZ3RoKHN0cikgPCBzaXplKSBzaXpl ID0gQVNOMV9TVFJJTkdfbGVuZ3RoKHN0cik7CisrICAgICAgICBtZW1jcHkoYnVmZmVyLCBBU04x X1NUUklOR19nZXQwX2RhdGEoc3RyKSwgc2l6ZSk7CisgICAgICAgICBidWZmZXJbc2l6ZV0gPSAn XDAnOworICAgICAgICAgbndyaXR0ZW4gPSBzaXplOworICAgICAgIH0KK0BAIC05MjUsOCArOTI2 LDggQEAKKyAgICAgQVNOMV9TVFJJTkcgKnN0ciA9CisgICAgICAgICBzdGF0aWNfY2FzdDxBU04x X1NUUklORyAqPihHRU5FUkFMX05BTUVfZ2V0MF92YWx1ZShuYW1lLCAmbmFtZV90eXBlKSk7Cisg ICAgIGlmIChuYW1lX3R5cGUgPT0gR0VOX0ROUykgeworLSAgICAgIGlmICgoc3RyLT5sZW5ndGgg PT0gOSkgJiYKKy0gICAgICAgICAgKHN0cm5jbXAoImxvY2FsaG9zdCIsIChjb25zdCBjaGFyICop c3RyLT5kYXRhLCA5KSA9PSAwKSkKKysgICAgICBpZiAoKEFTTjFfU1RSSU5HX2xlbmd0aChzdHIp ID09IDkpICYmCisrICAgICAgICAgIChzdHJuY21wKCJsb2NhbGhvc3QiLCAoY2hhciopQVNOMV9T VFJJTkdfZ2V0MF9kYXRhKHN0ciksIDkpID09IDApKQorICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgIH0KKyAgIH0KK0BAIC0xMDAwLDI0ICsxMDAxLDI0IEBACisgICByZXR1cm4gbGVuOworIH0K KyAKKy1ib29sIENlcnRTdWJqZWN0OjpwYXJzZV9uYW1lKFg1MDlfTkFNRSAqbmFtZSkgeworK2Jv b2wgQ2VydFN1YmplY3Q6OnBhcnNlX25hbWUoY29uc3QgWDUwOV9OQU1FICpuYW1lKSB7CisgICBp bnQgaWR4ID0gWDUwOV9OQU1FX2dldF9pbmRleF9ieV9OSUQobmFtZSwgTklEX2NvbW1vbk5hbWUs IC0xKTsKKyAgIGlmIChpZHggPCAwKSByZXR1cm4gZmFsc2U7CistICBYNTA5X05BTUVfRU5UUlkg KmNuID0gWDUwOV9OQU1FX2dldF9lbnRyeShuYW1lLCBpZHgpOworKyAgY29uc3QgWDUwOV9OQU1F X0VOVFJZICpjbiA9IFg1MDlfTkFNRV9nZXRfZW50cnkoKFg1MDlfTkFNRSopbmFtZSwgaWR4KTsK KyAgIGlmIChjbiA9PSBudWxscHRyKSByZXR1cm4gZmFsc2U7CistICBBU04xX1NUUklORyAqc3Ry ID0gWDUwOV9OQU1FX0VOVFJZX2dldF9kYXRhKGNuKTsKKysgIGNvbnN0IEFTTjFfU1RSSU5HICpz dHIgPSBYNTA5X05BTUVfRU5UUllfZ2V0X2RhdGEoY24pOworICAgcmV0dXJuIHBhcnNlX25hbWUo c3RyKTsKKyB9CisgCisgYm9vbCBDZXJ0U3ViamVjdDo6cGFyc2VfbmFtZShjb25zdCBBU04xX1NU UklORyAqc3RyKSB7CisgICBpZiAoc3RyID09IG51bGxwdHIpIHJldHVybiBmYWxzZTsKKy0gIGlm IChzdHItPmxlbmd0aCA9PSAwKSByZXR1cm4gZmFsc2U7CisrICBpZiAoQVNOMV9TVFJJTkdfbGVu Z3RoKHN0cikgPT0gMCkgcmV0dXJuIGZhbHNlOworIAorICAgaW50IHAgPSAwOyAgLy8gY3Vyc29y IGludG8gbmFtZQorLSAgYXV0byBhdEVuZCA9IFsmXSgpIHsgcmV0dXJuIChzdHItPmxlbmd0aCA9 PSBwKTsgfTsKKy0gIGF1dG8gZGF0YSA9IFsmXSgpIHsgcmV0dXJuIChjaGFyICopKHN0ci0+ZGF0 YSkgKyBwOyB9OworKyAgYXV0byBhdEVuZCA9IFsmXSgpIHsgcmV0dXJuIChBU04xX1NUUklOR19s ZW5ndGgoc3RyKSA9PSBwKTsgfTsKKysgIGF1dG8gZGF0YSA9IFsmXSgpIHsgcmV0dXJuIChjaGFy ICopKEFTTjFfU1RSSU5HX2dldDBfZGF0YShzdHIpKSArIHA7IH07CisgICBhdXRvIGZpbmQgPSBb Jl0oY29uc3QgY2hhciAqYSwgc2l6ZV90IGwpIHsKKy0gICAgaWYgKHN0ci0+bGVuZ3RoIDw9IHAp IHJldHVybiBmYWxzZTsKKysgICAgaWYgKEFTTjFfU1RSSU5HX2xlbmd0aChzdHIpIDw9IHApIHJl dHVybiBmYWxzZTsKKyAgICAgaW50IHIgPSBzdHJuY21wKGRhdGEoKSwgYSwgbCk7CisgICAgIGlm IChyID09IDApIHsKKyAgICAgICBwICs9IGw7CitAQCAtMTM1OCwyMSArMTM1OSwyMSBAQAorIAor IGJvb2wgTm9kZUNlcnRpZmljYXRlOjpwYXJzZV9uYW1lKCkgeworICAgaWYgKG1feDUwOSA9PSBu dWxscHRyKSByZXR1cm4gZmFsc2U7CistICBYNTA5X05BTUUgKm5hbWUgPSBYNTA5X2dldF9zdWJq ZWN0X25hbWUobV94NTA5KTsKKysgIGNvbnN0IFg1MDlfTkFNRSAqbmFtZSA9IFg1MDlfZ2V0X3N1 YmplY3RfbmFtZShtX3g1MDkpOworICAgaW50IGlkeCA9IFg1MDlfTkFNRV9nZXRfaW5kZXhfYnlf TklEKG5hbWUsIE5JRF9jb21tb25OYW1lLCAtMSk7CisgICBpZiAoaWR4IDwgMCkgcmV0dXJuIGZh bHNlOworLSAgWDUwOV9OQU1FX0VOVFJZICpjbiA9IFg1MDlfTkFNRV9nZXRfZW50cnkobmFtZSwg aWR4KTsKKysgIGNvbnN0IFg1MDlfTkFNRV9FTlRSWSAqY24gPSBYNTA5X05BTUVfZ2V0X2VudHJ5 KG5hbWUsIGlkeCk7CisgICBpZiAoY24gPT0gbnVsbHB0cikgcmV0dXJuIGZhbHNlOworLSAgQVNO MV9TVFJJTkcgKnN0ciA9IFg1MDlfTkFNRV9FTlRSWV9nZXRfZGF0YShjbik7CisrICBjb25zdCBB U04xX1NUUklORyAqc3RyID0gWDUwOV9OQU1FX0VOVFJZX2dldF9kYXRhKGNuKTsKKyAgIHJldHVy biBDZXJ0U3ViamVjdDo6cGFyc2VfbmFtZShzdHIpOworIH0KKyAKKyBib29sIE5vZGVDZXJ0aWZp Y2F0ZTo6cGFyc2VfbmFtZShjb25zdCBjaGFyICpuYW1lKSB7CisgICBpZiAobmFtZSA9PSBudWxs cHRyKSByZXR1cm4gZmFsc2U7CistICBBU04xX1NUUklORyAqc3RyID0gQVNOMV9TVFJJTkdfbmV3 KCk7CistICBBU04xX1NUUklOR19zZXQoc3RyLCBuYW1lLCBzdHJsZW4obmFtZSkpOworKyAgY29u c3QgQVNOMV9TVFJJTkcgKnN0ciA9IEFTTjFfU1RSSU5HX25ldygpOworKyAgQVNOMV9TVFJJTkdf c2V0KChBU04xX1NUUklORyopc3RyLCBuYW1lLCBzdHJsZW4obmFtZSkpOworICAgYm9vbCByID0g Q2VydFN1YmplY3Q6OnBhcnNlX25hbWUoc3RyKTsKKy0gIEFTTjFfU1RSSU5HX2ZyZWUoc3RyKTsK KysgIEFTTjFfU1RSSU5HX2ZyZWUoKEFTTjFfU1RSSU5HKilzdHIpOworICAgcmV0dXJuIHI7Cisg fQorIAorZGlmZiAtTmF1ciBteXNxbC04LjQuOS9zdG9yYWdlL25kYi9zcmMvY29tbW9uL3V0aWwv dGVzdFNlY3VyZVNvY2tldC5jcHAgbXlzcWwtOC40LjlfcGF0Y2hlZC9zdG9yYWdlL25kYi9zcmMv Y29tbW9uL3V0aWwvdGVzdFNlY3VyZVNvY2tldC5jcHAKKy0tLSBteXNxbC04LjQuOS9zdG9yYWdl L25kYi9zcmMvY29tbW9uL3V0aWwvdGVzdFNlY3VyZVNvY2tldC5jcHAJMjAyNi0wNC0wNyAxNzo0 NzozOC4wMDAwMDAwMDAgKzAyMDAKKysrKyBteXNxbC04LjQuOV9wYXRjaGVkL3N0b3JhZ2UvbmRi L3NyYy9jb21tb24vdXRpbC90ZXN0U2VjdXJlU29ja2V0LmNwcAkyMDI2LTA1LTEyIDEyOjE4OjQ1 LjIzMTc2NTY2OCArMDIwMAorQEAgLTIyMCw3ICsyMjAsNyBAQAorICAgWDUwOV9zZXRfcHVia2V5 KHRsc19jZXJ0LCB0bHNfa2V5KTsKKyAKKyAgIC8qIFNldCB0aGUgbmFtZXMgKi8KKy0gIFg1MDlf TkFNRSAqbmFtZSA9IFg1MDlfZ2V0X3N1YmplY3RfbmFtZSh0bHNfY2VydCk7CisrICBjb25zdCBY NTA5X05BTUUgKm5hbWUgPSBYNTA5X2dldF9zdWJqZWN0X25hbWUodGxzX2NlcnQpOworICAgWDUw OV9OQU1FX2FkZF9lbnRyeV9ieV90eHQobmFtZSwgIkNOIiwgTUJTVFJJTkdfQVNDLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnN0IHVuc2lnbmVkIGNoYXIgKiljb21tb25fbmFt ZSwgLTEsIC0xLCAwKTsKKyAgIFg1MDlfc2V0X2lzc3Vlcl9uYW1lKHRsc19jZXJ0LCBYNTA5X2dl dF9zdWJqZWN0X25hbWUodGxzX2NlcnQpKTsKCmRpZmYgLS1naXQgYS9teXNxbDguNC5zcGVjIGIv bXlzcWw4LjQuc3BlYwppbmRleCBmYzFkNmJhLi4zNTNiNjc1IDEwMDY0NAotLS0gYS9teXNxbDgu NC5zcGVjCisrKyBiL215c3FsOC40LnNwZWMKQEAgLTE0MSw2ICsxNDEsNyBAQCBQYXRjaDUxOiAg ICAgICAgICAle3BrZ25hbWVwYXRjaH0tc2hhcmVkaXIucGF0Y2gKIFBhdGNoNTI6ICAgICAgICAg ICV7cGtnbmFtZXBhdGNofS1ycGF0aC5wYXRjaAogUGF0Y2g1NDogICAgICAgICAgJXtwa2duYW1l cGF0Y2h9LWdjYy0xNS5wYXRjaAogUGF0Y2g1NjogICAgICAgICAgJXtwa2duYW1lcGF0Y2h9LWZs dXNoLWxvZ3JvdGF0ZS5wYXRjaAorUGF0Y2g1NzogICAgICAgICAgJXtwa2duYW1lcGF0Y2h9LWZp eC1jb21waWxhdGlvbi13aXRoLW9wZW5zc2w0LnBhdGNoCiAKICMgUGF0Y2hlcyB0YWtlbiBmcm9t IGJvb3N0IDEuNTkKIFBhdGNoMTEyOiAgICAgICAgIGJvb3N0LTEuNTcuMC1tcGwtcHJpbnQucGF0 Y2gK