summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 00:45:33 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 20:26:34 +0200
commit25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch)
tree0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b
parentea8e1fe55b51d9da69977d8dc3f2ffd648d438df (diff)
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
<
-rw-r--r--.gitignore2
-rw-r--r--build.info14
-rw-r--r--crypto/aria/aria.c2
-rw-r--r--crypto/asn1/a_d2i_fp.c2
-rw-r--r--crypto/asn1/a_mbstr.c2
-rw-r--r--crypto/asn1/a_object.c4
-rw-r--r--crypto/asn1/a_print.c2
-rw-r--r--crypto/asn1/a_sign.c4
-rw-r--r--crypto/asn1/a_strex.c2
-rw-r--r--crypto/asn1/a_time.c2
-rw-r--r--crypto/asn1/a_verify.c4
-rw-r--r--crypto/asn1/ameth_lib.c4
-rw-r--r--crypto/asn1/asn_mime.c4
-rw-r--r--crypto/asn1/asn_moid.c6
-rw-r--r--crypto/asn1/d2i_param.c4
-rw-r--r--crypto/asn1/d2i_pr.c4
-rw-r--r--crypto/asn1/d2i_pu.c2
-rw-r--r--crypto/asn1/f_int.c2
-rw-r--r--crypto/asn1/f_string.c2
-rw-r--r--crypto/asn1/i2d_param.c4
-rw-r--r--crypto/asn1/i2d_pr.c4
-rw-r--r--crypto/asn1/p8_pkey.c2
-rw-r--r--crypto/asn1/t_pkey.c2
-rw-r--r--crypto/asn1/tasn_enc.c2
-rw-r--r--crypto/asn1/tasn_prn.c2
-rw-r--r--crypto/asn1/x_algor.c2
-rw-r--r--crypto/asn1/x_sig.c2
-rw-r--r--crypto/asn1_dsa.c2
-rw-r--r--crypto/async/async.c2
-rw-r--r--crypto/async/async_locl.h2
-rw-r--r--crypto/bio/b_print.c2
-rw-r--r--crypto/blake2/m_blake2b.c2
-rw-r--r--crypto/blake2/m_blake2s.c2
-rw-r--r--crypto/bn/bn_conv.c2
-rw-r--r--crypto/bn/bn_dh.c2
-rw-r--r--crypto/bn/bn_lcl.h4
-rw-r--r--crypto/bn/bn_rand.c2
-rw-r--r--crypto/bn/bn_rsa_fips186_4.c2
-rw-r--r--crypto/bn/bn_srp.c2
-rw-r--r--crypto/chacha/chacha_enc.c2
-rw-r--r--crypto/cmac/cm_ameth.c2
-rw-r--r--crypto/cms/cms_env.c4
-rw-r--r--crypto/cms/cms_ess.c4
-rw-r--r--crypto/cms/cms_kari.c2
-rw-r--r--crypto/cms/cms_pwri.c2
-rw-r--r--crypto/cms/cms_sd.c8
-rw-r--r--crypto/cms/cms_smime.c2
-rw-r--r--crypto/comp/c_zlib.c2
-rw-r--r--crypto/conf/conf_lib.c2
-rw-r--r--crypto/context.c2
-rw-r--r--crypto/core_namemap.c2
-rw-r--r--crypto/cryptlib.c4
-rw-r--r--crypto/ctype.c2
-rw-r--r--crypto/dh/dh_ameth.c4
-rw-r--r--crypto/dh/dh_key.c2
-rw-r--r--crypto/dh/dh_pmeth.c2
-rw-r--r--crypto/dh/dh_rfc5114.c2
-rw-r--r--crypto/dh/dh_rfc7919.c2
-rw-r--r--crypto/dllmain.c2
-rw-r--r--crypto/dsa/dsa_ameth.c4
-rw-r--r--crypto/dsa/dsa_asn1.c2
-rw-r--r--crypto/dsa/dsa_ossl.c2
-rw-r--r--crypto/dsa/dsa_pmeth.c2
-rw-r--r--crypto/dso/dso_locl.h2
-rw-r--r--crypto/ec/ec2_smpl.c2
-rw-r--r--crypto/ec/ec_ameth.c4
-rw-r--r--crypto/ec/ec_asn1.c2
-rw-r--r--crypto/ec/ec_cvt.c2
-rw-r--r--crypto/ec/ec_lcl.h2
-rw-r--r--crypto/ec/ec_mult.c2
-rw-r--r--crypto/ec/ec_pmeth.c2
-rw-r--r--crypto/ec/ecdsa_ossl.c2
-rw-r--r--crypto/ec/ecp_nistz256.c2
-rw-r--r--crypto/ec/ecx_meth.c4
-rw-r--r--crypto/engine/eng_int.h2
-rw-r--r--crypto/engine/eng_openssl.c2
-rw-r--r--crypto/engine/eng_rdrand.c2
-rw-r--r--crypto/engine/tb_asnmth.c2
-rw-r--r--crypto/err/err.c6
-rw-r--r--crypto/err/err_all.c2
-rw-r--r--crypto/err/openssl.ec2
-rw-r--r--crypto/ess/ess_asn1.c2
-rw-r--r--crypto/ess/ess_lib.c2
-rw-r--r--crypto/evp/bio_md.c2
-rw-r--r--crypto/evp/bio_ok.c2
-rw-r--r--crypto/evp/c_allc.c2
-rw-r--r--crypto/evp/c_alld.c2
-rw-r--r--crypto/evp/cmeth_lib.c2
-rw-r--r--crypto/evp/digest.c2
-rw-r--r--crypto/evp/e_aes.c8
-rw-r--r--crypto/evp/e_aes_cbc_hmac_sha1.c4
-rw-r--r--crypto/evp/e_aes_cbc_hmac_sha256.c4
-rw-r--r--crypto/evp/e_aria.c6
-rw-r--r--crypto/evp/e_bf.c2
-rw-r--r--crypto/evp/e_camellia.c6
-rw-r--r--crypto/evp/e_cast.c2
-rw-r--r--crypto/evp/e_chacha20_poly1305.c6
-rw-r--r--crypto/evp/e_des.c2
-rw-r--r--crypto/evp/e_des3.c2
-rw-r--r--crypto/evp/e_idea.c2
-rw-r--r--crypto/evp/e_null.c2
-rw-r--r--crypto/evp/e_rc2.c2
-rw-r--r--crypto/evp/e_rc4.c2
-rw-r--r--crypto/evp/e_rc4_hmac_md5.c2
-rw-r--r--crypto/evp/e_rc5.c2
-rw-r--r--crypto/evp/e_seed.c2
-rw-r--r--crypto/evp/e_sm4.c4
-rw-r--r--crypto/evp/e_xcbc_d.c2
-rw-r--r--crypto/evp/encode.c2
-rw-r--r--crypto/evp/evp_enc.c2
-rw-r--r--crypto/evp/evp_fetch.c2
-rw-r--r--crypto/evp/evp_lib.c2
-rw-r--r--crypto/evp/evp_pbe.c2
-rw-r--r--crypto/evp/evp_pkey.c6
-rw-r--r--crypto/evp/evp_utils.c2
-rw-r--r--crypto/evp/exchange.c2
-rw-r--r--crypto/evp/kdf_lib.c4
-rw-r--r--crypto/evp/kdf_meth.c2
-rw-r--r--crypto/evp/keymgmt_lib.c4
-rw-r--r--crypto/evp/keymgmt_meth.c2
-rw-r--r--crypto/evp/m_md2.c2
-rw-r--r--crypto/evp/m_md4.c2
-rw-r--r--crypto/evp/m_md5.c2
-rw-r--r--crypto/evp/m_md5_sha1.c2
-rw-r--r--crypto/evp/m_mdc2.c2
-rw-r--r--crypto/evp/m_null.c2
-rw-r--r--crypto/evp/m_ripemd.c2
-rw-r--r--crypto/evp/m_sha1.c4
-rw-r--r--crypto/evp/m_sha3.c2
-rw-r--r--crypto/evp/m_sigver.c2
-rw-r--r--crypto/evp/m_wp.c2
-rw-r--r--crypto/evp/mac_lib.c2
-rw-r--r--crypto/evp/mac_meth.c2
-rw-r--r--crypto/evp/names.c4
-rw-r--r--crypto/evp/p5_crpt2.c2
-rw-r--r--crypto/evp/p_lib.c4
-rw-r--r--