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: Tomas Mraz To: git-commits@fedoraproject.org Subject: [rpms/openssl] rebase_40beta: fix regression in EVP_PBE_scrypt() (#1688284) Date: Tue, 09 Jun 2026 12:44:26 GMT Message-ID: <178100906620.1.15303980151203044970.rpms-openssl-c99b8bf7f97f@fedoraproject.org> List-ID: X-Git-Repo: rpms/openssl X-Git-Branch: rebase_40beta X-Git-Rev: c99b8bf7f97fa320fa92a7e33543c13276e3a2fe ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvb3BlbnNzbAogICAgICAgICAgICBCcmFuY2ggOiByZWJhc2VfNDBiZXRhCiAg ICAgICAgICAgIENvbW1pdCA6IGM5OWI4YmY3Zjk3ZmEzMjBmYTkyYTdlMzM1NDNjMTMyNzZlM2Ey ZmUKICAgICAgICAgICAgQXV0aG9yIDogVG9tYXMgTXJheiA8dG1yYXpAZmVkb3JhcHJvamVjdC5v cmc+CiAgICAgICAgICAgIERhdGUgICA6IDIwMTktMDMtMTVUMTY6MDU6MDIrMDE6MDAKICAgICAg ICAgICAgU3RhdHMgIDogKzIzLy0xNSBpbiA0IGZpbGUocykKICAgICAgICAgICAgVVJMICAgIDog aHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9vcGVuc3NsL2MvYzk5YjhiZjdmOTdm YTMyMGZhOTJhN2UzMzU0M2MxMzI3NmUzYTJmZT9icmFuY2g9cmViYXNlXzQwYmV0YQoKICAgICAg ICAgICAgTG9nOgogICAgICAgICAgICBmaXggcmVncmVzc2lvbiBpbiBFVlBfUEJFX3NjcnlwdCgp ICgjMTY4ODI4NCkKCmZpeCBpbmNvcnJlY3QgaGVscCBtZXNzYWdlIGluIGNhIGFwcCAoIzE1NTMy MDYpCgotLS0KZGlmZiAtLWdpdCBhL29wZW5zc2wtMS4xLjAtYXBwcy1kZ3N0LnBhdGNoIGIvb3Bl bnNzbC0xLjEuMC1hcHBzLWRnc3QucGF0Y2gKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IGFmMTA2ODQuLjAwMDAwMDAKLS0tIGEvb3BlbnNzbC0xLjEuMC1hcHBzLWRnc3QucGF0Y2gKKysr IC9kZXYvbnVsbApAQCAtMSwxMiArMCwwIEBACi1kaWZmIC11cCBvcGVuc3NsLTEuMS4wLXByZTUv YXBwcy9jYS5jLmRnc3Qgb3BlbnNzbC0xLjEuMC1wcmU1L2FwcHMvY2EuYwotLS0tIG9wZW5zc2wt MS4xLjAtcHJlNS9hcHBzL2NhLmMuZGdzdAkyMDE2LTA0LTE5IDE2OjU3OjUyLjAwMDAwMDAwMCAr MDIwMAotKysrIG9wZW5zc2wtMS4xLjAtcHJlNS9hcHBzL2NhLmMJMjAxNi0wNy0xOCAxNTo1ODox OC41MTY3NDI2ODIgKzAyMDAKLUBAIC0yMTYsNyArMjE2LDcgQEAgT1BUSU9OUyBjYV9vcHRpb25z W10gPSB7Ci0gICAgIHsiZW5kZGF0ZSIsIE9QVF9FTkREQVRFLCAncycsCi0gICAgICAiWVlNTURE SEhNTVNTWiBjZXJ0IG5vdEFmdGVyIChvdmVycmlkZXMgLWRheXMpIn0sCi0gICAgIHsiZGF5cyIs IE9QVF9EQVlTLCAncCcsICJOdW1iZXIgb2YgZGF5cyB0byBjZXJ0aWZ5IHRoZSBjZXJ0IGZvciJ9 LAotLSAgICB7Im1kIiwgT1BUX01ELCAncycsICJtZCB0byB1c2U7IG9uZSBvZiBtZDIsIG1kNSwg c2hhIG9yIHNoYTEifSwKLSsgICAgeyJtZCIsIE9QVF9NRCwgJ3MnLCAibWQgdG8gdXNlOyBzZWUg b3BlbnNzbCBkZ3N0IC1oIGZvciBsaXN0In0sCi0gICAgIHsicG9saWN5IiwgT1BUX1BPTElDWSwg J3MnLCAiVGhlIENBICdwb2xpY3knIHRvIHN1cHBvcnQifSwKLSAgICAgeyJrZXlmaWxlIiwgT1BU X0tFWUZJTEUsICdzJywgIlByaXZhdGUga2V5In0sCi0gICAgIHsia2V5Zm9ybSIsIE9QVF9LRVlG T1JNLCAnZicsICJQcml2YXRlIGtleSBmaWxlIGZvcm1hdCAoUEVNIG9yIEVOR0lORSkifSwKCmRp ZmYgLS1naXQgYS9vcGVuc3NsLTEuMS4xLWFwcHMtZGdzdC5wYXRjaCBiL29wZW5zc2wtMS4xLjEt YXBwcy1kZ3N0LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY1NWI2 ZTIKLS0tIC9kZXYvbnVsbAorKysgYi9vcGVuc3NsLTEuMS4xLWFwcHMtZGdzdC5wYXRjaApAQCAt MCwwICsxLDEyIEBACitkaWZmIC11cCBvcGVuc3NsLTEuMS4xYi9hcHBzL2NhLmMuZGdzdCBvcGVu c3NsLTEuMS4xYi9hcHBzL2NhLmMKKy0tLSBvcGVuc3NsLTEuMS4xYi9hcHBzL2NhLmMuZGdzdAky MDE5LTAyLTI2IDE1OjE1OjMwLjAwMDAwMDAwMCArMDEwMAorKysrIG9wZW5zc2wtMS4xLjFiL2Fw cHMvY2EuYwkyMDE5LTAzLTE1IDE1OjUzOjQ2LjYyMjI2NzY4OCArMDEwMAorQEAgLTE2OSw3ICsx NjksNyBAQCBjb25zdCBPUFRJT05TIGNhX29wdGlvbnNbXSA9IHsKKyAgICAgeyJlbmRkYXRlIiwg T1BUX0VORERBVEUsICdzJywKKyAgICAgICJZWU1NRERISE1NU1NaIGNlcnQgbm90QWZ0ZXIgKG92 ZXJyaWRlcyAtZGF5cykifSwKKyAgICAgeyJkYXlzIiwgT1BUX0RBWVMsICdwJywgIk51bWJlciBv ZiBkYXlzIHRvIGNlcnRpZnkgdGhlIGNlcnQgZm9yIn0sCistICAgIHsibWQiLCBPUFRfTUQsICdz JywgIm1kIHRvIHVzZTsgb25lIG9mIG1kMiwgbWQ1LCBzaGEgb3Igc2hhMSJ9LAorKyAgICB7Im1k IiwgT1BUX01ELCAncycsICJtZCB0byB1c2U7IHNlZSBvcGVuc3NsIGhlbHAgZm9yIGxpc3QifSwK KyAgICAgeyJwb2xpY3kiLCBPUFRfUE9MSUNZLCAncycsICJUaGUgQ0EgJ3BvbGljeScgdG8gc3Vw cG9ydCJ9LAorICAgICB7ImtleWZpbGUiLCBPUFRfS0VZRklMRSwgJ3MnLCAiUHJpdmF0ZSBrZXki fSwKKyAgICAgeyJrZXlmb3JtIiwgT1BUX0tFWUZPUk0sICdmJywgIlByaXZhdGUga2V5IGZpbGUg Zm9ybWF0IChQRU0gb3IgRU5HSU5FKSJ9LAoKZGlmZiAtLWdpdCBhL29wZW5zc2wtMS4xLjEtZXZw LWtkZi5wYXRjaCBiL29wZW5zc2wtMS4xLjEtZXZwLWtkZi5wYXRjaAppbmRleCBlNzFkODRhLi40 ODE2OWZhIDEwMDY0NAotLS0gYS9vcGVuc3NsLTEuMS4xLWV2cC1rZGYucGF0Y2gKKysrIGIvb3Bl bnNzbC0xLjEuMS1ldnAta2RmLnBhdGNoCkBAIC02MzQsNyArNjM0LDcgQEAgZGlmZiAtdXAgb3Bl bnNzbC0xLjEuMWIvY3J5cHRvL2V2cC9wYmVfc2NyeXB0LmMuZXZwLWtkZiBvcGVuc3NsLTEuMS4x Yi9jcnlwdG8vZXYKICAvKgogICAqIE1heGltdW0gcGVybWl0dGVkIG1lbW9yeSBhbGxvdyB0aGlz IHRvIGJlIG92ZXJyaWRkZW4gd2l0aCBDb25maWd1cmF0aW9uCiAgICogb3B0aW9uOiBlLmcuIC1E U0NSWVBUX01BWF9NRU09MCBmb3IgbWF4aW11bSBwb3NzaWJsZS4KLUBAIC0xNjAsMTA3ICszNywz OSBAQCBpbnQgRVZQX1BCRV9zY3J5cHQoY29uc3QgY2hhciAqcGFzcywgc2l6CitAQCAtMTYwLDEw NyArMzcsNDMgQEAgaW50IEVWUF9QQkVfc2NyeXB0KGNvbnN0IGNoYXIgKnBhc3MsIHNpegogICAg ICAgICAgICAgICAgICAgICB1aW50NjRfdCBOLCB1aW50NjRfdCByLCB1aW50NjRfdCBwLCB1aW50 NjRfdCBtYXhtZW0sCiAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgKmtleSwgc2l6 ZV90IGtleWxlbikKICB7CkBAIC03MDYsNiArNzA2LDEwIEBAIGRpZmYgLXVwIG9wZW5zc2wtMS4x LjFiL2NyeXB0by9ldnAvcGJlX3NjcnlwdC5jLmV2cC1rZGYgb3BlbnNzbC0xLjEuMWIvY3J5cHRv L2V2CiArICAgIGlmIChwYXNzID09IE5VTEwpIHsKICsgICAgICAgIHBhc3MgPSBlbXB0eTsKICsg ICAgICAgIHBhc3NsZW4gPSAwOworKyAgICB9CisrICAgIGlmIChzYWx0ID09IE5VTEwpIHsKKysg ICAgICAgIHNhbHQgPSAoY29uc3QgdW5zaWduZWQgY2hhciAqKWVtcHR5OworKyAgICAgICAgc2Fs dGxlbiA9IDA7CiAgICAgIH0KIC0KICAgICAgaWYgKG1heG1lbSA9PSAwKQoKZGlmZiAtLWdpdCBh L29wZW5zc2wuc3BlYyBiL29wZW5zc2wuc3BlYwppbmRleCA5Yzg5YmFiLi5mNWI1ODQ1IDEwMDY0 NAotLS0gYS9vcGVuc3NsLnNwZWMKKysrIGIvb3BlbnNzbC5zcGVjCkBAIC0yMiw3ICsyMiw3IEBA CiBTdW1tYXJ5OiBVdGlsaXRpZXMgZnJvbSB0aGUgZ2VuZXJhbCBwdXJwb3NlIGNyeXB0b2dyYXBo eSBsaWJyYXJ5IHdpdGggVExTIGltcGxlbWVudGF0aW9uCiBOYW1lOiBvcGVuc3NsCiBWZXJzaW9u OiAxLjEuMWIKLVJlbGVhc2U6IDIlez9kaXN0fQorUmVsZWFzZTogMyV7P2Rpc3R9CiBFcG9jaDog MQogIyBXZSBoYXZlIHRvIHJlbW92ZSBjZXJ0YWluIHBhdGVudGVkIGFsZ29yaXRobXMgZnJvbSB0 aGUgb3BlbnNzbCBzb3VyY2UKICMgdGFyYmFsbCB3aXRoIHRoZSBob2JibGUtb3BlbnNzbCBzY3Jp cHQgd2hpY2ggaXMgaW5jbHVkZWQgYmVsb3cuCkBAIC00Nyw3ICs0Nyw3IEBAIFBhdGNoMjE6IG9w ZW5zc2wtMS4xLjAtaXNzdWVyLWhhc2gucGF0Y2gKICMgRnVuY3Rpb25hbGl0eSBjaGFuZ2VzCiBQ YXRjaDMxOiBvcGVuc3NsLTEuMS4xLWNvbmYtcGF0aHMucGF0Y2gKIFBhdGNoMzI6IG9wZW5zc2wt MS4xLjEtdmVyc2lvbi1hZGQtZW5naW5lcy5wYXRjaAotUGF0Y2gzMzogb3BlbnNzbC0xLjEuMC1h cHBzLWRnc3QucGF0Y2gKK1BhdGNoMzM6IG9wZW5zc2wtMS4xLjEtYXBwcy1kZ3N0LnBhdGNoCiBQ YXRjaDM2OiBvcGVuc3NsLTEuMS4xLW5vLWJyYWlucG9vbC5wYXRjaAogUGF0Y2gzNzogb3BlbnNz bC0xLjEuMS1lYy1jdXJ2ZXMucGF0Y2gKIFBhdGNoMzg6IG9wZW5zc2wtMS4xLjEtbm8td2Vhay12 ZXJpZnkucGF0Y2gKQEAgLTQ0OCw2ICs0NDgsMTAgQEAgZXhwb3J0IExEX0xJQlJBUllfUEFUSAog JWxkY29uZmlnX3NjcmlwdGxldHMgbGlicwogCiAlY2hhbmdlbG9nCisqIEZyaSBNYXIgMTUgMjAx OSBUb23DocWhIE1yw6F6IDx0bXJhekByZWRoYXQuY29tPiAxLjEuMWItMworLSBmaXggcmVncmVz c2lvbiBpbiBFVlBfUEJFX3NjcnlwdCgpICgjMTY4ODI4NCkKKy0gZml4IGluY29ycmVjdCBoZWxw IG1lc3NhZ2UgaW4gY2EgYXBwICgjMTU1MzIwNikKKwogKiBGcmkgTWFyICAxIDIwMTkgVG9tw6HF oSBNcsOheiA8dG1yYXpAcmVkaGF0LmNvbT4gMS4xLjFiLTIKIC0gdXNlIC5pbmNsdWRlID0gc3lu dGF4IGluIHRoZSBjb25maWcgZmlsZSB0byBhbGxvdyBpdAogICB0byBiZSBwYXJzZWQgYnkgMS4w LjIgdmVyc2lvbiAoIzE2Njg5MTYpCg==