From: Richard Levitte Date: Fri, 4 Oct 2019 13:25:59 +0000 (+0200) Subject: Cleanup: move remaining providers/common/include/internal/*.h X-Git-Tag: openssl-3.0.0-alpha1~1167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd21319e94636f308e115fd05cc48e7a8eadc55;p=thirdparty%2Fopenssl.git 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) --- diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 5957730d183..13bef4a7a8f 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -41,7 +41,7 @@ #include #include #include "internal/propertyerr.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" int err_load_crypto_strings_int(void) { diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 179a3baa05b..65633717ee9 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -39,7 +39,7 @@ L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c L OSSL_STORE include/openssl/store.h crypto/store/store_err.c L ESS include/openssl/ess.h crypto/ess/ess_err.c L PROP include/internal/property.h crypto/property/property_err.c -L PROV providers/common/include/internal/providercommon.h providers/common/provider_err.c +L PROV providers/common/include/prov/providercommon.h providers/common/provider_err.c # additional header files to be scanned for function names L NONE include/openssl/x509_vfy.h NONE diff --git a/crypto/initthread.c b/crypto/initthread.c index 930b94a817d..da30d59feca 100644 --- a/crypto/initthread.c +++ b/crypto/initthread.c @@ -10,7 +10,7 @@ #include #include #include "crypto/cryptlib.h" -#include "internal/providercommon.h" +#include "prov/providercommon.h" #include "internal/thread_once.h" #ifdef FIPS_MODE diff --git a/crypto/rand/drbg_hash.c b/crypto/rand/drbg_hash.c index 4a64992af24..72068c67c00 100644 --- a/crypto/rand/drbg_hash.c +++ b/crypto/rand/drbg_hash.c @@ -14,7 +14,7 @@ #include #include #include "internal/thread_once.h" -#include "internal/providercommon.h" +#include "prov/providercommon.h" #include "rand_local.h" /* 440 bits from SP800-90Ar1 10.1 table 2 */ diff --git a/crypto/rand/drbg_hmac.c b/crypto/rand/drbg_hmac.c index 4d7676d21b2..0289070f81b 100644 --- a/crypto/rand/drbg_hmac.c +++ b/crypto/rand/drbg_hmac.c @@ -13,7 +13,7 @@ #include #include #include "internal/thread_once.h" -#include "internal/providercommon.h" +#include "prov/providercommon.h" #include "rand_local.h" /* diff --git a/doc/internal/man3/ossl_prov_util_nid_to_name.pod b/doc/internal/man3/ossl_prov_util_nid_to_name.pod index dce4ba60ac0..31eec076c55 100644 --- a/doc/internal/man3/ossl_prov_util_nid_to_name.pod +++ b/doc/internal/man3/ossl_prov_util_nid_to_name.pod @@ -7,7 +7,7 @@ ossl_prov_util_nid_to_name =head1 SYNOPSIS - #include "internal/providercommon.h" + #include "prov/providercommon.h" const char *ossl_prov_util_nid_to_name(int nid); diff --git a/providers/common/ciphers/block.c b/providers/common/ciphers/block.c index ec2dab68497..95acfaf3234 100644 --- a/providers/common/ciphers/block.c +++ b/providers/common/ciphers/block.c @@ -9,7 +9,7 @@ #include #include "cipher_local.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" /* * Fills a single block of buffered data from the input, and returns the amount diff --git a/providers/common/ciphers/cipher_ccm.c b/providers/common/ciphers/cipher_ccm.c index 60fade83e01..904af3a5e05 100644 --- a/providers/common/ciphers/cipher_ccm.c +++ b/providers/common/ciphers/cipher_ccm.c @@ -11,7 +11,7 @@ #include "prov/ciphercommon.h" #include "prov/cipher_ccm.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" static int ccm_cipher_internal(PROV_CCM_CTX *ctx, unsigned char *out, size_t *padlen, const unsigned char *in, diff --git a/providers/common/ciphers/cipher_common.c b/providers/common/ciphers/cipher_common.c index 2577d94d7a8..d06e7b8004a 100644 --- a/providers/common/ciphers/cipher_common.c +++ b/providers/common/ciphers/cipher_common.c @@ -12,8 +12,8 @@ */ #include "cipher_local.h" -#include "internal/provider_ctx.h" -#include "internal/providercommonerr.h" +#include "prov/provider_ctx.h" +#include "prov/providercommonerr.h" /*- * Generic cipher functions for OSSL_PARAM gettables and settables diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c index 72d17d00733..580928fddea 100644 --- a/providers/common/ciphers/cipher_gcm.c +++ b/providers/common/ciphers/cipher_gcm.c @@ -11,9 +11,9 @@ #include "prov/ciphercommon.h" #include "prov/cipher_gcm.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #include "crypto/rand.h" -#include "internal/provider_ctx.h" +#include "prov/provider_ctx.h" static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len); static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv, diff --git a/providers/common/digests/digest_common.c b/providers/common/digests/digest_common.c index 92610a15245..9d30b2be2c0 100644 --- a/providers/common/digests/digest_common.c +++ b/providers/common/digests/digest_common.c @@ -9,7 +9,7 @@ #include "openssl/err.h" #include "prov/digestcommon.h" -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz, unsigned long flags) diff --git a/providers/common/include/internal/provider_ctx.h b/providers/common/include/prov/provider_ctx.h similarity index 100% rename from providers/common/include/internal/provider_ctx.h rename to providers/common/include/prov/provider_ctx.h diff --git a/providers/common/include/internal/provider_util.h b/providers/common/include/prov/provider_util.h similarity index 100% rename from providers/common/include/internal/provider_util.h rename to providers/common/include/prov/provider_util.h diff --git a/providers/common/include/internal/providercommon.h b/providers/common/include/prov/providercommon.h similarity index 100% rename from providers/common/include/internal/providercommon.h rename to providers/common/include/prov/providercommon.h diff --git a/providers/common/include/internal/providercommonerr.h b/providers/common/include/prov/providercommonerr.h similarity index 100% rename from providers/common/include/internal/providercommonerr.h rename to providers/common/include/prov/providercommonerr.h diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c index 5216baf9183..ae1552283d2 100644 --- a/providers/common/provider_err.c +++ b/providers/common/provider_err.c @@ -9,7 +9,7 @@ */ #include -#include "internal/providercommonerr.h" +#include "prov/providercommonerr.h" #ifndef OPENSSL_NO_ERR diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index 8384cdc2a0f..bdc86b1c05e 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -9,7 +9,7 @@ #include #include -#include "internal/provider_util.h" +#include "prov/provider_util.h" void ossl_prov_cipher_reset(PROV_CIPHER *pc) { diff --git a/providers/common/provlib.c b/providers/common/provlib.c index 2bab77dba07..e754b84d350 100644 --- a/providers/common/provlib.c +++ b/providers/common/provlib.c @@ -8,7 +8,7 @@ */ #include -#include "internal/providercommon.h" +#include "prov/providercommon.h" /* * The FIPS provider has its own version of this in fipsprov.c because it does diff --git a/providers/fips/build.info b/providers/fips/build.info index 829d8ef3eaf..4dfbb4623a3 100644 --- a/providers/fips/build.info +++ b/providers/fips/build.info @@ -1,3 +1,3 @@ SOURCE[../fips]=fipsprov.c selftest.c -INCLUDE[../fips]=../common/include \ No newline at end of file +INCLUDE[../fips]=../implementations/include ../common/include diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index c61071e619e..f0cf4a9bd0d 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -27,8 +27,8 @@ #include "internal/property.h" #include "crypto/evp.h" #include "prov/implementations.h" -#include "internal/provider_ctx.h" -#include "internal/providercommon.h" +#include "prov/provider_ctx.h" +#include "prov/providercommon.h" #include "selftest.h" extern OSSL_core_thread_start_fn *c_thread_start; diff --git a/providers/implementations/ciphers/cipher_aes_hw.c b/providers/implementations/ciphers/cipher_aes_hw.c index e9b63883007..8519662e737 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 c677a0be0bc..d30a666fc58 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 5b5e6388e12..9eaec163187 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 1072418779c..2ad1fbe84aa 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 b0e877ea1d1..200c365282e 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 1da17621e9c..135c6171ec6 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 68a3cfa3233..7f5780f0626 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 1ded6202df4..e6dab582ca5 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 ecce1d8e112..75cc25df064 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 27770f0820a..4a7d3a43abb 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 79cc6175179..251039e9920 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 333c2bafde1..66d70635a6b 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 455ee4ba157..6faf22e8d20 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 d1047c6e2cc..f08063fab52 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 b001bb7cb20..a067a9a91c8 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 23a0caac5fb..d5484f4acb3 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 23adbc37ba7..4f69eec7f66 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 941286b6b53..0a83753a8a1 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 efa1c762716..5a84d509682 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 d33b76ae710..6b6261f31c7 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 d5ad4f3e9a8..f3dbe1f2e74 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 8947d096882..f9e5a3a17d5 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 7ae0d476f0e..3eccc0d2c88 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 0c2e8e3c93e..6feaba76953 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 9dda057d743..f41752a3cf2 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 190187d690c..d1cb5cf1e75 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 addef0079ae..1eef3c91652 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;