rpm/openssl-1_1
SHA256
1
0
Fork 0
forked from pool/openssl-1_1
Code Pull Requests Activity

Accepting request 954341 from security:tls

Browse Source 
- Pull libopenssl-1_1 when updating openssl-1_1 with the same
  version. [bsc#1195792]

- FIPS: Fix function and reason error codes [bsc#1182959]
  * Add openssl-1_1-FIPS-fix-error-reason-codes.patch

OBS-URL: https://build.opensuse.org/request/show/954341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2022-02-15 22:56:57 +00:00 committed by Git OBS Bridge
commit bcde5a1d7a
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
openssl-1_1-FIPS-fix-error-reason-codes.patch Normal file
View File

@ -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 <openssl/asyncerr.h>
#include <openssl/kdferr.h>
#include <openssl/storeerr.h>
+#include <openssl/fips.h>
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

12
openssl-1_1.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Feb 11 12:32:11 UTC 2022 - Pedro Monreal <pmonreal@suse.com>
- 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 <pmonreal@suse.com>
- 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 <pmonreal@suse.com>

4
openssl-1_1.spec
View File

@ -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