rpms
/
openssl
8
1
Fork 0
Code Issues Pull Requests Releases Activity

Adjusting include for the FIPS_mode macro 

Resolves: rhbz#2083879
This commit is contained in:
Dmitry Belyavskiy 2022-11-28 16:49:42 +01:00
parent d60bf2b343
commit c29e183891
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
0008-Add-FIPS_mode-compatibility-macro.patch
View File

@ -12,24 +12,12 @@ default context.
3 files changed, 39 insertions(+) 3 files changed, 39 insertions(+)
create mode 100644 include/openssl/fips.h create mode 100644 include/openssl/fips.h
diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in
index 1036da9a2b..9d4896fcaf 100644
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -38,6 +38,7 @@ use OpenSSL::stackhash qw(generate_stack_macros);
# include <openssl/opensslconf.h>
# include <openssl/cryptoerr.h>
# include <openssl/core.h>
+# include <openssl/fips.h>
# ifdef CHARSET_EBCDIC
# include <openssl/ebcdic.h>
diff --git a/include/openssl/fips.h b/include/openssl/fips.h diff --git a/include/openssl/fips.h b/include/openssl/fips.h
new file mode 100644 new file mode 100644
index 0000000000..c64f0f8e8f index 0000000000..c64f0f8e8f
--- /dev/null --- /dev/null
+++ b/include/openssl/fips.h +++ b/include/openssl/fips.h
@@ -0,0 +1,25 @@ @@ -0,0 +1,26 @@
+/* +/*
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * + *
@ -43,6 +31,7 @@ index 0000000000..c64f0f8e8f
+# define OPENSSL_FIPS_H +# define OPENSSL_FIPS_H
+# pragma once +# pragma once
+ +
+# include <openssl/evp.h>
+# include <openssl/macros.h> +# include <openssl/macros.h>
+ +
+# ifdef __cplusplus +# ifdef __cplusplus
@ -58,10 +47,11 @@ index 0000000000..c64f0f8e8f
diff -up openssl-3.0.0-beta1/test/property_test.c.fips-macro openssl-3.0.0-beta1/test/property_test.c diff -up openssl-3.0.0-beta1/test/property_test.c.fips-macro openssl-3.0.0-beta1/test/property_test.c
--- openssl-3.0.0-beta1/test/property_test.c.fips-macro 2021-06-29 12:14:58.851557698 +0200 --- openssl-3.0.0-beta1/test/property_test.c.fips-macro 2021-06-29 12:14:58.851557698 +0200
+++ openssl-3.0.0-beta1/test/property_test.c 2021-06-29 12:17:14.630143832 +0200 +++ openssl-3.0.0-beta1/test/property_test.c 2021-06-29 12:17:14.630143832 +0200
@@ -488,6 +488,18 @@ static int test_property_list_to_string( @@ -488,6 +488,19 @@ static int test_property_list_to_string(
return ret; return ret;
} }
+#include <openssl/fips.h>
+static int test_downstream_FIPS_mode(void) +static int test_downstream_FIPS_mode(void)
+{ +{
+ int ret = 0; + int ret = 0;

2
openssl.spec
View File

@ -486,6 +486,8 @@ install -m644 %{SOURCE9} \
Resolves: rhbz#2133809 Resolves: rhbz#2133809
- Removed recommended package for openssl-libs - Removed recommended package for openssl-libs
Resolves: rhbz#2093804 Resolves: rhbz#2093804
- Adjusting include for the FIPS_mode macro
Resolves: rhbz#2083879
* Tue Nov 22 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.0.7-1 * Tue Nov 22 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.0.7-1
- Rebasing to OpenSSL 3.0.7 - Rebasing to OpenSSL 3.0.7