f18ebf3adf
- Skip SHA1 test in 20-test_dgst.t when in FIPS mode
* Add openssl-Skip_SHA1-test-in-FIPS-mode.patch
- FIPS: add openssl-1_1-fips-bsc1190652_release_num_in_version_string.patch
* bsc#1190652 - Provide a service to output module name/identifier
and version
- Sync patches with SLE:
* Merge openssl-keep_EVP_KDF_functions_version.patch into
openssl-1.1.1-evp-kdf.patch
* Refresh openssl-1_1-fips-bsc1215215_fips_in_version_string.patch
* Remove openssl-no-date.patch
OBS-URL: https://build.opensuse.org/request/show/1128352
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=152
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
---
|
|
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, ...)
|