Revert OL modifications

This commit is contained in:
Andrew Lukoshko 2023-06-22 15:26:47 +00:00
parent a8f16d4332
commit e2e5b66997
2 changed files with 1 additions and 34 deletions

View File

@ -1,29 +0,0 @@
From a194940b0fc62054430ca36b2bcec473a56745a1 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 7 Jul 2022 08:53:21 -0700
Subject: [PATCH] Replace upstream references
Orabug: 34340177
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
---
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

View File

@ -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 <el-errata_ww@oracle.com> - 3.0.7-16.0.1
- Replace upstream references [Orabug: 34340177]
* Wed May 31 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.0.7-16
- Fix possible DoS translating ASN.1 object identifiers
Resolves: CVE-2023-2650