diff options
Diffstat (limited to 'crypto/evp')
30 files changed, 33 insertions, 33 deletions
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index e1b6c8cc3e..8d502d0bf7 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -13,7 +13,7 @@ #include <openssl/buffer.h> #include <openssl/evp.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" #include "internal/bio.h" /* diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c index 7c7550e9ce..37cca7a256 100644 --- a/crypto/evp/cmeth_lib.c +++ b/crypto/evp/cmeth_lib.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len) { diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index ca5f7a935e..1ce529241f 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -16,7 +16,7 @@ #include "internal/cryptlib.h" #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" /* This call frees resources associated with the context */ int EVP_MD_CTX_reset(EVP_MD_CTX *ctx) diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 17e445d8f2..49ed886e64 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -21,7 +21,7 @@ #include "crypto/modes.h" #include "crypto/siv.h" #include "crypto/ciphermode_platform.h" -#include "evp_locl.h" +#include "evp_local.h" typedef struct { union { diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index eddb9686e2..6b9362a1fe 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -18,7 +18,7 @@ #include "internal/cryptlib.h" #include "crypto/modes.h" #include "crypto/evp.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" typedef struct { AES_KEY ks; diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 7659d8f8d3..771ef1d6a2 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -17,7 +17,7 @@ #include <openssl/rand.h> #include "internal/cryptlib.h" #include "crypto/modes.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include "crypto/evp.h" typedef struct { diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 9412d51b04..a8c4fc32e2 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -17,7 +17,7 @@ # include "crypto/aria.h" # include "crypto/evp.h" # include "crypto/modes.h" -# include "evp_locl.h" +# include "evp_local.h" /* ARIA subkey Structure */ typedef struct { diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 17cce58ff1..b7340b147d 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -15,7 +15,7 @@ # include <openssl/evp.h> # include <openssl/objects.h> # include "crypto/evp.h" -# include "evp_locl.h" +# include "evp_local.h" # include "crypto/chacha.h" typedef struct { diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 1ceb3fc73c..8f9eab427e 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -15,7 +15,7 @@ # include "crypto/evp.h" # include <openssl/des.h> # include <openssl/rand.h> -# include "evp_locl.h" +# include "evp_local.h" typedef struct { union { diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c index d92d10f16c..4783cc31ca 100644 --- a/crypto/evp/e_rc5.c +++ b/crypto/evp/e_rc5.c @@ -15,7 +15,7 @@ # include <openssl/evp.h> # include "crypto/evp.h" # include <openssl/objects.h> -# include "evp_locl.h" +# include "evp_local.h" # include <openssl/rc5.h> static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c index b8c82cfafd..fb657d1499 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include <openssl/evp.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" static unsigned char conv_ascii2bin(unsigned char a, const unsigned char *table); diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 35bf42994d..a3fb5f7424 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -19,7 +19,7 @@ #include <openssl/core_names.h> #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) { diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index 67ba201da3..5aa1319ce1 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -17,8 +17,8 @@ #include "internal/core.h" #include "internal/provider.h" #include "internal/namemap.h" -#include "crypto/evp.h" /* evp_locl.h needs it */ -#include "evp_locl.h" +#include "crypto/evp.h" /* evp_local.h needs it */ +#include "evp_local.h" static void default_method_store_free(void *vstore) { diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 0789aa8970..6a3ad8553b 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -16,7 +16,7 @@ #include <openssl/dh.h> #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" #if !defined(FIPS_MODE) int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_local.h index 116c8e6ce0..116c8e6ce0 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_local.h diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 2d87905bf5..5ccb8214a3 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -13,7 +13,7 @@ #include <openssl/pkcs12.h> #include <openssl/x509.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" /* Password based encryption (PBE) functions */ diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c index b3571bea9f..77622616b3 100644 --- a/crypto/evp/evp_utils.c +++ b/crypto/evp/evp_utils.c @@ -12,10 +12,10 @@ #include <openssl/core.h> #include <openssl/evp.h> #include <openssl/err.h> -#include <openssl/asn1.h> /* evp_locl.h needs it */ -#include <openssl/safestack.h> /* evp_locl.h needs it */ -#include "crypto/evp.h" /* evp_locl.h needs it */ -#include "evp_locl.h" +#include <openssl/asn1.h> /* evp_local.h needs it */ +#include <openssl/safestack.h> /* evp_local.h needs it */ +#include "crypto/evp.h" /* evp_local.h needs it */ +#include "evp_local.h" /* * EVP_CTRL_RET_UNSUPPORTED = -1 is the returned value from any ctrl function diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c index 3caf03a0ce..4c02c8a6a0 100644 --- a/crypto/evp/exchange.c +++ b/crypto/evp/exchange.c @@ -14,7 +14,7 @@ #include "crypto/evp.h" #include "internal/provider.h" #include "internal/numbers.h" /* includes SIZE_MAX */ -#include "evp_locl.h" +#include "evp_local.h" static EVP_KEYEXCH *evp_keyexch_new(OSSL_PROVIDER *prov) { diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index b2b28dece2..7163de397f 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -21,7 +21,7 @@ #include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kdf) { diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c index c2b6cea673..3a2d028153 100644 --- a/crypto/evp/kdf_meth.c +++ b/crypto/evp/kdf_meth.c @@ -14,7 +14,7 @@ #include <openssl/kdf.h> #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" static int evp_kdf_up_ref(void *vkdf) { diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c index 1a4e9a297c..0eb12ca317 100644 --- a/crypto/evp/keymgmt_lib.c +++ b/crypto/evp/keymgmt_lib.c @@ -12,7 +12,7 @@ #include "crypto/evp.h" #include "crypto/asn1.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" static OSSL_PARAM *paramdefs_to_params(const OSSL_PARAM *paramdefs) { diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index 1dbc9df550..a5df564605 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -14,7 +14,7 @@ #include "internal/provider.h" #include "internal/refcount.h" #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" static void *keymgmt_new(void) diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c index 727bb2731a..a4a556d98d 100644 --- a/crypto/evp/m_sha3.c +++ b/crypto/evp/m_sha3.c @@ -14,7 +14,7 @@ #include <openssl/objects.h> #include "crypto/evp.h" #include "internal/sha3.h" -#include "evp_locl.h" +#include "evp_local.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index 53074334bf..2e179bee27 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -13,7 +13,7 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen) { diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c index c38c453c73..1d6214c8a6 100644 --- a/crypto/evp/mac_lib.c +++ b/crypto/evp/mac_lib.c @@ -17,7 +17,7 @@ #include "internal/nelem.h" #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" EVP_MAC_CTX *EVP_MAC_CTX_new(EVP_MAC *mac) { diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index 9e67d9085b..c01f04ef76 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -4,7 +4,7 @@ #include <openssl/core_numbers.h> #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" static int evp_mac_up_ref(void *vmac) { diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 27fb959428..2a27f53047 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -17,7 +17,7 @@ #include <openssl/trace.h> #include <openssl/core_names.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index 2c60afe55f..005741dd15 100644 --- a/crypto/evp/pkey_mac.c +++ b/crypto/evp/pkey_mac.c @@ -14,7 +14,7 @@ #include <openssl/params.h> #include <openssl/core_names.h> #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" /* MAC PKEY context structure */ diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index 240738d3ee..e3af13ddf8 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -14,7 +14,7 @@ #include "internal/cryptlib.h" #include "crypto/evp.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov) { diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 5f0a93ed9a..7dbdb460e3 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -20,7 +20,7 @@ #include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider.h" -#include "evp_locl.h" +#include "evp_local.h" typedef const EVP_PKEY_METHOD *(*pmeth_fn)(void); typedef int sk_cmp_fn_type(const char *const *a, const char *const *b); |