From 0c994d54afbb734ed744330d4b03a653a8477fe3 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Fri, 27 Sep 2019 23:57:58 +0200 Subject: Reorganize private crypto header files Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9681) --- crypto/aria/aria.c | 2 +- crypto/asn1/a_d2i_fp.c | 2 +- crypto/asn1/a_mbstr.c | 2 +- crypto/asn1/a_object.c | 4 +- crypto/asn1/a_print.c | 2 +- crypto/asn1/a_sign.c | 4 +- crypto/asn1/a_strex.c | 2 +- crypto/asn1/a_time.c | 2 +- crypto/asn1/a_verify.c | 4 +- crypto/asn1/ameth_lib.c | 4 +- crypto/asn1/asn_mime.c | 4 +- crypto/asn1/asn_moid.c | 6 +- crypto/asn1/d2i_pr.c | 4 +- crypto/asn1/d2i_pu.c | 2 +- crypto/asn1/f_int.c | 2 +- crypto/asn1/f_string.c | 2 +- crypto/asn1/i2d_pr.c | 4 +- crypto/asn1/p8_pkey.c | 2 +- crypto/asn1/t_pkey.c | 2 +- crypto/asn1/tasn_enc.c | 2 +- crypto/asn1/tasn_prn.c | 2 +- crypto/asn1/x_algor.c | 2 +- crypto/asn1/x_sig.c | 2 +- crypto/async/async.c | 2 +- crypto/async/async_locl.h | 2 +- crypto/bio/b_print.c | 2 +- crypto/blake2/m_blake2b.c | 2 +- crypto/blake2/m_blake2s.c | 2 +- crypto/bn/bn_dh.c | 2 +- crypto/bn/bn_lcl.h | 4 +- crypto/bn/bn_print.c | 2 +- crypto/bn/bn_srp.c | 2 +- crypto/chacha/chacha_enc.c | 2 +- crypto/cmac/cm_ameth.c | 2 +- crypto/cmac/cm_pmeth.c | 2 +- crypto/cms/cms_env.c | 4 +- crypto/cms/cms_kari.c | 2 +- crypto/cms/cms_pwri.c | 2 +- crypto/cms/cms_sd.c | 4 +- crypto/cms/cms_smime.c | 2 +- crypto/comp/c_zlib.c | 2 +- crypto/conf/conf_lib.c | 2 +- crypto/cryptlib.c | 4 +- crypto/ctype.c | 2 +- crypto/dh/dh_ameth.c | 4 +- crypto/dh/dh_key.c | 2 +- crypto/dh/dh_pmeth.c | 2 +- crypto/dh/dh_rfc5114.c | 2 +- crypto/dh/dh_rfc7919.c | 2 +- crypto/dllmain.c | 2 +- crypto/dsa/dsa_ameth.c | 4 +- crypto/dsa/dsa_ossl.c | 2 +- crypto/dsa/dsa_pmeth.c | 2 +- crypto/dso/dso_locl.h | 2 +- crypto/ec/ec2_smpl.c | 2 +- crypto/ec/ec_ameth.c | 4 +- crypto/ec/ec_lcl.h | 2 +- crypto/ec/ec_mult.c | 2 +- crypto/ec/ec_pmeth.c | 2 +- crypto/ec/ecdsa_ossl.c | 2 +- crypto/ec/ecp_nistz256.c | 2 +- crypto/ec/ecx_meth.c | 4 +- crypto/engine/eng_devcrypto.c | 2 +- crypto/engine/eng_int.h | 2 +- crypto/engine/eng_openssl.c | 2 +- crypto/engine/eng_rdrand.c | 2 +- crypto/engine/tb_asnmth.c | 2 +- crypto/err/err.c | 6 +- crypto/err/err_all.c | 2 +- crypto/err/openssl.ec | 2 +- crypto/evp/bio_md.c | 2 +- crypto/evp/bio_ok.c | 2 +- crypto/evp/c_allc.c | 2 +- crypto/evp/c_alld.c | 2 +- crypto/evp/cmeth_lib.c | 2 +- crypto/evp/digest.c | 2 +- crypto/evp/e_aes.c | 2 +- crypto/evp/e_aes_cbc_hmac_sha1.c | 2 +- crypto/evp/e_aes_cbc_hmac_sha256.c | 2 +- crypto/evp/e_aria.c | 4 +- crypto/evp/e_bf.c | 2 +- crypto/evp/e_camellia.c | 2 +- crypto/evp/e_cast.c | 2 +- crypto/evp/e_chacha20_poly1305.c | 6 +- crypto/evp/e_des.c | 2 +- crypto/evp/e_des3.c | 2 +- crypto/evp/e_idea.c | 2 +- crypto/evp/e_null.c | 2 +- crypto/evp/e_rc2.c | 2 +- crypto/evp/e_rc4.c | 2 +- crypto/evp/e_rc4_hmac_md5.c | 2 +- crypto/evp/e_rc5.c | 2 +- crypto/evp/e_seed.c | 2 +- crypto/evp/e_sm4.c | 4 +- crypto/evp/e_xcbc_d.c | 2 +- crypto/evp/encode.c | 2 +- crypto/evp/evp_enc.c | 2 +- crypto/evp/evp_lib.c | 2 +- crypto/evp/evp_pkey.c | 6 +- crypto/evp/m_md2.c | 2 +- crypto/evp/m_md4.c | 2 +- crypto/evp/m_md5.c | 2 +- crypto/evp/m_md5_sha1.c | 2 +- crypto/evp/m_mdc2.c | 2 +- crypto/evp/m_null.c | 2 +- crypto/evp/m_ripemd.c | 2 +- crypto/evp/m_sha1.c | 4 +- crypto/evp/m_sha3.c | 2 +- crypto/evp/m_sigver.c | 2 +- crypto/evp/m_wp.c | 2 +- crypto/evp/names.c | 4 +- crypto/evp/p_lib.c | 4 +- crypto/evp/p_sign.c | 2 +- crypto/evp/p_verify.c | 2 +- crypto/evp/pmeth_fn.c | 2 +- crypto/evp/pmeth_gn.c | 6 +- crypto/evp/pmeth_lib.c | 4 +- crypto/ex_data.c | 2 +- crypto/hmac/hm_ameth.c | 4 +- crypto/hmac/hm_pmeth.c | 2 +- crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H | 16 - crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H | 20 - crypto/include/internal/aria.h | 50 --- crypto/include/internal/asn1_int.h | 113 ------ crypto/include/internal/async.h | 15 - crypto/include/internal/bn_conf.h.in | 27 -- crypto/include/internal/bn_dh.h | 24 -- crypto/include/internal/bn_int.h | 90 ----- crypto/include/internal/bn_srp.h | 32 -- crypto/include/internal/chacha.h | 42 -- crypto/include/internal/cryptlib_int.h | 35 -- crypto/include/internal/ctype.h | 82 ---- crypto/include/internal/dso_conf.h.in | 31 -- crypto/include/internal/ec_int.h | 53 --- crypto/include/internal/engine.h | 20 - crypto/include/internal/err_int.h | 19 - crypto/include/internal/evp_int.h | 442 ---------------------- crypto/include/internal/lhash.h | 15 - crypto/include/internal/md32_common.h | 256 ------------- crypto/include/internal/objects.h | 12 - crypto/include/internal/poly1305.h | 21 - crypto/include/internal/rand_int.h | 134 ------- crypto/include/internal/sha.h | 19 - crypto/include/internal/siphash.h | 25 -- crypto/include/internal/sm2.h | 78 ---- crypto/include/internal/sm2err.h | 65 ---- crypto/include/internal/sm3.h | 39 -- crypto/include/internal/sm4.h | 37 -- crypto/include/internal/store.h | 10 - crypto/include/internal/store_int.h | 26 -- crypto/include/internal/x509_int.h | 286 -------------- crypto/init.c | 18 +- crypto/kdf/hkdf.c | 2 +- crypto/kdf/scrypt.c | 2 +- crypto/kdf/tls1_prf.c | 2 +- crypto/lhash/lhash.c | 4 +- crypto/md4/md4_locl.h | 2 +- crypto/md5/md5_locl.h | 2 +- crypto/mem.c | 2 +- crypto/objects/o_names.c | 2 +- crypto/objects/obj_dat.c | 6 +- crypto/objects/obj_lib.c | 2 +- crypto/ocsp/ocsp_ht.c | 2 +- crypto/pem/pem_lib.c | 4 +- crypto/pem/pem_pkey.c | 4 +- crypto/pkcs12/p12_p8e.c | 2 +- crypto/pkcs7/pk7_lib.c | 4 +- crypto/poly1305/poly1305.c | 2 +- crypto/poly1305/poly1305_ameth.c | 6 +- crypto/poly1305/poly1305_pmeth.c | 4 +- crypto/ppccap.c | 2 +- crypto/rand/drbg_lib.c | 4 +- crypto/rand/rand_lib.c | 2 +- crypto/rand/rand_unix.c | 2 +- crypto/rand/rand_vms.c | 2 +- crypto/rand/rand_win.c | 2 +- crypto/ripemd/rmd_locl.h | 2 +- crypto/rsa/rsa_ameth.c | 4 +- crypto/rsa/rsa_crpt.c | 2 +- crypto/rsa/rsa_lib.c | 4 +- crypto/rsa/rsa_ossl.c | 2 +- crypto/rsa/rsa_pmeth.c | 2 +- crypto/rsa/rsa_sign.c | 2 +- crypto/sha/sha256.c | 2 +- crypto/sha/sha512.c | 2 +- crypto/sha/sha_locl.h | 2 +- crypto/siphash/siphash.c | 2 +- crypto/siphash/siphash_ameth.c | 6 +- crypto/siphash/siphash_pmeth.c | 4 +- crypto/sm2/sm2_crypt.c | 6 +- crypto/sm2/sm2_err.c | 2 +- crypto/sm2/sm2_pmeth.c | 6 +- crypto/sm2/sm2_sign.c | 6 +- crypto/sm3/m_sm3.c | 4 +- crypto/sm3/sm3_locl.h | 4 +- crypto/sm4/sm4.c | 2 +- crypto/srp/srp_lib.c | 2 +- crypto/srp/srp_vfy.c | 2 +- crypto/store/loader_file.c | 6 +- crypto/store/store_init.c | 2 +- crypto/store/store_lib.c | 2 +- crypto/store/store_register.c | 2 +- crypto/x509/by_dir.c | 2 +- crypto/x509/t_x509.c | 2 +- crypto/x509/x509_cmp.c | 2 +- crypto/x509/x509_ext.c | 2 +- crypto/x509/x509_lu.c | 2 +- crypto/x509/x509_obj.c | 2 +- crypto/x509/x509_r2x.c | 2 +- crypto/x509/x509_req.c | 2 +- crypto/x509/x509_set.c | 4 +- crypto/x509/x509_trs.c | 2 +- crypto/x509/x509_vfy.c | 4 +- crypto/x509/x509_vpm.c | 2 +- crypto/x509/x509cset.c | 2 +- crypto/x509/x509name.c | 2 +- crypto/x509/x509rset.c | 2 +- crypto/x509/x_all.c | 2 +- crypto/x509/x_crl.c | 2 +- crypto/x509/x_name.c | 6 +- crypto/x509/x_pubkey.c | 6 +- crypto/x509/x_req.c | 2 +- crypto/x509/x_x509.c | 2 +- crypto/x509/x_x509a.c | 2 +- crypto/x509v3/pcy_cache.c | 2 +- crypto/x509v3/pcy_map.c | 2 +- crypto/x509v3/v3_addr.c | 2 +- crypto/x509v3/v3_asid.c | 2 +- crypto/x509v3/v3_conf.c | 4 +- crypto/x509v3/v3_crld.c | 2 +- crypto/x509v3/v3_ncons.c | 4 +- crypto/x509v3/v3_purp.c | 2 +- crypto/x509v3/v3_skey.c | 2 +- crypto/x509v3/v3_utl.c | 4 +- 234 files changed, 277 insertions(+), 2411 deletions(-) delete mode 100644 crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H delete mode 100644 crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H delete mode 100644 crypto/include/internal/aria.h delete mode 100644 crypto/include/internal/asn1_int.h delete mode 100644 crypto/include/internal/async.h delete mode 100644 crypto/include/internal/bn_conf.h.in delete mode 100644 crypto/include/internal/bn_dh.h delete mode 100644 crypto/include/internal/bn_int.h delete mode 100644 crypto/include/internal/bn_srp.h delete mode 100644 crypto/include/internal/chacha.h delete mode 100644 crypto/include/internal/cryptlib_int.h delete mode 100644 crypto/include/internal/ctype.h delete mode 100644 crypto/include/internal/dso_conf.h.in delete mode 100644 crypto/include/internal/ec_int.h delete mode 100644 crypto/include/internal/engine.h delete mode 100644 crypto/include/internal/err_int.h delete mode 100644 crypto/include/internal/evp_int.h delete mode 100644 crypto/include/internal/lhash.h delete mode 100644 crypto/include/internal/md32_common.h delete mode 100644 crypto/include/internal/objects.h delete mode 100644 crypto/include/internal/poly1305.h delete mode 100644 crypto/include/internal/rand_int.h delete mode 100644 crypto/include/internal/sha.h delete mode 100644 crypto/include/internal/siphash.h delete mode 100644 crypto/include/internal/sm2.h delete mode 100644 crypto/include/internal/sm2err.h delete mode 100644 crypto/include/internal/sm3.h delete mode 100644 crypto/include/internal/sm4.h delete mode 100644 crypto/include/internal/store.h delete mode 100644 crypto/include/internal/store_int.h delete mode 100644 crypto/include/internal/x509_int.h (limited to 'crypto') diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c index 293bcc72bd..ce55d52664 100644 --- a/crypto/aria/aria.c +++ b/crypto/aria/aria.c @@ -19,7 +19,7 @@ */ #include -#include "internal/aria.h" +#include "crypto/aria.h" #include #include diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index a1a17901b8..a452b3deba 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -13,7 +13,7 @@ #include "internal/numbers.h" #include #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #ifndef NO_OLD_ASN1 # ifndef OPENSSL_NO_STDIO diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c index 949fe6c161..bdb697ab30 100644 --- a/crypto/asn1/a_mbstr.c +++ b/crypto/asn1/a_mbstr.c @@ -8,7 +8,7 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 5e1424a806..064835b7ec 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -9,13 +9,13 @@ #include #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include #include #include #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include "asn1_locl.h" int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index 8a373d9da9..85a631a27a 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -8,7 +8,7 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 146fdb9626..72381b6655 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -18,8 +18,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #ifndef NO_ASN1_OLD diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index ea4dd1c5b1..4879b33785 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include #include #include diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index c36dd95001..bbb07fd6d8 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -16,7 +16,7 @@ #include #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index cdaf17c3cb..4b5f54234f 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -18,8 +18,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #ifndef NO_ASN1_OLD diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index d7d270dbb5..5e8c3ed1d5 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -13,8 +13,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "standard_methods.h" diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index dfd5be6347..c7f05f24e2 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -8,13 +8,13 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/bio.h" #include "asn1_locl.h" diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index 68a01f3117..732ce972aa 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -8,13 +8,13 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include #include "internal/cryptlib.h" #include #include -#include "internal/asn1_int.h" -#include "internal/objects.h" +#include "crypto/asn1.h" +#include "crypto/objects.h" /* Simple ASN1 OID module: add all objects in a given section */ diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index aa0d6ad6ae..6ec0107380 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -15,8 +15,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index 7bc16c7bce..8327ac16ca 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -17,7 +17,7 @@ #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, long length) diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 6d6bddc651..3a18381173 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -8,7 +8,7 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index f893489a67..53dfec71b5 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -8,7 +8,7 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 445b0c8425..0374c0bfbd 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -11,8 +11,8 @@ #include "internal/cryptlib.h" #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index dbee827e0d..ab509b1ac9 100644 --- a/crypto/asn1/p8_pkey.c +++ b/crypto/asn1/p8_pkey.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/x509_int.h" +#include "crypto/x509.h" /* Minor tweak to operation: zero private key data */ static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index 3b2c9df891..651622aedc 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/bn_int.h" +#include "crypto/bn.h" /* Number of octets per line */ #define ASN1_BUF_PRINT_WIDTH 15 diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 30be314ff9..0d32f4d979 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -13,7 +13,7 @@ #include #include #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include "asn1_locl.h" static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index 1fb66f1062..dc0876508b 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -15,7 +15,7 @@ #include #include #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include "asn1_locl.h" /* diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c index 853d45b8bc..4c4a718850 100644 --- a/crypto/asn1/x_algor.c +++ b/crypto/asn1/x_algor.c @@ -11,7 +11,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" ASN1_SEQUENCE(X509_ALGOR) = { ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT), diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c index e465cf2d4d..fb24e240cb 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/x509_int.h" +#include "crypto/x509.h" ASN1_SEQUENCE(X509_SIG) = { ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR), diff --git a/crypto/async/async.c b/crypto/async/async.c index 1d83e4576f..fba15e83e8 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -19,7 +19,7 @@ #include "async_locl.h" #include -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include #define ASYNC_JOB_RUNNING 0 diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h index d7790293f7..dd1a85e026 100644 --- a/crypto/async/async_locl.h +++ b/crypto/async/async_locl.h @@ -20,7 +20,7 @@ # include #endif -#include "internal/async.h" +#include "crypto/async.h" #include typedef struct async_ctx_st async_ctx; diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index 9e907fcaa7..8ef90ac1d4 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/numbers.h" #include diff --git a/crypto/blake2/m_blake2b.c b/crypto/blake2/m_blake2b.c index c493648c3c..93ed70ce7f 100644 --- a/crypto/blake2/m_blake2b.c +++ b/crypto/blake2/m_blake2b.c @@ -21,7 +21,7 @@ # include # include # include "blake2_locl.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c index 83b2811e44..271068692c 100644 --- a/crypto/blake2/m_blake2s.c +++ b/crypto/blake2/m_blake2s.c @@ -21,7 +21,7 @@ # include # include # include "blake2_locl.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 38acdee234..3f0af5e49d 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DH #include -#include "internal/bn_dh.h" +#include "crypto/bn_dh.h" /* DH parameters from RFC5114 */ # if BN_BITS2 == 64 diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 7f823a6178..5e895b0cd1 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -18,10 +18,10 @@ # include # if !defined(OPENSSL_SYS_UEFI) -# include "internal/bn_conf.h" +# include "crypto/bn_conf.h" # endif -# include "internal/bn_int.h" +# include "crypto/bn.h" /* * These preprocessor symbols control various aspects of the bignum headers diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 1853269d90..89a4ac31e6 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -8,7 +8,7 @@ */ #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include #include "internal/cryptlib.h" #include diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index 27b6ebe518..de07b045d6 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_SRP #include -#include "internal/bn_srp.h" +#include "crypto/bn_srp.h" # if (BN_BYTES == 8) # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) diff --git a/crypto/chacha/chacha_enc.c b/crypto/chacha/chacha_enc.c index 239f68ab82..afe5b5136a 100644 --- a/crypto/chacha/chacha_enc.c +++ b/crypto/chacha/chacha_enc.c @@ -11,7 +11,7 @@ #include -#include "internal/chacha.h" +#include "crypto/chacha.h" typedef unsigned int u32; typedef unsigned char u8; diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c index a58454a089..82adf18c80 100644 --- a/crypto/cmac/cm_ameth.c +++ b/crypto/cmac/cm_ameth.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" /* * CMAC "ASN1" method. This is just here to indicate the maximum CMAC output diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c index 10748f1488..5574f25be8 100644 --- a/crypto/cmac/cm_pmeth.c +++ b/crypto/cmac/cm_pmeth.c @@ -13,7 +13,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" /* The context structure and "key" is simply a CMAC_CTX */ diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 26fb81f79a..5d8615c03e 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -15,8 +15,8 @@ #include #include #include "cms_lcl.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" /* CMS EnvelopedData Utilities */ diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 5e83814d0f..7398918317 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -15,7 +15,7 @@ #include #include #include "cms_lcl.h" -#include "internal/asn1_int.h" +#include "crypto/asn1.h" /* Key Agreement Recipient Info (KARI) routines */ diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index 26e3bdcf9e..159d788040 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -16,7 +16,7 @@ #include #include #include "cms_lcl.h" -#include "internal/asn1_int.h" +#include "crypto/asn1.h" int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass, ossl_ssize_t passlen) diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 3841513f8b..face7e2aa8 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -15,8 +15,8 @@ #include #include #include "cms_lcl.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" /* CMS SignedData Utilities */ diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 10815639f8..e0f5dc872a 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -14,7 +14,7 @@ #include #include #include "cms_lcl.h" -#include "internal/asn1_int.h" +#include "crypto/asn1.h" static BIO *cms_get_text_bio(BIO *out, unsigned int flags) { diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 7c1be358fd..a23d0d0bc2 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -13,7 +13,7 @@ #include #include "internal/comp.h" #include -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/bio.h" #include "comp_lcl.h" diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 2d40ac97ec..0b7dd26d63 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -11,7 +11,7 @@ #include #include #include "internal/conf.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include #include #include diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 7b761a3adc..1f36b20c86 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -9,7 +9,7 @@ */ #include "e_os.h" -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ @@ -49,7 +49,7 @@ typedef char variant_char; # define ossl_getenv getenv # endif -# include "internal/ctype.h" +# include "crypto/ctype.h" static int todigit(variant_char c) { diff --git a/crypto/ctype.c b/crypto/ctype.c index e05f84cd40..b7f1183f9c 100644 --- a/crypto/ctype.c +++ b/crypto/ctype.c @@ -9,7 +9,7 @@ #include #include -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "openssl/ebcdic.h" /* diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 05a1d4227e..57705e497b 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -13,8 +13,8 @@ #include #include "dh_locl.h" #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include /* diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c index 718aa422d9..6aef7f2420 100644 --- a/crypto/dh/dh_key.c +++ b/crypto/dh/dh_key.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include "dh_locl.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" static int generate_key(DH *dh); static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh); diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c index 568831f1c2..fc317e274e 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -16,7 +16,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" /* DH pkey context structure */ diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c index c4a219590e..9417558435 100644 --- a/crypto/dh/dh_rfc5114.c +++ b/crypto/dh/dh_rfc5114.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include "dh_locl.h" #include -#include "internal/bn_dh.h" +#include "crypto/bn_dh.h" /* * Macro to make a DH structure from BIGNUM data. NB: although just copying diff --git a/crypto/dh/dh_rfc7919.c b/crypto/dh/dh_rfc7919.c index a54b468e55..09c9ce7b9d 100644 --- a/crypto/dh/dh_rfc7919.c +++ b/crypto/dh/dh_rfc7919.c @@ -12,7 +12,7 @@ #include "dh_locl.h" #include #include -#include "internal/bn_dh.h" +#include "crypto/bn_dh.h" static DH *dh_param_init(const BIGNUM *p, int32_t nbits) { diff --git a/crypto/dllmain.c b/crypto/dllmain.c index 0838c55e48..e8217893b9 100644 --- a/crypto/dllmain.c +++ b/crypto/dllmain.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #if defined(_WIN32) || defined(__CYGWIN__) # ifdef __CYGWIN__ diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 49aa1ae23b..343d0fd5bb 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -14,8 +14,8 @@ #include "dsa_locl.h" #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) { diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index 16161dcadf..1d28684e3c 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" #include #include #include "dsa_locl.h" diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c index 1dd2fef9be..a085b902a8 100644 --- a/crypto/dsa/dsa_pmeth.c +++ b/crypto/dsa/dsa_pmeth.c @@ -13,7 +13,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "dsa_locl.h" /* DSA pkey context structure */ diff --git a/crypto/dso/dso_locl.h b/crypto/dso/dso_locl.h index 14a0ccb7c0..43b7df9d78 100644 --- a/crypto/dso/dso_locl.h +++ b/crypto/dso/dso_locl.h @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include "internal/dso.h" -#include "internal/dso_conf.h" +#include "crypto/dso_conf.h" #include "internal/refcount.h" /**********************************************************************/ diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index 898e741fcb..99ba7c13c5 100644 --- a/crypto/ec/ec2_smpl.c +++ b/crypto/ec/ec2_smpl.c @@ -10,7 +10,7 @@ #include -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" #ifndef OPENSSL_NO_EC2M diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index c086f47ab3..3bd66c400c 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -14,8 +14,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "ec_lcl.h" #ifndef OPENSSL_NO_CMS diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index fbdb04ea3a..e656fbd5e7 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -14,7 +14,7 @@ #include #include #include "internal/refcount.h" -#include "internal/ec_int.h" +#include "crypto/ec.h" #if defined(__SUNPRO_C) # if __SUNPRO_C >= 0x520 diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index 57bdf116f1..13fd5b1a33 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -12,7 +12,7 @@ #include #include "internal/cryptlib.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" #include "internal/refcount.h" diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c index 454be16c54..b7d5cdf310 100644 --- a/crypto/ec/ec_pmeth.c +++ b/crypto/ec/ec_pmeth.c @@ -14,7 +14,7 @@ #include #include "ec_lcl.h" #include -#include "internal/evp_int.h" +#include "crypto/evp.h" /* EC pkey context structure */ diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c index c35ed2dcd0..f21a689902 100644 --- a/crypto/ec/ecdsa_ossl.c +++ b/crypto/ec/ecdsa_ossl.c @@ -11,7 +11,7 @@ #include #include #include -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen, diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index 7ad5eb627d..43becb2fec 100644 --- a/crypto/ec/ecp_nistz256.c +++ b/crypto/ec/ecp_nistz256.c @@ -21,7 +21,7 @@ #include #include "internal/cryptlib.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" #include "internal/refcount.h" diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 55429642fd..0504831b11 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -12,8 +12,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "ec_lcl.h" #include "curve448/curve448_lcl.h" diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index a727c6f646..49e9ce1af3 100644 --- a/crypto/engine/eng_devcrypto.c +++ b/crypto/engine/eng_devcrypto.c @@ -22,7 +22,7 @@ #include #include -#include "internal/engine.h" +#include "crypto/engine.h" /* #define ENGINE_DEVCRYPTO_DEBUG */ diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index b95483341e..b5f3b502c1 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -12,7 +12,7 @@ # define HEADER_ENGINE_INT_H # include "internal/cryptlib.h" -# include "internal/engine.h" +# include "crypto/engine.h" # include "internal/thread_once.h" # include "internal/refcount.h" diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index d9b3067a13..baedc73284 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -11,7 +11,7 @@ #include #include #include "internal/cryptlib.h" -#include "internal/engine.h" +#include "crypto/engine.h" #include #include #include diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index 261e5debbf..9dceb16710 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c @@ -11,7 +11,7 @@ #include #include -#include "internal/engine.h" +#include "crypto/engine.h" #include #include #include diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 4bcc76136a..9c7e73d65f 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -10,7 +10,7 @@ #include "e_os.h" #include "eng_int.h" #include -#include "internal/asn1_int.h" +#include "crypto/asn1.h" /* * If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the diff --git a/crypto/err/err.c b/crypto/err/err.c index 3a58ccb958..ec8a7851af 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -10,16 +10,16 @@ #include #include #include -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/err.h" -#include "internal/err_int.h" +#include "crypto/err.h" #include #include #include #include #include #include "internal/thread_once.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/constant_time_locl.h" #include "e_os.h" diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index d9ec04b606..7c0a5f0b9c 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -8,7 +8,7 @@ */ #include -#include "internal/err_int.h" +#include "crypto/err.h" #include #include #include diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 3e092eae0a..f9f8c404c3 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -32,7 +32,7 @@ L CMS include/openssl/cms.h crypto/cms/cms_err.c L CT include/openssl/ct.h crypto/ct/ct_err.c L ASYNC include/openssl/async.h crypto/async/async_err.c L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c -L SM2 crypto/include/internal/sm2.h crypto/sm2/sm2_err.c +L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c L OSSL_STORE include/openssl/store.h crypto/store/store_err.c # additional header files to be scanned for function names diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 288dee01b2..6a78c359a1 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include #include -#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 300db6cd32..a77cfb1552 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -76,7 +76,7 @@ #include "internal/bio.h" #include #include -#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 086b3c4d51..22fdcc409c 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include #include diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index 1267531a7d..16ac1b67f4 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include #include diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c index e2295c4dc5..d635dfca4e 100644 --- a/crypto/evp/cmeth_lib.c +++ b/crypto/evp/cmeth_lib.c @@ -10,7 +10,7 @@ #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.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 6693f270b6..d1b127a19d 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" /* This call frees resources associated with the context */ diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 1db346fc86..046bc2745a 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -14,7 +14,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "modes_lcl.h" #include #include "evp_locl.h" diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 09d24dc3d0..853c5f9c6f 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -18,7 +18,7 @@ #include #include #include "modes_lcl.h" -#include "internal/evp_int.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 caac0c9d3d..570ec00bc6 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -20,7 +20,7 @@ #include #include "modes_lcl.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 fcaceb3bca..a6998bad54 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -14,8 +14,8 @@ # include # include # include -# include "internal/aria.h" -# include "internal/evp_int.h" +# include "crypto/aria.h" +# include "crypto/evp.h" # include "modes_lcl.h" # include "evp_locl.h" diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c index dc386905c5..9a065582c6 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 -# include "internal/evp_int.h" +# include "crypto/evp.h" # include # include diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index 2df4a6e3e0..d70d3964cf 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -17,7 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "modes_lcl.h" static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c index 259d44059b..df9f445bd0 100644 --- a/crypto/evp/e_cast.c +++ b/crypto/evp/e_cast.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_CAST # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include 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 435a38d365..5d7dca3ba6 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -15,8 +15,8 @@ # include # include # include "evp_locl.h" -# include "internal/evp_int.h" -# include "internal/chacha.h" +# include "crypto/evp.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 c13fb3e25a..6d6e919af6 100644 --- a/crypto/evp/e_des.c +++ b/crypto/evp/e_des.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DES # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include # include diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 6b492ce470..bb426bd9b4 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DES # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include # include # include "evp_locl.h" diff --git a/crypto/evp/e_idea.c b/crypto/evp/e_idea.c index 93f6a4131f..1068378ddc 100644 --- a/crypto/evp/e_idea.c +++ b/crypto/evp/e_idea.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_IDEA # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include /* 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 18a8468216..0725454a3a 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#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 aa0d140186..4d8a0ee4b0 100644 --- a/crypto/evp/e_rc2.c +++ b/crypto/evp/e_rc2.c @@ -14,7 +14,7 @@ # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include 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 d16abdd0d2..c24bc8fe59 100644 --- a/crypto/evp/e_rc4.c +++ b/crypto/evp/e_rc4.c @@ -16,7 +16,7 @@ # include # include -# 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 b1e8ccd6dd..201ce44343 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -19,7 +19,7 @@ # include # include # include -# 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 dc5589b688..a105339190 100644 --- a/crypto/evp/e_rc5.c +++ b/crypto/evp/e_rc5.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_RC5 # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include # include "evp_locl.h" # include diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c index 40aec5fc6a..aeb2363bea 100644 --- a/crypto/evp/e_seed.c +++ b/crypto/evp/e_seed.c @@ -16,7 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include -# 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 79deb65636..fce32794fc 100644 --- a/crypto/evp/e_sm4.c +++ b/crypto/evp/e_sm4.c @@ -13,8 +13,8 @@ #ifndef OPENSSL_NO_SM4 # include # include -# 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 57ce813da8..b730775422 100644 --- a/crypto/evp/e_xcbc_d.c +++ b/crypto/evp/e_xcbc_d.c @@ -14,7 +14,7 @@ # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" # include 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 da32d4fd19..e70f80f5c9 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include #include "evp_locl.h" -#include "internal/evp_int.h" +#include "crypto/evp.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 05dd791b6c..ddf3045f56 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -15,7 +15,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c) diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 4935c2a94a..1931e5a3a9 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index e61a8761a9..586b74605c 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -12,9 +12,9 @@ #include "internal/cryptlib.h" #include #include -#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/m_md2.c b/crypto/evp/m_md2.c index c4e28ae17a..1aec518523 100644 --- a/crypto/evp/m_md2.c +++ b/crypto/evp/m_md2.c @@ -18,7 +18,7 @@ # include # include -#include "internal/evp_int.h" +#include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c index 0efc586dba..45d2cafee1 100644 --- a/crypto/evp/m_md4.c +++ b/crypto/evp/m_md4.c @@ -17,7 +17,7 @@ # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c index 3d96ae93b6..d26b5a4d31 100644 --- a/crypto/evp/m_md5.c +++ b/crypto/evp/m_md5.c @@ -17,7 +17,7 @@ # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c index 2d98886ba0..eeec2b13e9 100644 --- a/crypto/evp/m_md5_sha1.c +++ b/crypto/evp/m_md5_sha1.c @@ -15,7 +15,7 @@ # include # include # include "internal/cryptlib.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" # include struct md5_sha1_ctx { diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index 1051a9070f..fffa751efd 100644 --- a/crypto/evp/m_mdc2.c +++ b/crypto/evp/m_mdc2.c @@ -17,7 +17,7 @@ # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_null.c b/crypto/evp/m_null.c index 5dce1d510e..0847139df1 100644 --- a/crypto/evp/m_null.c +++ b/crypto/evp/m_null.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index 7ab320843c..d93ad24fe5 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -17,7 +17,7 @@ # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c index ac52417855..22b9bbc7d8 100644 --- a/crypto/evp/m_sha1.c +++ b/crypto/evp/m_sha1.c @@ -14,8 +14,8 @@ #include #include #include -#include "internal/evp_int.h" -#include "internal/sha.h" +#include "crypto/evp.h" +#include "crypto/sha.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c index 01cf57d313..e0f8e9e416 100644 --- a/crypto/evp/m_sha3.c +++ b/crypto/evp/m_sha3.c @@ -12,7 +12,7 @@ #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len, diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index 94e37f02b2..e16546f7e0 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen) diff --git a/crypto/evp/m_wp.c b/crypto/evp/m_wp.c index 27e2b3c5ca..5ce15d2d5e 100644 --- a/crypto/evp/m_wp.c +++ b/crypto/evp/m_wp.c @@ -16,7 +16,7 @@ # include # include # include -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 077c2a6c4b..90c7b73b7a 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -10,9 +10,9 @@ #include #include "internal/cryptlib.h" #include -#include "internal/objects.h" +#include "crypto/objects.h" #include -#include "internal/evp_int.h" +#include "crypto/evp.h" int EVP_add_cipher(const EVP_CIPHER *c) { diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 3cd7ca8d54..e57fa9e289 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -21,8 +21,8 @@ #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" static void EVP_PKEY_free_it(EVP_PKEY *x); diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c index 6cb442e4f9..0383294a87 100644 --- a/crypto/evp/p_sign.c +++ b/crypto/evp/p_sign.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY *pkey) diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c index 6e8c565dfd..e27196f7c2 100644 --- a/crypto/evp/p_verify.c +++ b/crypto/evp/p_verify.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, unsigned int siglen, EVP_PKEY *pkey) diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index de1c07e171..02f4093461 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" #define M_check_autoarg(ctx, arg, arglen, err) \ if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \ diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index e14965f333..3ad6d5c7c7 100644 --- a/crypto/evp/pmeth_gn.c +++ b/crypto/evp/pmeth_gn.c @@ -12,9 +12,9 @@ #include "internal/cryptlib.h" #include #include -#include "internal/bn_int.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/bn.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx) { diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 7fbf895e07..d44063de53 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -13,8 +13,8 @@ #include #include #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/numbers.h" typedef int sk_cmp_fn_type(const char *const *a, const char *const *b); diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 08dc7c4073..22f3b70edf 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/thread_once.h" /* diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c index fa204e9068..638f61b586 100644 --- a/crypto/hmac/hm_ameth.c +++ b/crypto/hmac/hm_ameth.c @@ -10,8 +10,8 @@ #include #include "internal/cryptlib.h" #include -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" /* * HMAC "ASN1" method. This is just here to indicate the maximum HMAC output diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c index 55dd27d63b..56f98707f5 100644 --- a/crypto/hmac/hm_pmeth.c +++ b/crypto/hmac/hm_pmeth.c @@ -14,7 +14,7 @@ #include #include #include -#include "internal/evp_int.h" +#include "crypto/evp.h" /* HMAC pkey context structure */ diff --git a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H b/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H deleted file mode 100644 index c350018ad1..0000000000 --- a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -/* - * This file is only used by HP C on VMS, and is included automatically - * after each header file from this directory - */ - -/* restore state. Must correspond to the save in __decc_include_prologue.h */ -#pragma names restore diff --git a/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H b/c