From e2e5b669979d7654df14ce8a7cd60edbf4e743ac Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 22 Jun 2023 15:26:47 +0000 Subject: [PATCH] Revert OL modifications --- .../1000-replace-upstream-references.patch | 29 ------------------- SPECS/openssl.spec | 6 +--- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 SOURCES/1000-replace-upstream-references.patch diff --git a/SOURCES/1000-replace-upstream-references.patch b/SOURCES/1000-replace-upstream-references.patch deleted file mode 100644 index 9519cd7..0000000 --- a/SOURCES/1000-replace-upstream-references.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a194940b0fc62054430ca36b2bcec473a56745a1 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 7 Jul 2022 08:53:21 -0700 -Subject: [PATCH] Replace upstream references - -Orabug: 34340177 - -Signed-off-by: Darren Archibald -Reviewed-by: Laurence Rochfort ---- - apps/fipsinstall.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c -index e978057..67d6957 100644 ---- a/apps/fipsinstall.c -+++ b/apps/fipsinstall.c -@@ -311,7 +311,7 @@ int fipsinstall_main(int argc, char **argv) - EVP_MAC *mac = NULL; - CONF *conf = NULL; - -- BIO_printf(bio_err, "This command is not enabled in the Red Hat Enterprise Linux OpenSSL build, please consult Red Hat documentation to learn how to enable FIPS mode\n"); -+ BIO_printf(bio_err, "This command is not enabled in the Oracle Linux OpenSSL build, please consult Oracle Linux documentation to learn how to enable FIPS mode\n"); - return 1; - - if ((opts = sk_OPENSSL_STRING_new_null()) == NULL) --- -2.27.0 - diff --git a/SPECS/openssl.spec b/SPECS/openssl.spec index da6bd5f..3a2992b 100644 --- a/SPECS/openssl.spec +++ b/SPECS/openssl.spec @@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16)) Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 3.0.7 -Release: 16.0.1%{?dist} +Release: 16%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -167,7 +167,6 @@ Patch105: 0105-CVE-2023-0216-pkcs7-deref.patch Patch106: 0106-CVE-2023-0217-dsa.patch Patch107: 0107-CVE-2023-0286-X400.patch Patch108: 0108-CVE-2023-0401-pkcs7-md.patch -Patch1000: 1000-replace-upstream-references.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2169314 Patch109: 0109-fips-Zeroize-out-in-fips-selftest.patch @@ -521,9 +520,6 @@ install -m644 %{SOURCE9} \ %ldconfig_scriptlets libs %changelog -* Wed Jun 21 2023 EL Errata - 3.0.7-16.0.1 -- Replace upstream references [Orabug: 34340177] - * Wed May 31 2023 Dmitry Belyavskiy - 1:3.0.7-16 - Fix possible DoS translating ASN.1 object identifiers Resolves: CVE-2023-2650