From 67bb06894f278ebffa420ab704c063b5d1925614 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Tue, 21 Nov 2023 12:11:01 +0100 Subject: [PATCH] Avoid implicit function declaration when building openssl Related: RHEL-1780 --- 0056-strcasecmp.patch | 4 ++-- openssl.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/0056-strcasecmp.patch b/0056-strcasecmp.patch index 8a005e6..01ca25e 100644 --- a/0056-strcasecmp.patch +++ b/0056-strcasecmp.patch @@ -19,7 +19,7 @@ diff -up openssl-3.0.7/crypto/o_str.c.cmp openssl-3.0.7/crypto/o_str.c -int OPENSSL_strcasecmp(const char *s1, const char *s2) +int -+#ifndef FIPS_MODULE ++#if !defined(FIPS_MODULE) && !defined(OPENSSL_SYS_UEFI) +__attribute__ ((symver ("OPENSSL_strcasecmp@@OPENSSL_3.0.3"), + symver ("OPENSSL_strcasecmp@OPENSSL_3.0.1"))) +#endif @@ -33,7 +33,7 @@ diff -up openssl-3.0.7/crypto/o_str.c.cmp openssl-3.0.7/crypto/o_str.c -int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n) +int -+#ifndef FIPS_MODULE ++#if !defined(FIPS_MODULE) && !defined(OPENSSL_SYS_UEFI) +__attribute__ ((symver ("OPENSSL_strncasecmp@@OPENSSL_3.0.3"), + symver ("OPENSSL_strncasecmp@OPENSSL_3.0.1"))) +#endif diff --git a/openssl.spec b/openssl.spec index b3b5ac6..c57abe2 100644 --- a/openssl.spec +++ b/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: 25%{?dist} +Release: 26%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -529,6 +529,10 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco %ldconfig_scriptlets libs %changelog +* Tue Nov 21 2023 Dmitry Belyavskiy - 1:3.0.7-26 +- Avoid implicit function declaration when building openssl + Related: RHEL-1780 + * Mon Oct 16 2023 Dmitry Belyavskiy - 1:3.0.7-25 - Provide relevant diagnostics when FIPS checksum is corrupted Resolves: RHEL-5317