openssl-1_1/openssl-1_1-fips-bsc1215215_fips_in_version_string.patch

47 lines
1.3 KiB
Diff
Raw Normal View History

---
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 SUSE release " SUSE_OPENSSL_STRING_PARAM_FUNCB(SUSE_OPENSSL_RELEASE)
+# ifdef OPENSSL_FIPS
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-fips 11 Sep 2023 SUSE release " SUSE_OPENSSL_STRING_PARAM_FUNCB(SUSE_OPENSSL_RELEASE)
+# else
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w 11 Sep 2023 SUSE release " SUSE_OPENSSL_STRING_PARAM_FUNCB(SUSE_OPENSSL_RELEASE)
+# endif
/*-
* The macros below are to be used for shared library (.so, .dll, ...)