Fix UEFI builds on double function definitions
Resolves: RHEL-93168
This commit is contained in:
parent
062693b2b8
commit
63b528e647
39
0060-Fixup-no-dup-versions-for-UEFI.patch
Normal file
39
0060-Fixup-no-dup-versions-for-UEFI.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 8f95c832f03005c903a6a990cee49346c556be0f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dmitry Belyavskiy <beldmit@gmail.com>
|
||||||
|
Date: Thu, 22 May 2025 13:22:12 +0200
|
||||||
|
Subject: [PATCH 60/60] Fixup - no dup versions for UEFI
|
||||||
|
|
||||||
|
---
|
||||||
|
crypto/evp/digest.c | 2 +-
|
||||||
|
crypto/evp/evp_enc.c | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
|
||||||
|
index 3c80b9dfe1..8ee9db73dd 100644
|
||||||
|
--- a/crypto/evp/digest.c
|
||||||
|
+++ b/crypto/evp/digest.c
|
||||||
|
@@ -573,7 +573,7 @@ int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *md, size_t size)
|
||||||
|
}
|
||||||
|
|
||||||
|
EVP_MD_CTX
|
||||||
|
-#if !defined(FIPS_MODULE)
|
||||||
|
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_SYS_UEFI)
|
||||||
|
__attribute__ ((symver ("EVP_MD_CTX_dup@@OPENSSL_3.1.0"),
|
||||||
|
symver ("EVP_MD_CTX_dup@OPENSSL_3.2.0")))
|
||||||
|
#endif
|
||||||
|
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
|
||||||
|
index 7c51786515..619cf4f385 100644
|
||||||
|
--- a/crypto/evp/evp_enc.c
|
||||||
|
+++ b/crypto/evp/evp_enc.c
|
||||||
|
@@ -1763,7 +1763,7 @@ int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
|
||||||
|
}
|
||||||
|
|
||||||
|
EVP_CIPHER_CTX
|
||||||
|
-#if !defined(FIPS_MODULE)
|
||||||
|
+#if !defined(FIPS_MODULE) && !defined(OPENSSL_SYS_UEFI)
|
||||||
|
__attribute__ ((symver ("EVP_CIPHER_CTX_dup@@OPENSSL_3.1.0"),
|
||||||
|
symver ("EVP_CIPHER_CTX_dup@OPENSSL_3.2.0")))
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.49.0
|
||||||
|
|
@ -99,6 +99,7 @@ Patch0056: 0056-hashfunc-add-stddef.h-include.patch
|
|||||||
Patch0057: 0057-rio-add-RIO_POLL_METHOD_NONE.patch
|
Patch0057: 0057-rio-add-RIO_POLL_METHOD_NONE.patch
|
||||||
Patch0058: 0058-apps-x509.c-Fix-the-addreject-option-adding-trust-in.patch
|
Patch0058: 0058-apps-x509.c-Fix-the-addreject-option-adding-trust-in.patch
|
||||||
Patch0059: 0059-Fixup-permit-SHA1-as-MGF1-digest.patch
|
Patch0059: 0059-Fixup-permit-SHA1-as-MGF1-digest.patch
|
||||||
|
Patch0060: 0060-Fixup-no-dup-versions-for-UEFI.patch
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
URL: http://www.openssl.org/
|
URL: http://www.openssl.org/
|
||||||
@ -440,6 +441,8 @@ touch $RPM_BUILD_ROOT/%{_prefix}/include/openssl/engine.h
|
|||||||
* Thu May 22 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.5.0-4
|
* Thu May 22 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.5.0-4
|
||||||
- Fix regressions caused by rebase to OpenSSL 3.5
|
- Fix regressions caused by rebase to OpenSSL 3.5
|
||||||
Related: RHEL-80811
|
Related: RHEL-80811
|
||||||
|
- Fix UEFI builds on double function definitions
|
||||||
|
Resolves: RHEL-93168
|
||||||
|
|
||||||
* Wed May 14 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.5.0-3
|
* Wed May 14 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.5.0-3
|
||||||
- Fix `openssl speed` running in FIPS mode
|
- Fix `openssl speed` running in FIPS mode
|
||||||
|
Loading…
Reference in New Issue
Block a user