diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:33 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:34 +0200 |
commit | 25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch) | |
tree | 0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b /providers | |
parent | ea8e1fe55b51d9da69977d8dc3f2ffd648d438df (diff) |
Reorganize private crypto header files
Currently, there are two different directories which contain internal
header files of libcrypto which are meant to be shared internally:
While header files in 'include/internal' are intended to be shared
between libcrypto and libssl, the files in 'crypto/include/internal'
are intended to be shared inside libcrypto only.
To make things complicated, the include search path is set up in such
a way that the directive #include "internal/file.h" could refer to
a file in either of these two directoroes. This makes it necessary
in some cases to add a '_int.h' suffix to some files to resolve this
ambiguity:
#include "internal/file.h" # located in 'include/internal'
#include "internal/file_int.h" # located in 'crypto/include/internal'
This commit moves the private crypto headers from
'crypto/include/internal' to 'include/crypto'
As a result, the include directives become unambiguous
#include "internal/file.h" # located in 'include/internal'
#include "crypto/file.h" # located in 'include/crypto'
hence the superfluous '_int.h' suffixes can be stripped.
The files 'store_int.h' and 'store.h' need to be treated specially;
they are joined into a single file.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'providers')
22 files changed, 25 insertions, 25 deletions
diff --git a/providers/build.info b/providers/build.info index 9642a3c153..80b2952494 100644 --- a/providers/build.info +++ b/providers/build.info @@ -9,7 +9,7 @@ IF[{- !$disabled{fips} -}] SOURCE[fips]=fips.ld GENERATE[fips.ld]=../util/providers.num ENDIF - INCLUDE[fips]=.. ../include ../crypto/include common/include + INCLUDE[fips]=.. ../include common/include DEFINE[fips]=FIPS_MODE ENDIF @@ -25,6 +25,6 @@ IF[{- !$disabled{legacy} -}] GENERATE[legacy.ld]=../util/providers.num ENDIF DEPEND[legacy]=../libcrypto - INCLUDE[legacy]=.. ../include ../crypto/include common/include + INCLUDE[legacy]=.. ../include common/include ENDIF ENDIF diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c index b5c79daee7..09cd70cc53 100644 --- a/providers/common/ciphers/cipher_gcm.c +++ b/providers/common/ciphers/cipher_gcm.c @@ -12,7 +12,7 @@ #include "cipher_locl.h" #include "internal/ciphers/cipher_gcm.h" #include "internal/providercommonerr.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_ctx.h" static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len); diff --git a/providers/common/ciphers/cipher_tdes.c b/providers/common/ciphers/cipher_tdes.c index e3e80d186a..0548531678 100644 --- a/providers/common/ciphers/cipher_tdes.c +++ b/providers/common/ciphers/cipher_tdes.c @@ -9,7 +9,7 @@ #include "cipher_locl.h" #include "internal/ciphers/cipher_tdes.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/common/digests/sha2_prov.c b/providers/common/digests/sha2_prov.c index b872676506..d2c7df2ee6 100644 --- a/providers/common/digests/sha2_prov.c +++ b/providers/common/digests/sha2_prov.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/digestcommon.h" #include "internal/provider_algs.h" -#include "internal/sha.h" +#include "crypto/sha.h" static OSSL_OP_digest_set_ctx_params_fn sha1_set_ctx_params; static OSSL_OP_digest_settable_ctx_params_fn sha1_settable_ctx_params; diff --git a/providers/common/include/internal/ciphers/ciphercommon.h b/providers/common/include/internal/ciphers/ciphercommon.h index 7539d8cb81..9a01abf6cb 100644 --- a/providers/common/include/internal/ciphers/ciphercommon.h +++ b/providers/common/include/internal/ciphers/ciphercommon.h @@ -12,8 +12,8 @@ #include <openssl/core_names.h> #include <openssl/evp.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/ciphermode_platform.h" +#include "crypto/modes.h" +#include "crypto/ciphermode_platform.h" #define MAXCHUNK ((size_t)1 << (sizeof(long) * 8 - 2)) #define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4)) diff --git a/providers/common/kdfs/hkdf.c b/providers/common/kdfs/hkdf.c index ac5cc34a21..041811f0e1 100644 --- a/providers/common/kdfs/hkdf.c +++ b/providers/common/kdfs/hkdf.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/kbkdf.c b/providers/common/kdfs/kbkdf.c index 77cee258e8..ffffef0b17 100644 --- a/providers/common/kdfs/kbkdf.c +++ b/providers/common/kdfs/kbkdf.c @@ -35,7 +35,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" diff --git a/providers/common/kdfs/pbkdf2.c b/providers/common/kdfs/pbkdf2.c index c8480125b2..b98123b872 100644 --- a/providers/common/kdfs/pbkdf2.c +++ b/providers/common/kdfs/pbkdf2.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/sskdf.c b/providers/common/kdfs/sskdf.c index d74da436a2..1e538a9c0a 100644 --- a/providers/common/kdfs/sskdf.c +++ b/providers/common/kdfs/sskdf.c @@ -44,7 +44,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/tls1_prf.c b/providers/common/kdfs/tls1_prf.c index 3053b756dc..af49b1b044 100644 --- a/providers/common/kdfs/tls1_prf.c +++ b/providers/common/kdfs/tls1_prf.c @@ -54,7 +54,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/default/ciphers/cipher_aria.h b/providers/default/ciphers/cipher_aria.h index 984be8f4aa..e95e4ca93c 100644 --- a/providers/default/ciphers/cipher_aria.h +++ b/providers/default/ciphers/cipher_aria.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" typedef struct prov_aria_ctx_st { diff --git a/providers/default/ciphers/cipher_aria_ccm.h b/providers/default/ciphers/cipher_aria_ccm.h index b3e990766d..fe0a3908bc 100644 --- a/providers/default/ciphers/cipher_aria_ccm.h +++ b/providers/default/ciphers/cipher_aria_ccm.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" #include "internal/ciphers/cipher_ccm.h" diff --git a/providers/default/ciphers/cipher_aria_gcm.h b/providers/default/ciphers/cipher_aria_gcm.h index 3499ceaaf7..ac5c248201 100644 --- a/providers/default/ciphers/cipher_aria_gcm.h +++ b/providers/default/ciphers/cipher_aria_gcm.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" #include "internal/ciphers/cipher_gcm.h" diff --git a/providers/default/ciphers/cipher_des.c b/providers/default/ciphers/cipher_des.c index a1976fb737..9456c205b8 100644 --- a/providers/default/ciphers/cipher_des.c +++ b/providers/default/ciphers/cipher_des.c @@ -9,7 +9,7 @@ #include "cipher_locl.h" #include "cipher_des.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/default/ciphers/cipher_sm4.h b/providers/default/ciphers/cipher_sm4.h index 842c218f30..4740bb3355 100644 --- a/providers/default/ciphers/cipher_sm4.h +++ b/providers/default/ciphers/cipher_sm4.h @@ -8,7 +8,7 @@ */ #include "internal/ciphers/ciphercommon.h" -#include "internal/sm4.h" +#include "crypto/sm4.h" typedef struct prov_cast_ctx_st { PROV_CIPHER_CTX base; /* Must be first */ diff --git a/providers/default/ciphers/cipher_tdes_wrap.c b/providers/default/ciphers/cipher_tdes_wrap.c index 08662dbdb0..b48b3c9733 100644 --- a/providers/default/ciphers/cipher_tdes_wrap.c +++ b/providers/default/ciphers/cipher_tdes_wrap.c @@ -9,8 +9,8 @@ #include <openssl/sha.h> #include "cipher_tdes_default.h" -#include "internal/evp_int.h" -#include "internal/rand_int.h" +#include "crypto/evp.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/default/kdfs/scrypt.c b/providers/default/kdfs/scrypt.c index abb4437d70..505963eec5 100644 --- a/providers/default/kdfs/scrypt.c +++ b/providers/default/kdfs/scrypt.c @@ -14,7 +14,7 @@ #include <openssl/kdf.h> #include <openssl/err.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" diff --git a/providers/default/kdfs/sshkdf.c b/providers/default/kdfs/sshkdf.c index 2db5397294..7e6445dbdd 100644 --- a/providers/default/kdfs/sshkdf.c +++ b/providers/default/kdfs/sshkdf.c @@ -15,7 +15,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/default/kdfs/x942kdf.c b/providers/default/kdfs/x942kdf.c index 7c3afef911..65c586fb99 100644 --- a/providers/default/kdfs/x942kdf.c +++ b/providers/default/kdfs/x942kdf.c @@ -24,7 +24,7 @@ # include <openssl/core_names.h> # include "internal/cryptlib.h" # include "internal/numbers.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "internal/provider_ctx.h" # include "internal/providercommonerr.h" # include "internal/provider_algs.h" diff --git a/providers/default/macs/poly1305_prov.c b/providers/default/macs/poly1305_prov.c index e76f982ace..88005716e6 100644 --- a/providers/default/macs/poly1305_prov.c +++ b/providers/default/macs/poly1305_prov.c @@ -13,7 +13,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/poly1305.h" +#include "crypto/poly1305.h" /* * TODO(3.0) when poly1305 has moved entirely to our providers, this * header should be moved to the provider include directory. For the diff --git a/providers/default/macs/siphash_prov.c b/providers/default/macs/siphash_prov.c index 1a36846bfe..a9511925f0 100644 --- a/providers/default/macs/siphash_prov.c +++ b/providers/default/macs/siphash_prov.c @@ -14,7 +14,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/siphash.h" +#include "crypto/siphash.h" /* * TODO(3.0) when siphash has moved entirely to our providers, this * header should be moved to the provider include directory. For the diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index ce843552d7..166d02496e 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -25,7 +25,7 @@ #include "internal/cryptlib.h" #include "internal/property.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" #include "internal/providercommon.h" |