summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-27 23:57:58 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-27 23:57:58 +0200
commit0c994d54afbb734ed744330d4b03a653a8477fe3 (patch)
treef88964f69776b04bdbf8b9091459caa21f379d58
parent61df2198e20ca47a4e8418c5bc47a362fd491ea3 (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/9681)
</
-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_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_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/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_dh.c2
-rw-r--r--crypto/bn/bn_lcl.h4
-rw-r--r--crypto/bn/bn_print.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/cmac/cm_pmeth.c2
-rw-r--r--crypto/cms/cms_env.c4
-rw-r--r--crypto/cms/cms_kari.c2
-rw-r--r--crypto/cms/cms_pwri.c2
-rw-r--r--crypto/cms/cms_sd.c4
-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/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_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_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_devcrypto.c2
-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/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.c2
-rw-r--r--crypto/evp/e_aes_cbc_hmac_sha1.c2
-rw-r--r--crypto/evp/e_aes_cbc_hmac_sha256.c2
-rw-r--r--crypto/evp/e_aria.c4
-rw-r--r--crypto/evp/e_bf.c2
-rw-r--r--crypto/evp/e_camellia.c2
-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_lib.c2
-rw-r--r--crypto/evp/evp_pkey.c6
-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/names.c4
-rw-r--r--crypto/evp/p_lib.c4
-rw-r--r--crypto/evp/p_sign.c2
-rw-r--r--crypto/evp/p_verify.c2
-rw-r--r--crypto/evp/pmeth_fn.c2
-rw-r--r--crypto/evp/pmeth_gn.c6
-rw-r--r--crypto/evp/pmeth_lib.c4
-rw-r--r--crypto/ex_data.c2
-rw-r--r--crypto/hmac/hm_ameth.c4
-rw-r--r--crypto/hmac/hm_pmeth.c2
-rw-r--r--crypto/include/internal/store.h10
-rw-r--r--crypto/init.c18
-rw-r--r--crypto/kdf/hkdf.c2
-rw-r--r--crypto/kdf/scrypt.c2
-rw-r--r--crypto/kdf/tls1_prf.c2
-rw-r--r--crypto/lhash/lhash.c4
-rw-r--r--crypto/md4/md4_locl.h2
-rw-r--r--crypto/md5/md5_locl.h2
-rw-r--r--crypto/mem.c2
-rw-r--r--crypto/objects/o_names.c2
-rw-r--r--crypto/objects/obj_dat.c6
-rw-r--r--crypto/objects/obj_lib.c2
-rw-r--r--crypto/ocsp/ocsp_ht.c2
-rw-r--r--crypto/pem/pem_lib.c4
-rw-r--r--crypto/pem/pem_pkey.c4
-rw-r--r--crypto/pkcs12/p12_p8e.c2
-rw-r--r--crypto/pkcs7/pk7_lib.c4
-rw-r--r--crypto/poly1305/poly1305.c2
-rw-r--r--crypto/poly1305/poly1305_ameth.c6
-rw-r--r--crypto/poly1305/poly1305_pmeth.c4
-rw-r--r--crypto/ppccap.c2