diff options
Diffstat (limited to 'crypto/evp')
60 files changed, 82 insertions, 82 deletions
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 9dd3ac421b..e1b6c8cc3e 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" #include "internal/bio.h" diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index 7f99f32548..f94882829b 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -76,7 +76,7 @@ #include "internal/bio.h" #include <openssl/evp.h> #include <openssl/rand.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" static int ok_write(BIO *h, const char *buf, int num); static int ok_read(BIO *h, char *buf, int size); diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index a97eaa1685..df8e5a5bcb 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include <openssl/pkcs12.h> #include <openssl/objects.h> diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index a0b2500d11..f7d62bd2ec 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include <openssl/pkcs12.h> #include <openssl/objects.h> diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c index ba61c52564..7c7550e9ce 100644 --- a/crypto/evp/cmeth_lib.c +++ b/crypto/evp/cmeth_lib.c @@ -10,7 +10,7 @@ #include <string.h> #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 9c6aa42887..ca5f7a935e 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -14,7 +14,7 @@ #include <openssl/params.h> #include <openssl/core_names.h> #include "internal/cryptlib.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 39ed528060..17e445d8f2 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -16,11 +16,11 @@ #include <openssl/aes.h> #include <openssl/rand.h> #include <openssl/cmac.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/siv_int.h" -#include "internal/ciphermode_platform.h" +#include "crypto/modes.h" +#include "crypto/siv.h" +#include "crypto/ciphermode_platform.h" #include "evp_locl.h" typedef struct { diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 9e393f0b88..eddb9686e2 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -16,8 +16,8 @@ #include <openssl/sha.h> #include <openssl/rand.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/evp_int.h" +#include "crypto/modes.h" +#include "crypto/evp.h" #include "internal/constant_time_locl.h" typedef struct { diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index e434ec009f..7659d8f8d3 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -16,9 +16,9 @@ #include <openssl/sha.h> #include <openssl/rand.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" +#include "crypto/modes.h" #include "internal/constant_time_locl.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" typedef struct { AES_KEY ks; diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 84b14826cb..9412d51b04 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -14,9 +14,9 @@ # include <openssl/modes.h> # include <openssl/rand.h> # include <openssl/rand_drbg.h> -# include "internal/aria.h" -# include "internal/evp_int.h" -# include "internal/modes_int.h" +# include "crypto/aria.h" +# include "crypto/evp.h" +# include "crypto/modes.h" # include "evp_locl.h" /* ARIA subkey Structure */ diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c index 71cc990b25..0ac49fe1fe 100644 --- a/crypto/evp/e_bf.c +++ b/crypto/evp/e_bf.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #ifndef OPENSSL_NO_BF # include <openssl/evp.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/objects.h> # include <openssl/blowfish.h> diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index 5e66101422..50febca9bc 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -17,9 +17,9 @@ NON_EMPTY_TRANSLATION_UNIT # include <string.h> # include <assert.h> # include <openssl/camellia.h> -# include "internal/evp_int.h" -# include "internal/modes_int.h" -# include "internal/ciphermode_platform.h" +# include "crypto/evp.h" +# include "crypto/modes.h" +# include "crypto/ciphermode_platform.h" static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c index 8906bd4703..4b06717b72 100644 --- a/crypto/evp/e_cast.c +++ b/crypto/evp/e_cast.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_CAST # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/cast.h> static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 570378b1af..17cce58ff1 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -14,9 +14,9 @@ # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "evp_locl.h" -# include "internal/chacha.h" +# include "crypto/chacha.h" typedef struct { union { @@ -146,7 +146,7 @@ const EVP_CIPHER *EVP_chacha20(void) } # ifndef OPENSSL_NO_POLY1305 -# include "internal/poly1305.h" +# include "crypto/poly1305.h" typedef struct { EVP_CHACHA_KEY key; diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c index 0d8e90cfa7..e5791f3447 100644 --- a/crypto/evp/e_des.c +++ b/crypto/evp/e_des.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DES # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/des.h> # include <openssl/rand.h> diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 52fde95fb0..1ceb3fc73c 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DES # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/des.h> # include <openssl/rand.h> # include "evp_locl.h" diff --git a/crypto/evp/e_idea.c b/crypto/evp/e_idea.c index 0f7f4dd525..8c3a554108 100644 --- a/crypto/evp/e_idea.c +++ b/crypto/evp/e_idea.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_IDEA # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/idea.h> /* Can't use IMPLEMENT_BLOCK_CIPHER because IDEA_ecb_encrypt is different */ diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c index 2f3fcc88f2..2c8d27e3be 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/objects.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c index 375714a6f4..d2201b000a 100644 --- a/crypto/evp/e_rc2.c +++ b/crypto/evp/e_rc2.c @@ -14,7 +14,7 @@ # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/rc2.h> static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c index a1664b594e..092d6cf1db 100644 --- a/crypto/evp/e_rc4.c +++ b/crypto/evp/e_rc4.c @@ -16,7 +16,7 @@ # include <openssl/objects.h> # include <openssl/rc4.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" typedef struct { RC4_KEY ks; /* working key */ diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 4d61faff61..fc519d9042 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -19,7 +19,7 @@ # include <openssl/objects.h> # include <openssl/rc4.h> # include <openssl/md5.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" typedef struct { RC4_KEY ks; diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c index 95a626bd4f..d92d10f16c 100644 --- a/crypto/evp/e_rc5.c +++ b/crypto/evp/e_rc5.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_RC5 # include <openssl/evp.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/objects.h> # include "evp_locl.h" # include <openssl/rc5.h> diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c index 0861ee8b2e..9a9938deaf 100644 --- a/crypto/evp/e_seed.c +++ b/crypto/evp/e_seed.c @@ -16,7 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT # include <string.h> # include <assert.h> # include <openssl/seed.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c index 02292fa605..4653c10a14 100644 --- a/crypto/evp/e_sm4.c +++ b/crypto/evp/e_sm4.c @@ -13,8 +13,8 @@ #ifndef OPENSSL_NO_SM4 # include <openssl/evp.h> # include <openssl/modes.h> -# include "internal/sm4.h" -# include "internal/evp_int.h" +# include "crypto/sm4.h" +# include "crypto/evp.h" typedef struct { SM4_KEY ks; diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c index 285001c373..d402606b6d 100644 --- a/crypto/evp/e_xcbc_d.c +++ b/crypto/evp/e_xcbc_d.c @@ -14,7 +14,7 @@ # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include <openssl/des.h> static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c index ab80267c1e..b8c82cfafd 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -11,7 +11,7 @@ #include <limits.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" static unsigned char conv_ascii2bin(unsigned char a, diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 2685436d36..35bf42994d 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -17,7 +17,7 @@ #include <openssl/engine.h> #include <openssl/params.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index cd2bacea5d..67ba201da3 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -17,7 +17,7 @@ #include "internal/core.h" #include "internal/provider.h" #include "internal/namemap.h" -#include "internal/evp_int.h" /* evp_locl.h needs it */ +#include "crypto/evp.h" /* evp_locl.h needs it */ #include "evp_locl.h" static void default_method_store_free(void *vstore) diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 4ec880fd13..0789aa8970 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -14,7 +14,7 @@ #include <openssl/params.h> #include <openssl/core_names.h> #include <openssl/dh.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 8162a5e436..2d87905bf5 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include <openssl/pkcs12.h> #include <openssl/x509.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" /* Password based encryption (PBE) functions */ diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index bffe2b3830..a11b856c03 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -12,9 +12,9 @@ #include "internal/cryptlib.h" #include <openssl/x509.h> #include <openssl/rand.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" -#include "internal/x509_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" +#include "crypto/x509.h" /* Extract a private key from a PKCS8 structure */ diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c index 3da208a69f..b3571bea9f 100644 --- a/crypto/evp/evp_utils.c +++ b/crypto/evp/evp_utils.c @@ -14,7 +14,7 @@ #include <openssl/err.h> #include <openssl/asn1.h> /* evp_locl.h needs it */ #include <openssl/safestack.h> /* evp_locl.h needs it */ -#include "internal/evp_int.h" /* evp_locl.h needs it */ +#include "crypto/evp.h" /* evp_locl.h needs it */ #include "evp_locl.h" /* diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c index 53a25a424e..3caf03a0ce 100644 --- a/crypto/evp/exchange.c +++ b/crypto/evp/exchange.c @@ -11,7 +11,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include "internal/refcount.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "internal/numbers.h" /* includes SIZE_MAX */ #include "evp_locl.h" diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index 5c57cc360e..b2b28dece2 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -17,8 +17,8 @@ #include <openssl/kdf.h> #include <openssl/core.h> #include <openssl/core_names.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c index 7bcdcc7df3..c2b6cea673 100644 --- a/crypto/evp/kdf_meth.c +++ b/crypto/evp/kdf_meth.c @@ -12,7 +12,7 @@ #include <openssl/core.h> #include <openssl/core_numbers.h> #include <openssl/kdf.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c index 8ee28fbe60..1a4e9a297c 100644 --- a/crypto/evp/keymgmt_lib.c +++ b/crypto/evp/keymgmt_lib.c @@ -9,8 +9,8 @@ #include "internal/cryptlib.h" #include "internal/nelem.h" -#include "internal/evp_int.h" -#include "internal/asn1_int.h" +#include "crypto/evp.h" +#include "crypto/asn1.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index c170bd676b..1dbc9df550 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -13,7 +13,7 @@ #include <openssl/err.h> #include "internal/provider.h" #include "internal/refcount.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" |