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: Re-add one hunk of the fips patch accidentally dropped in the rebase. Date: Tue, 09 Jun 2026 12:44:35 GMT Message-ID: <178100907565.1.14028495720724994303.rpms-openssl-10c30b232214@fedoraproject.org> List-ID: X-Git-Repo: rpms/openssl X-Git-Branch: rebase_40beta X-Git-Rev: 10c30b232214e3b6d2f50ec17043fc949f73393a QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvb3BlbnNzbApCcmFu Y2ggOiByZWJhc2VfNDBiZXRhCkNvbW1pdCA6IDEwYzMwYjIzMjIxNGUzYjZkMmY1MGVjMTcwNDNm Yzk0OWY3MzM5M2EKQXV0aG9yIDogVG9tYXMgTXJheiA8dG1yYXpAZmVkb3JhcHJvamVjdC5vcmc+ CkRhdGUgICA6IDIwMTktMDktMjdUMDg6MzY6NTArMDI6MDAKU3RhdHMgIDogKzIzLy01IGluIDEg ZmlsZShzKQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL29wZW5z c2wvYy8xMGMzMGIyMzIyMTRlM2I2ZDJmNTBlYzE3MDQzZmM5NDlmNzMzOTNhP2JyYW5jaD1yZWJh c2VfNDBiZXRhCgpMb2c6ClJlLWFkZCBvbmUgaHVuayBvZiB0aGUgZmlwcyBwYXRjaCBhY2NpZGVu dGFsbHkgZHJvcHBlZCBpbiB0aGUgcmViYXNlLgoKLS0tCmRpZmYgLS1naXQgYS9vcGVuc3NsLTEu MS4xLWZpcHMucGF0Y2ggYi9vcGVuc3NsLTEuMS4xLWZpcHMucGF0Y2gKaW5kZXggOWNjZGNiZi4u ZmQ2NjMzZCAxMDA2NDQKLS0tIGEvb3BlbnNzbC0xLjEuMS1maXBzLnBhdGNoCisrKyBiL29wZW5z c2wtMS4xLjEtZmlwcy5wYXRjaApAQCAtMTEwOCw3ICsxMTA4LDI1IEBAIGRpZmYgLXVwIG9wZW5z c2wtMS4xLjFkL2NyeXB0by9ldnAvZV9hZXMuYy5maXBzIG9wZW5zc2wtMS4xLjFkL2NyeXB0by9l dnAvZV9hZXMuCiAgICAgICAgICAvKiBBbGxvY2F0ZSBtZW1vcnkgZm9yIElWIGlmIG5lZWRlZCAq LwogICAgICAgICAgaWYgKChhcmcgPiBFVlBfTUFYX0lWX0xFTkdUSCkgJiYgKGFyZyA+IGdjdHgt Pml2bGVuKSkgewogICAgICAgICAgICAgIGlmIChnY3R4LT5pdiAhPSBjLT5pdikKLUBAIC0zMzgw LDcgKzMzODUsNyBAQCBzdGF0aWMgaW50IGFlc194dHNfaW5pdF9rZXkoRVZQX0NJUEhFUl9DCitA QCAtMzMxOCwxMSArMzMyMywxNCBAQCBzdGF0aWMgaW50IGFlc19nY21fY2lwaGVyKEVWUF9DSVBI RVJfQ1RYCisgICAgICAgICAgICAgICAgIHwgRVZQX0NJUEhfQ1VTVE9NX0NPUFkgfCBFVlBfQ0lQ SF9DVVNUT01fSVZfTEVOR1RIKQorIAorIEJMT0NLX0NJUEhFUl9jdXN0b20oTklEX2FlcywgMTI4 LCAxLCAxMiwgZ2NtLCBHQ00sCistICAgICAgICAgICAgICAgICAgICBFVlBfQ0lQSF9GTEFHX0FF QURfQ0lQSEVSIHwgQ1VTVE9NX0ZMQUdTKQorKyAgICAgICAgICAgICAgICAgICAgRVZQX0NJUEhf RkxBR19GSVBTIHwgRVZQX0NJUEhfRkxBR19BRUFEX0NJUEhFUiB8CisrICAgICAgICAgICAgICAg ICAgICBDVVNUT01fRkxBR1MpCisgICAgIEJMT0NLX0NJUEhFUl9jdXN0b20oTklEX2FlcywgMTky LCAxLCAxMiwgZ2NtLCBHQ00sCistICAgICAgICAgICAgICAgICAgICBFVlBfQ0lQSF9GTEFHX0FF QURfQ0lQSEVSIHwgQ1VTVE9NX0ZMQUdTKQorKyAgICAgICAgICAgICAgICAgICAgRVZQX0NJUEhf RkxBR19GSVBTIHwgRVZQX0NJUEhfRkxBR19BRUFEX0NJUEhFUiB8CisrICAgICAgICAgICAgICAg ICAgICBDVVNUT01fRkxBR1MpCisgICAgIEJMT0NLX0NJUEhFUl9jdXN0b20oTklEX2FlcywgMjU2 LCAxLCAxMiwgZ2NtLCBHQ00sCistICAgICAgICAgICAgICAgICAgICBFVlBfQ0lQSF9GTEFHX0FF QURfQ0lQSEVSIHwgQ1VTVE9NX0ZMQUdTKQorKyAgICAgICAgICAgICAgICAgICAgRVZQX0NJUEhf RkxBR19GSVBTIHwgRVZQX0NJUEhfRkxBR19BRUFEX0NJUEhFUiB8CisrICAgICAgICAgICAgICAg ICAgICBDVVNUT01fRkxBR1MpCisgCisgc3RhdGljIGludCBhZXNfeHRzX2N0cmwoRVZQX0NJUEhF Ul9DVFggKmMsIGludCB0eXBlLCBpbnQgYXJnLCB2b2lkICpwdHIpCisgeworQEAgLTMzODAsNyAr MzM4OCw3IEBAIHN0YXRpYyBpbnQgYWVzX3h0c19pbml0X2tleShFVlBfQ0lQSEVSX0MKICAgICAg ICAgICAgICAgKiAgICAgICBCRUZPUkUgdXNpbmcgdGhlIGtleXMgaW4gdGhlIFhUUy1BRVMgYWxn b3JpdGhtIHRvIHByb2Nlc3MKICAgICAgICAgICAgICAgKiAgICAgICBkYXRhIHdpdGggdGhlbS4i CiAgICAgICAgICAgICAgICovCkBAIC0xMTE3LDcgKzExMzUsNyBAQCBkaWZmIC11cCBvcGVuc3Ns LTEuMS4xZC9jcnlwdG8vZXZwL2VfYWVzLmMuZmlwcyBvcGVuc3NsLTEuMS4xZC9jcnlwdG8vZXZw L2VfYWVzLgogICAgICAgICAgICAgICAgICBFVlBlcnIoRVZQX0ZfQUVTX1hUU19JTklUX0tFWSwg RVZQX1JfWFRTX0RVUExJQ0FURURfS0VZUyk7CiAgICAgICAgICAgICAgICAgIHJldHVybiAwOwog ICAgICAgICAgICAgIH0KLUBAIC0zNDg0LDYgKzM0ODksMTQgQEAgc3RhdGljIGludCBhZXNfeHRz X2NpcGhlcihFVlBfQ0lQSEVSX0NUWAorQEAgLTM0ODQsNiArMzQ5MiwxNCBAQCBzdGF0aWMgaW50 IGFlc194dHNfY2lwaGVyKEVWUF9DSVBIRVJfQ1RYCiAgICAgICAgICByZXR1cm4gMDsKICAgICAg aWYgKCFvdXQgfHwgIWluIHx8IGxlbiA8IEFFU19CTE9DS19TSVpFKQogICAgICAgICAgcmV0dXJu IDA7CkBAIC0xMTMyLDcgKzExNTAsNyBAQCBkaWZmIC11cCBvcGVuc3NsLTEuMS4xZC9jcnlwdG8v ZXZwL2VfYWVzLmMuZmlwcyBvcGVuc3NsLTEuMS4xZC9jcnlwdG8vZXZwL2VfYWVzLgogICAgICBp ZiAoeGN0eC0+c3RyZWFtKQogICAgICAgICAgKCp4Y3R4LT5zdHJlYW0pIChpbiwgb3V0LCBsZW4s CiAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjdHgtPnh0cy5rZXkxLCB4Y3R4LT54dHMua2V5 MiwKLUBAIC0zNTAxLDggKzM1MTQsMTAgQEAgc3RhdGljIGludCBhZXNfeHRzX2NpcGhlcihFVlBf Q0lQSEVSX0NUWAorQEAgLTM1MDEsOCArMzUxNywxMCBAQCBzdGF0aWMgaW50IGFlc194dHNfY2lw aGVyKEVWUF9DSVBIRVJfQ1RYCiAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgRVZQX0NJUEhf QUxXQVlTX0NBTExfSU5JVCB8IEVWUF9DSVBIX0NUUkxfSU5JVCBcCiAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgRVZQX0NJUEhfQ1VTVE9NX0NPUFkpCiAgCkBAIC0xMTQ1LDcgKzExNjMsNyBA QCBkaWZmIC11cCBvcGVuc3NsLTEuMS4xZC9jcnlwdG8vZXZwL2VfYWVzLmMuZmlwcyBvcGVuc3Ns LTEuMS4xZC9jcnlwdG8vZXZwL2VfYWVzLgogIAogIHN0YXRpYyBpbnQgYWVzX2NjbV9jdHJsKEVW UF9DSVBIRVJfQ1RYICpjLCBpbnQgdHlwZSwgaW50IGFyZywgdm9pZCAqcHRyKQogIHsKLUBAIC0z NzcyLDExICszNzg3LDExIEBAIHN0YXRpYyBpbnQgYWVzX2NjbV9jaXBoZXIoRVZQX0NJUEhFUl9D VFgKK0BAIC0zNzcyLDExICszNzkwLDExIEBAIHN0YXRpYyBpbnQgYWVzX2NjbV9jaXBoZXIoRVZQ X0NJUEhFUl9DVFgKICAjZGVmaW5lIGFlc19jY21fY2xlYW51cCBOVUxMCiAgCiAgQkxPQ0tfQ0lQ SEVSX2N1c3RvbShOSURfYWVzLCAxMjgsIDEsIDEyLCBjY20sIENDTSwKQEAgLTExNjAsNyArMTE3 OCw3IEBAIGRpZmYgLXVwIG9wZW5zc2wtMS4xLjFkL2NyeXB0by9ldnAvZV9hZXMuYy5maXBzIG9w ZW5zc2wtMS4xLjFkL2NyeXB0by9ldnAvZV9hZXMuCiAgCiAgdHlwZWRlZiBzdHJ1Y3QgewogICAg ICB1bmlvbiB7Ci1AQCAtMzg2OSw3ICszODg0LDcgQEAgc3RhdGljIGludCBhZXNfd3JhcF9jaXBo ZXIoRVZQX0NJUEhFUl9DVAorQEAgLTM4NjksNyArMzg4Nyw3IEBAIHN0YXRpYyBpbnQgYWVzX3dy YXBfY2lwaGVyKEVWUF9DSVBIRVJfQ1QKICAgICAgcmV0dXJuIHJ2ID8gKGludClydiA6IC0xOwog IH0KICAK