diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-06-03 15:22:05 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-06-04 17:06:47 +0200 |
commit | 085e3cecbdadde10e93abfb4dbd3e865aeed58d6 (patch) | |
tree | fdb56464e81404811e5254b8953bb6b83b70a139 /providers | |
parent | 51cda01c61870c2433fbbd54d69f2267362ea608 (diff) |
Move libssl related defines used by fips provider to prov_ssl.h
This nicely reduces the number of files considered as fips
provider sources.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15609)
Diffstat (limited to 'providers')
5 files changed, 6 insertions, 6 deletions
diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c index 781acae8db..f6d95197f0 100644 --- a/providers/common/capabilities.c +++ b/providers/common/capabilities.c @@ -12,7 +12,7 @@ #include <openssl/core_dispatch.h> #include <openssl/core_names.h> /* For TLS1_VERSION etc */ -#include <openssl/ssl.h> +#include <openssl/prov_ssl.h> #include <openssl/params.h> #include "internal/nelem.h" #include "internal/tlsgroups.h" diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 7b534e76ed..ce5ddff651 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -22,7 +22,7 @@ #include <openssl/err.h> #include <openssl/proverr.h> /* Just for SSL_MAX_MASTER_KEY_LENGTH */ -#include <openssl/ssl.h> +#include <openssl/prov_ssl.h> #include "internal/constant_time.h" #include "internal/sizes.h" #include "crypto/rsa.h" diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c index a0eef7c1e5..f9a8a58041 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c @@ -16,8 +16,8 @@ /* Dispatch functions for AES_CBC_HMAC_SHA ciphers */ -/* Only for SSL3_VERSION and TLS1_VERSION */ -#include <openssl/ssl.h> +/* For SSL3_VERSION and TLS1_VERSION */ +#include <openssl/prov_ssl.h> #include <openssl/proverr.h> #include "cipher_aes_cbc_hmac_sha.h" #include "prov/implementations.h" diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c index 3c8ea8c03c..b5a0d43b78 100644 --- a/providers/implementations/ciphers/ciphercommon.c +++ b/providers/implementations/ciphers/ciphercommon.c @@ -12,7 +12,7 @@ */ /* For SSL3_VERSION */ -#include <openssl/ssl.h> +#include <openssl/prov_ssl.h> #include <openssl/proverr.h> #include "ciphercommon_local.h" #include "prov/provider_ctx.h" diff --git a/providers/implementations/ciphers/ciphercommon_block.c b/providers/implementations/ciphers/ciphercommon_block.c index 14f7503b36..6e6bb091e7 100644 --- a/providers/implementations/ciphers/ciphercommon_block.c +++ b/providers/implementations/ciphers/ciphercommon_block.c @@ -9,7 +9,7 @@ #include <assert.h> /* For SSL3_VERSION, TLS1_VERSION etc */ -#include <openssl/ssl.h> +#include <openssl/prov_ssl.h> #include <openssl/rand.h> #include <openssl/proverr.h> #include "internal/constant_time.h" |