diff options
author | Richard Levitte <levitte@openssl.org> | 2019-10-04 15:20:48 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-10-10 14:12:15 +0200 |
commit | af3e7e1bccbed8e3b958488a07daf5a8f4115fa9 (patch) | |
tree | 4390b5c181c0777cfb068f69adf6fbb0e221ca92 | |
parent | 604e884bb8aba9b549c7e5effe01e406ccab3bcd (diff) |
Cleanup: move providers/common/include/internal/provider_args.h
New name is providers/implementations/include/prov/implementations.h
All inclusions are adapted accordingly.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
57 files changed, 57 insertions, 57 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 7e952921c8..7dd0cf5012 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -14,7 +14,7 @@ #include <openssl/core_numbers.h> #include <openssl/core_names.h> #include <openssl/params.h> -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* Functions provided by the core */ static OSSL_core_gettable_params_fn *c_gettable_params = NULL; diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 8464fe135c..c61071e619 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -26,7 +26,7 @@ #include "internal/cryptlib.h" #include "internal/property.h" #include "crypto/evp.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/provider_ctx.h" #include "internal/providercommon.h" #include "selftest.h" diff --git a/providers/implementations/ciphers/cipher_aes.c b/providers/implementations/ciphers/cipher_aes.c index 46880e0bf7..c62d2d2c29 100644 --- a/providers/implementations/ciphers/cipher_aes.c +++ b/providers/implementations/ciphers/cipher_aes.c @@ -10,7 +10,7 @@ /* Dispatch functions for AES cipher modes ecb, cbc, ofb, cfb, ctr */ #include "cipher_aes.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn aes_freectx; static OSSL_OP_cipher_dupctx_fn aes_dupctx; diff --git a/providers/implementations/ciphers/cipher_aes_ccm.c b/providers/implementations/ciphers/cipher_aes_ccm.c index 59fc7274c9..c1fb51b565 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm.c +++ b/providers/implementations/ciphers/cipher_aes_ccm.c @@ -11,7 +11,7 @@ #include "prov/ciphercommon.h" #include "prov/cipher_ccm.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static void *aes_ccm_newctx(void *provctx, size_t keybits) { diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c index 1df1c1dba9..4ebc8140ee 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.c +++ b/providers/implementations/ciphers/cipher_aes_gcm.c @@ -11,7 +11,7 @@ #include "prov/ciphercommon.h" #include "prov/cipher_gcm.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static void *aes_gcm_newctx(void *provctx, size_t keybits) { diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 5ab0b8fd15..c677a0be0b 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -10,7 +10,7 @@ #include "cipher_aes_ocb.h" #include "internal/providercommonerr.h" #include "prov/cipher_aead.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #define AES_OCB_FLAGS AEAD_FLAGS diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c index 1bf4c1793a..5b5e6388e1 100644 --- a/providers/implementations/ciphers/cipher_aes_wrp.c +++ b/providers/implementations/ciphers/cipher_aes_wrp.c @@ -9,7 +9,7 @@ #include "cipher_aes.h" #include "internal/providercommonerr.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* AES wrap with padding has IV length of 4, without padding 8 */ #define AES_WRAP_PAD_IVLEN 4 diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index d0b999081e..1072418779 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/providers/implementations/ciphers/cipher_aes_xts.c @@ -8,7 +8,7 @@ */ #include "cipher_aes_xts.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" /* TODO (3.0) Figure out what flags need to be set */ diff --git a/providers/implementations/ciphers/cipher_aria.c b/providers/implementations/ciphers/cipher_aria.c index 861b28268b..da864015bd 100644 --- a/providers/implementations/ciphers/cipher_aria.c +++ b/providers/implementations/ciphers/cipher_aria.c @@ -10,7 +10,7 @@ /* Dispatch functions for ARIA cipher modes ecb, cbc, ofb, cfb, ctr */ #include "cipher_aria.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn aria_freectx; static OSSL_OP_cipher_dupctx_fn aria_dupctx; diff --git a/providers/implementations/ciphers/cipher_aria_ccm.c b/providers/implementations/ciphers/cipher_aria_ccm.c index 97e8137db8..e4cfc6cd8f 100644 --- a/providers/implementations/ciphers/cipher_aria_ccm.c +++ b/providers/implementations/ciphers/cipher_aria_ccm.c @@ -10,7 +10,7 @@ /* Dispatch functions for ARIA CCM mode */ #include "cipher_aria_ccm.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn aria_ccm_freectx; diff --git a/providers/implementations/ciphers/cipher_aria_gcm.c b/providers/implementations/ciphers/cipher_aria_gcm.c index 7c9fa3d211..1481fcc2e2 100644 --- a/providers/implementations/ciphers/cipher_aria_gcm.c +++ b/providers/implementations/ciphers/cipher_aria_gcm.c @@ -10,7 +10,7 @@ /* Dispatch functions for ARIA GCM mode */ #include "cipher_aria_gcm.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static void *aria_gcm_newctx(void *provctx, size_t keybits) { diff --git a/providers/implementations/ciphers/cipher_blowfish.c b/providers/implementations/ciphers/cipher_blowfish.c index 4730f1fd40..786cc15189 100644 --- a/providers/implementations/ciphers/cipher_blowfish.c +++ b/providers/implementations/ciphers/cipher_blowfish.c @@ -10,7 +10,7 @@ /* Dispatch functions for Blowfish cipher modes ecb, cbc, ofb, cfb */ #include "cipher_blowfish.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #define BF_FLAGS (EVP_CIPH_VARIABLE_LENGTH) diff --git a/providers/implementations/ciphers/cipher_camellia.c b/providers/implementations/ciphers/cipher_camellia.c index 68c0e91355..cf9af3db32 100644 --- a/providers/implementations/ciphers/cipher_camellia.c +++ b/providers/implementations/ciphers/cipher_camellia.c @@ -10,7 +10,7 @@ /* Dispatch functions for CAMELLIA cipher modes ecb, cbc, ofb, cfb, ctr */ #include "cipher_camellia.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn camellia_freectx; static OSSL_OP_cipher_dupctx_fn camellia_dupctx; diff --git a/providers/implementations/ciphers/cipher_cast5.c b/providers/implementations/ciphers/cipher_cast5.c index eb79aad820..d049d836d0 100644 --- a/providers/implementations/ciphers/cipher_cast5.c +++ b/providers/implementations/ciphers/cipher_cast5.c @@ -10,7 +10,7 @@ /* Dispatch functions for cast cipher modes ecb, cbc, ofb, cfb */ #include "cipher_cast.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #define CAST5_FLAGS (EVP_CIPH_VARIABLE_LENGTH) diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c index 5781aa4706..b0e877ea1d 100644 --- a/providers/implementations/ciphers/cipher_des.c +++ b/providers/implementations/ciphers/cipher_des.c @@ -10,7 +10,7 @@ #include "prov/ciphercommon.h" #include "cipher_des.h" #include "crypto/rand.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" /* TODO(3.0) Figure out what flags need to be here */ diff --git a/providers/implementations/ciphers/cipher_desx.c b/providers/implementations/ciphers/cipher_desx.c index 4a232cd080..b8447d2c3f 100644 --- a/providers/implementations/ciphers/cipher_desx.c +++ b/providers/implementations/ciphers/cipher_desx.c @@ -8,7 +8,7 @@ */ #include "cipher_tdes_default.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* desx_cbc_functions */ IMPLEMENT_tdes_cipher(desx, DESX, cbc, CBC, TDES_FLAGS, 64*3, 64, 64, block); diff --git a/providers/implementations/ciphers/cipher_idea.c b/providers/implementations/ciphers/cipher_idea.c index 6bb5419b6d..5602655f76 100644 --- a/providers/implementations/ciphers/cipher_idea.c +++ b/providers/implementations/ciphers/cipher_idea.c @@ -10,7 +10,7 @@ /* Dispatch functions for Idea cipher modes ecb, cbc, ofb, cfb */ #include "cipher_idea.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn idea_freectx; static OSSL_OP_cipher_dupctx_fn idea_dupctx; diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c index f7ee268276..1da17621e9 100644 --- a/providers/implementations/ciphers/cipher_rc2.c +++ b/providers/implementations/ciphers/cipher_rc2.c @@ -10,7 +10,7 @@ /* Dispatch functions for RC2 cipher modes ecb, cbc, ofb, cfb */ #include "cipher_rc2.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" #define RC2_40_MAGIC 0xa0 diff --git a/providers/implementations/ciphers/cipher_rc4.c b/providers/implementations/ciphers/cipher_rc4.c index d81b776bc2..c3da8b4397 100644 --- a/providers/implementations/ciphers/cipher_rc4.c +++ b/providers/implementations/ciphers/cipher_rc4.c @@ -10,7 +10,7 @@ /* Dispatch functions for RC4 ciphers */ #include "cipher_rc4.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* TODO (3.0) Figure out what flags are required */ #define RC4_FLAGS EVP_CIPH_FLAG_DEFAULT_ASN1 diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c index 645a6b8b64..68a3cfa323 100644 --- a/providers/implementations/ciphers/cipher_rc5.c +++ b/providers/implementations/ciphers/cipher_rc5.c @@ -10,7 +10,7 @@ /* Dispatch functions for RC5 cipher modes ecb, cbc, ofb, cfb */ #include "cipher_rc5.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" static OSSL_OP_cipher_freectx_fn rc5_freectx; diff --git a/providers/implementations/ciphers/cipher_seed.c b/providers/implementations/ciphers/cipher_seed.c index 397671dd06..ee90669fda 100644 --- a/providers/implementations/ciphers/cipher_seed.c +++ b/providers/implementations/ciphers/cipher_seed.c @@ -10,7 +10,7 @@ /* Dispatch functions for Seed cipher modes ecb, cbc, ofb, cfb */ #include "cipher_seed.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn seed_freectx; static OSSL_OP_cipher_dupctx_fn seed_dupctx; diff --git a/providers/implementations/ciphers/cipher_sm4.c b/providers/implementations/ciphers/cipher_sm4.c index 2c1e587863..bf9d220923 100644 --- a/providers/implementations/ciphers/cipher_sm4.c +++ b/providers/implementations/ciphers/cipher_sm4.c @@ -10,7 +10,7 @@ /* Dispatch functions for cast cipher modes ecb, cbc, ofb, cfb */ #include "cipher_sm4.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_cipher_freectx_fn sm4_freectx; static OSSL_OP_cipher_dupctx_fn sm4_dupctx; diff --git a/providers/implementations/ciphers/cipher_tdes.c b/providers/implementations/ciphers/cipher_tdes.c index 9c032902e9..1ded6202df 100644 --- a/providers/implementations/ciphers/cipher_tdes.c +++ b/providers/implementations/ciphers/cipher_tdes.c @@ -10,7 +10,7 @@ #include "prov/ciphercommon.h" #include "cipher_tdes.h" #include "crypto/rand.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" void *tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits, diff --git a/providers/implementations/ciphers/cipher_tdes_default.c b/providers/implementations/ciphers/cipher_tdes_default.c index 73a78e8089..9aefef26b6 100644 --- a/providers/implementations/ciphers/cipher_tdes_default.c +++ b/providers/implementations/ciphers/cipher_tdes_default.c @@ -8,7 +8,7 @@ */ #include "cipher_tdes_default.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* tdes_ede3_ofb_functions */ IMPLEMENT_tdes_cipher(ede3, EDE3, ofb, OFB, TDES_FLAGS, 64*3, 8, 64, stream); diff --git a/providers/implementations/ciphers/cipher_tdes_wrap.c b/providers/implementations/ciphers/cipher_tdes_wrap.c index 1ee0044489..ecce1d8e11 100644 --- a/providers/implementations/ciphers/cipher_tdes_wrap.c +++ b/providers/implementations/ciphers/cipher_tdes_wrap.c @@ -11,7 +11,7 @@ #include "cipher_tdes_default.h" #include "crypto/evp.h" #include "crypto/rand.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" #include "internal/providercommonerr.h" /* TODO (3.0) Figure out what flags are requred */ diff --git a/providers/implementations/digests/blake2_prov.c b/providers/implementations/digests/blake2_prov.c index 16f301b177..1fe7cb18fc 100644 --- a/providers/implementations/digests/blake2_prov.c +++ b/providers/implementations/digests/blake2_prov.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include "prov/blake2.h" #include "prov/digestcommon.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" OSSL_OP_digest_init_fn blake2s256_init; OSSL_OP_digest_init_fn blake2b512_init; diff --git a/providers/implementations/digests/md2_prov.c b/providers/implementations/digests/md2_prov.c index ab1d605218..6e12e3c172 100644 --- a/providers/implementations/digests/md2_prov.c +++ b/providers/implementations/digests/md2_prov.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include <openssl/md2.h> #include "prov/digestcommon.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* md2_functions */ IMPLEMENT_digest_functions(md2, MD2_CTX, diff --git a/providers/implementations/digests/md4_prov.c b/providers/implementations/digests/md4_prov.c index 6b311c075d..3ce356a58f 100644 --- a/providers/implementations/digests/md4_prov.c +++ b/providers/implementations/digests/md4_prov.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include <openssl/md4.h> #include "prov/digestcommon.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* md4_functions */ IMPLEMENT_digest_functions(md4, MD4_CTX, diff --git a/providers/implementations/digests/md5_prov.c b/providers/implementations/digests/md5_prov.c index 1205888ff9..7b92b6139c 100644 --- a/providers/implementations/digests/md5_prov.c +++ b/providers/implementations/digests/md5_prov.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include <openssl/md5.h> #include "prov/digestcommon.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" /* md5_functions */ IMPLEMENT_digest_functions(md5, MD5_CTX, diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c index ff6e2ed121..09c502d839 100644 --- a/providers/implementations/digests/md5_sha1_prov.c +++ b/providers/implementations/digests/md5_sha1_prov.c @@ -14,7 +14,7 @@ #include <openssl/core_names.h> #include "prov/md5_sha1.h" #include "prov/digestcommon.h" -#include "internal/provider_algs.h" +#include "prov/implementations.h" static OSSL_OP_digest_set_ctx_params_fn md5_sha1_set_ctx_params; static OSSL_OP_digest_settable_ctx_params_fn md5_sha1_settable_ctx_params; diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/md |