From ddd21319e94636f308e115fd05cc48e7a8eadc55 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 4 Oct 2019 15:25:59 +0200 Subject: Cleanup: move remaining providers/common/include/internal/*.h The end up in providers/common/include/prov/. All inclusions are adjusted accordingly. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10088) --- providers/implementations/ciphers/cipher_aes_hw.c | 2 +- providers/implementations/ciphers/cipher_aes_ocb.c | 2 +- providers/implementations/ciphers/cipher_aes_wrp.c | 2 +- providers/implementations/ciphers/cipher_aes_xts.c | 2 +- providers/implementations/ciphers/cipher_des.c | 2 +- providers/implementations/ciphers/cipher_rc2.c | 2 +- providers/implementations/ciphers/cipher_rc5.c | 2 +- providers/implementations/ciphers/cipher_tdes.c | 2 +- providers/implementations/ciphers/cipher_tdes_wrap.c | 2 +- providers/implementations/digests/mdc2_prov.c | 2 +- providers/implementations/digests/sha3_prov.c | 2 +- providers/implementations/kdfs/hkdf.c | 6 +++--- providers/implementations/kdfs/kbkdf.c | 6 +++--- providers/implementations/kdfs/pbkdf2.c | 6 +++--- providers/implementations/kdfs/scrypt.c | 4 ++-- providers/implementations/kdfs/sshkdf.c | 6 +++--- providers/implementations/kdfs/sskdf.c | 6 +++--- providers/implementations/kdfs/tls1_prf.c | 6 +++--- providers/implementations/kdfs/x942kdf.c | 6 +++--- providers/implementations/macs/blake2_mac_impl.c | 2 +- providers/implementations/macs/cmac_prov.c | 4 ++-- providers/implementations/macs/gmac_prov.c | 6 +++--- providers/implementations/macs/hmac_prov.c | 4 ++-- providers/implementations/macs/kmac_prov.c | 6 +++--- providers/implementations/macs/poly1305_prov.c | 2 +- providers/implementations/macs/siphash_prov.c | 2 +- providers/implementations/signature/dsa.c | 2 +- 27 files changed, 48 insertions(+), 48 deletions(-) (limited to 'providers/implementations') diff --git a/providers/implementations/ciphers/cipher_aes_hw.c b/providers/implementations/ciphers/cipher_aes_hw.c index e9b6388300..8519662e73 100644 --- a/providers/implementations/ciphers/cipher_aes_hw.c +++ b/providers/implementations/ciphers/cipher_aes_hw.c @@ -8,7 +8,7 @@ */ #include "cipher_aes.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" static int cipher_hw_aes_initkey(PROV_CIPHER_CTX *dat, const unsigned char *key, size_t keylen) diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index c677a0be0b..d30a666fc5 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -8,7 +8,7 @@ */ #include "cipher_aes_ocb.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/cipher_aead.h" #include "prov/implementations.h" diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c index 5b5e6388e1..9eaec16318 100644 --- a/providers/implementations/ciphers/cipher_aes_wrp.c +++ b/providers/implementations/ciphers/cipher_aes_wrp.c @@ -8,7 +8,7 @@ */ #include "cipher_aes.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" /* AES wrap with padding has IV length of 4, without padding 8 */ diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index 1072418779..2ad1fbe84a 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/providers/implementations/ciphers/cipher_aes_xts.c @@ -9,7 +9,7 @@ #include "cipher_aes_xts.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" /* TODO (3.0) Figure out what flags need to be set */ #define AES_XTS_FLAGS (EVP_CIPH_CUSTOM_IV \ diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c index b0e877ea1d..200c365282 100644 --- a/providers/implementations/ciphers/cipher_des.c +++ b/providers/implementations/ciphers/cipher_des.c @@ -11,7 +11,7 @@ #include "cipher_des.h" #include "crypto/rand.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" /* TODO(3.0) Figure out what flags need to be here */ #define DES_FLAGS (EVP_CIPH_RAND_KEY) diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c index 1da17621e9..135c6171ec 100644 --- a/providers/implementations/ciphers/cipher_rc2.c +++ b/providers/implementations/ciphers/cipher_rc2.c @@ -11,7 +11,7 @@ #include "cipher_rc2.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #define RC2_40_MAGIC 0xa0 #define RC2_64_MAGIC 0x78 diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c index 68a3cfa323..7f5780f062 100644 --- a/providers/implementations/ciphers/cipher_rc5.c +++ b/providers/implementations/ciphers/cipher_rc5.c @@ -11,7 +11,7 @@ #include "cipher_rc5.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" static OSSL_OP_cipher_freectx_fn rc5_freectx; static OSSL_OP_cipher_dupctx_fn rc5_dupctx; diff --git a/providers/implementations/ciphers/cipher_tdes.c b/providers/implementations/ciphers/cipher_tdes.c index 1ded6202df..e6dab582ca 100644 --- a/providers/implementations/ciphers/cipher_tdes.c +++ b/providers/implementations/ciphers/cipher_tdes.c @@ -11,7 +11,7 @@ #include "cipher_tdes.h" #include "crypto/rand.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" void *tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits, size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw) diff --git a/providers/implementations/ciphers/cipher_tdes_wrap.c b/providers/implementations/ciphers/cipher_tdes_wrap.c index ecce1d8e11..75cc25df06 100644 --- a/providers/implementations/ciphers/cipher_tdes_wrap.c +++ b/providers/implementations/ciphers/cipher_tdes_wrap.c @@ -12,7 +12,7 @@ #include "crypto/evp.h" #include "crypto/rand.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" /* TODO (3.0) Figure out what flags are requred */ #define TDES_WRAP_FLAGS (EVP_CIPH_WRAP_MODE \ diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c index 27770f0820..4a7d3a43ab 100644 --- a/providers/implementations/digests/mdc2_prov.c +++ b/providers/implementations/digests/mdc2_prov.c @@ -14,7 +14,7 @@ #include #include "prov/digestcommon.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" static OSSL_OP_digest_set_ctx_params_fn mdc2_set_ctx_params; static OSSL_OP_digest_settable_ctx_params_fn mdc2_settable_ctx_params; diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 79cc617517..251039e992 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -16,7 +16,7 @@ #include "internal/sha3.h" #include "prov/digestcommon.h" #include "prov/implementations.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" /* * Forward declaration of any unique methods implemented here. This is not strictly diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index 333c2bafde..66d70635a6 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -17,10 +17,10 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_util.h" +#include "prov/provider_util.h" #include "e_os.h" #define HKDF_MAXBUF 1024 diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index 455ee4ba15..6faf22e8d2 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -38,9 +38,9 @@ #include "crypto/evp.h" #include "internal/numbers.h" #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/provider_util.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/provider_util.h" +#include "prov/providercommonerr.h" #include "e_os.h" diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index d1047c6e2c..f08063fab5 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -17,10 +17,10 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_util.h" +#include "prov/provider_util.h" #include "pbkdf2.h" /* Constants specified in SP800-132 */ diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c index b001bb7cb2..a067a9a91c 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -17,8 +17,8 @@ #include "crypto/evp.h" #include "internal/numbers.h" #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" #ifndef OPENSSL_NO_SCRYPT diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c index 23a0caac5f..d5484f4acb 100644 --- a/providers/implementations/kdfs/sshkdf.c +++ b/providers/implementations/kdfs/sshkdf.c @@ -16,10 +16,10 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -# include "internal/provider_util.h" +# include "prov/provider_util.h" /* See RFC 4253, Section 7.2 */ static OSSL_OP_kdf_newctx_fn kdf_sshkdf_new; diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 23adbc37ba..4f69eec7f6 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -45,10 +45,10 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_util.h" +#include "prov/provider_util.h" typedef struct { void *provctx; diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index 941286b6b5..0a83753a8a 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -55,10 +55,10 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_util.h" +#include "prov/provider_util.h" #include "e_os.h" static OSSL_OP_kdf_newctx_fn kdf_tls1_prf_new; diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index efa1c76271..5a84d50968 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -25,10 +25,10 @@ # include "internal/cryptlib.h" # include "internal/numbers.h" # include "crypto/evp.h" -# include "internal/provider_ctx.h" -# include "internal/providercommonerr.h" +# include "prov/provider_ctx.h" +# include "prov/providercommonerr.h" # include "prov/implementations.h" -# include "internal/provider_util.h" +# include "prov/provider_util.h" # define X942KDF_MAX_INLEN (1 << 30) diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index d33b76ae71..6b6261f31c 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -13,7 +13,7 @@ #include "prov/blake2.h" #include "internal/cryptlib.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" /* diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c index d5ad4f3e9a..f3dbe1f2e7 100644 --- a/providers/implementations/macs/cmac_prov.c +++ b/providers/implementations/macs/cmac_prov.c @@ -15,8 +15,8 @@ #include #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/provider_util.h" +#include "prov/provider_ctx.h" +#include "prov/provider_util.h" /* * Forward declaration of everything implemented here. This is not strictly diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c index 8947d09688..f9e5a3a17d 100644 --- a/providers/implementations/macs/gmac_prov.c +++ b/providers/implementations/macs/gmac_prov.c @@ -15,10 +15,10 @@ #include #include -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/provider_util.h" +#include "prov/provider_ctx.h" +#include "prov/provider_util.h" /* * Forward declaration of everything implemented here. This is not strictly diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c index 7ae0d476f0..3eccc0d2c8 100644 --- a/providers/implementations/macs/hmac_prov.c +++ b/providers/implementations/macs/hmac_prov.c @@ -15,8 +15,8 @@ #include #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/provider_util.h" +#include "prov/provider_ctx.h" +#include "prov/provider_util.h" /* * Forward declaration of everything implemented here. This is not strictly diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index 0c2e8e3c93..6feaba7695 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -54,10 +54,10 @@ #include #include -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/provider_util.h" +#include "prov/provider_ctx.h" +#include "prov/provider_util.h" /* * Forward declaration of everything implemented here. This is not strictly diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index 9dda057d74..f41752a3cf 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -21,7 +21,7 @@ */ #include "../../../crypto/poly1305/poly1305_local.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" /* diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index 190187d690..d1cb5cf1e7 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -22,7 +22,7 @@ */ #include "../../../crypto/siphash/siphash_local.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "prov/implementations.h" /* diff --git a/providers/implementations/signature/dsa.c b/providers/implementations/signature/dsa.c index addef0079a..1eef3c9165 100644 --- a/providers/implementations/signature/dsa.c +++ b/providers/implementations/signature/dsa.c @@ -14,7 +14,7 @@ #include #include #include "prov/implementations.h" -#include "internal/provider_ctx.h" +#include "prov/provider_ctx.h" static OSSL_OP_signature_newctx_fn dsa_newctx; static OSSL_OP_signature_sign_init_fn dsa_signature_init; -- cgit v1.2.3