diff options
47 files changed, 67 insertions, 67 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 5957730d18..13bef4a7a8 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -41,7 +41,7 @@ #include <openssl/storeerr.h> #include <openssl/esserr.h> #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 179a3baa05..65633717ee 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 930b94a817..da30d59fec 100644 --- a/crypto/initthread.c +++ b/crypto/initthread.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include <openssl/core_numbers.h> #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 4a64992af2..72068c67c0 100644 --- a/crypto/rand/drbg_hash.c +++ b/crypto/rand/drbg_hash.c @@ -14,7 +14,7 @@ #include <openssl/err.h> #include <openssl/rand.h> #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 4d7676d21b..0289070f81 100644 --- a/crypto/rand/drbg_hmac.c +++ b/crypto/rand/drbg_hmac.c @@ -13,7 +13,7 @@ #include <openssl/err.h> #include <openssl/rand.h> #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 dce4ba60ac..31eec076c5 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 ec2dab6849..95acfaf323 100644 --- a/providers/common/ciphers/block.c +++ b/providers/common/ciphers/block.c @@ -9,7 +9,7 @@ #include <assert.h> #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 60fade83e0..904af3a5e0 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 2577d94d7a..d06e7b8004 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 72d17d0073..580928fdde 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 92610a1524..9d30b2be2c 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 index 365667d19e..365667d19e 100644 --- a/providers/common/include/internal/provider_ctx.h +++ b/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 index 9925ac2b09..9925ac2b09 100644 --- a/providers/common/include/internal/provider_util.h +++ b/providers/common/include/prov/provider_util.h diff --git a/providers/common/include/internal/providercommon.h b/providers/common/include/prov/providercommon.h index 569c08c0b1..569c08c0b1 100644 --- a/providers/common/include/internal/providercommon.h +++ b/providers/common/include/prov/providercommon.h diff --git a/providers/common/include/internal/providercommonerr.h b/providers/common/include/prov/providercommonerr.h index 90c6d11d83..90c6d11d83 100644 --- a/providers/common/include/internal/providercommonerr.h +++ b/providers/common/include/prov/providercommonerr.h diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c index 5216baf918..ae1552283d 100644 --- a/providers/common/provider_err.c +++ b/providers/common/provider_err.c @@ -9,7 +9,7 @@ */ #include <openssl/err.h> -#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 8384cdc2a0..bdc86b1c05 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -9,7 +9,7 @@ #include <openssl/evp.h> #include <openssl/core_names.h> -#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 2bab77dba0..e754b84d35 100644 --- a/providers/common/provlib.c +++ b/providers/common/provlib.c @@ -8,7 +8,7 @@ */ #include <openssl/objects.h> -#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 829d8ef3ea..4dfbb4623a 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 c61071e619..f0cf4a9bd0 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 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 <openssl/err.h> #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. |