diff --git a/openssl-1_1-FIPS-fix-error-reason-codes.patch b/openssl-1_1-FIPS-fix-error-reason-codes.patch new file mode 100644 index 0000000..a7bb4e1 --- /dev/null +++ b/openssl-1_1-FIPS-fix-error-reason-codes.patch @@ -0,0 +1,38 @@ +Index: openssl-1.1.1l/crypto/err/err_all.c +=================================================================== +--- openssl-1.1.1l.orig/crypto/err/err_all.c ++++ openssl-1.1.1l/crypto/err/err_all.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + int err_load_crypto_strings_int(void) + { +@@ -92,10 +93,11 @@ int err_load_crypto_strings_int(void) + ERR_load_CT_strings() == 0 || + # endif + ERR_load_ASYNC_strings() == 0 || +-#endif + ERR_load_KDF_strings() == 0 || +- ERR_load_OSSL_STORE_strings() == 0) ++ ERR_load_OSSL_STORE_strings() == 0 || ++ ERR_load_FIPS_strings() == 0) + return 0; ++#endif + + return 1; + } +Index: openssl-1.1.1l/crypto/err/openssl.ec +=================================================================== +--- openssl-1.1.1l.orig/crypto/err/openssl.ec ++++ openssl-1.1.1l/crypto/err/openssl.ec +@@ -34,6 +34,7 @@ L ASYNC include/openssl/async.h + L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c + L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c + L OSSL_STORE include/openssl/store.h crypto/store/store_err.c ++L FIPS include/crypto/fips.h crypto/fips/fips_ers.c + + # additional header files to be scanned for function names + L NONE include/openssl/x509_vfy.h NONE diff --git a/openssl-1_1.changes b/openssl-1_1.changes index e50c80a..3538683 100644 --- a/openssl-1_1.changes +++ b/openssl-1_1.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 11 12:32:11 UTC 2022 - Pedro Monreal + +- Pull libopenssl-1_1 when updating openssl-1_1 with the same + version. [bsc#1195792] + +------------------------------------------------------------------- +Fri Feb 4 12:29:24 UTC 2022 - Pedro Monreal + +- FIPS: Fix function and reason error codes [bsc#1182959] + * Add openssl-1_1-FIPS-fix-error-reason-codes.patch + ------------------------------------------------------------------- Thu Feb 3 15:58:29 UTC 2022 - Pedro Monreal diff --git a/openssl-1_1.spec b/openssl-1_1.spec index 3fb93a9..f3e7b73 100644 --- a/openssl-1_1.spec +++ b/openssl-1_1.spec @@ -118,6 +118,9 @@ Patch69: openssl-1_1-Optimize-ppc64.patch Patch70: openssl-1_1-Optimize-RSA-armv8.patch Patch71: openssl-1_1-Optimize-AES-XTS-aarch64.patch Patch72: openssl-1_1-Optimize-AES-GCM-uarchs.patch +#PATCH-FIX-SUSE bsc#1182959 FIPS: Fix function and reason error codes +Patch73: openssl-1_1-FIPS-fix-error-reason-codes.patch +Requires: libopenssl1_1 = %{version}-%{release} BuildRequires: pkgconfig BuildRequires: pkgconfig(zlib) %if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550 @@ -149,6 +152,7 @@ Recommends: ca-certificates-mozilla Suggests: libopenssl1_1-hmac = %{version}-%{release} # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 Obsoletes: libopenssl1_1_0 +Conflicts: %{name} < %{version}-%{release} %description -n libopenssl1_1 OpenSSL is a software library to be used in applications that need to