Accepting request 1116068 from security:tls

OBS-URL: https://build.opensuse.org/request/show/1116068
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=52

openssl-1_1-fips-bsc1215215_fips_in_version_string.patch

@@ -0,0 +1,46 @@
+---
+ include/openssl/opensslconf.h.in |   10 +++++-----
+ include/openssl/opensslv.h       |    6 +++++-
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+--- a/include/openssl/opensslconf.h.in
++++ b/include/openssl/opensslconf.h.in
+@@ -9,6 +9,11 @@
+  * https://www.openssl.org/source/license.html
+  */
+ 
++/* Always build FIPS module */
++#ifndef OPENSSL_FIPS
++# define OPENSSL_FIPS
++#endif
++
+ #include <openssl/opensslv.h>
+ 
+ #ifdef  __cplusplus
+@@ -155,11 +160,6 @@ extern "C" {
+ 
+ #define RC4_INT {- $config{rc4_int} -}
+ 
+-/* Always build FIPS module */
+-#ifndef OPENSSL_FIPS
+-# define OPENSSL_FIPS
+-#endif
+-
+ #ifdef  __cplusplus
+ }
+ #endif
+--- a/include/openssl/opensslv.h
++++ b/include/openssl/opensslv.h
+@@ -40,7 +40,11 @@ extern "C" {
+  *  major minor fix final patch/beta)
+  */
+ # define OPENSSL_VERSION_NUMBER  0x1010117fL
+-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1w  11 Sep 2023"
++# ifdef OPENSSL_FIPS
++#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1w-fips  11 Sep 2023"
++# else
++#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1w  11 Sep 2023"
++# endif
+ 
+ /*-
+  * The macros below are to be used for shared library (.so, .dll, ...)

openssl-1_1.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  4 07:15:29 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
+
+- Displays "fips" in the version string (bsc#1215215)
+  * Add openssl-1_1-fips-bsc1215215_fips_in_version_string.patch
+
 -------------------------------------------------------------------
 Tue Sep 12 05:09:28 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
 

openssl-1_1.spec

@@ -175,7 +175,8 @@ Patch105:       openssl-1_1-ossl-sli-008-pbkdf2-salt_pass_iteration.patch
 Patch106:       openssl-s_client-check-ocsp-status.patch
 # PATCH-FIX-SUSE bsc#1213517 Dont pass zero length input to EVP_Cipher
 Patch107:       openssl-dont-pass-zero-length-input-to-EVP_Cipher.patch
-
+#PATCH-FIX-SUSE bsc#1215215 FIPS: Add "fips" to version string
+Patch108:       openssl-1_1-fips-bsc1215215_fips_in_version_string.patch
 BuildRequires:  jitterentropy-devel >= 3.4.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(zlib)