diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-07-01 17:41:02 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-07-06 10:52:27 +1000 |
| commit | 3f773c911a03c5be2eff00beaf94e88f1d997b22 (patch) | |
| tree | dbfe1a171b0a504548c992804cbc71a1661b5b6b /crypto/ec | |
| parent | 1627a41f1db38c0e762cbbcb452a869924370561 (diff) | |
fips module header inclusion fine-tunning
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15974)
Diffstat (limited to 'crypto/ec')
| -rw-r--r-- | crypto/ec/ec_backend.c | 5 | ||||
| -rw-r--r-- | crypto/ec/ec_key.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ec_kmeth.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ecx_backend.c | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c index 9b4467f2be..381da71f33 100644 --- a/crypto/ec/ec_backend.c +++ b/crypto/ec/ec_backend.c @@ -17,7 +17,10 @@ #include <openssl/objects.h> #include <openssl/params.h> #include <openssl/err.h> -#include <openssl/engine.h> +#ifndef FIPS_MODULE +# include <openssl/engine.h> +# include <openssl/x509.h> +#endif #include "crypto/bn.h" #include "crypto/ec.h" #include "ec_local.h" diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index ba6b8df514..eb14f4e409 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -19,7 +19,9 @@ #include "ec_local.h" #include "internal/refcount.h" #include <openssl/err.h> -#include <openssl/engine.h> +#ifndef FIPS_MODULE +# include <openssl/engine.h> +#endif #include <openssl/self_test.h> #include "prov/providercommon.h" #include "crypto/bn.h" diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index 91b7a44082..8c011635cb 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -15,7 +15,9 @@ #include <string.h> #include <openssl/ec.h> -#include <openssl/engine.h> +#ifndef FIPS_MODULE +# include <openssl/engine.h> +#endif #include <openssl/err.h> #include "ec_local.h" diff --git a/crypto/ec/ecx_backend.c b/crypto/ec/ecx_backend.c index 14278592cd..a0144d5a86 100644 --- a/crypto/ec/ecx_backend.c +++ b/crypto/ec/ecx_backend.c @@ -13,6 +13,9 @@ #include <openssl/ec.h> #include <openssl/rand.h> #include <openssl/err.h> +#ifndef FIPS_MODULE +# include <openssl/x509.h> +#endif #include "crypto/ecx.h" #include "ecx_backend.h" |