Reorganize private crypto header files
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Fri, 27 Sep 2019 22:45:33 +0000 (00:45 +0200)
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Sat, 28 Sep 2019 18:26:34 +0000 (20:26 +0200)
commit25f2138b0ab54a65ba713c093ca3734d88f7cb51
tree0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b
parentea8e1fe55b51d9da69977d8dc3f2ffd648d438df
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)
329 files changed:
.gitignore
build.info
crypto/aria/aria.c
crypto/asn1/a_d2i_fp.c
crypto/asn1/a_mbstr.c
crypto/asn1/a_object.c
crypto/asn1/a_print.c
crypto/asn1/a_sign.c
crypto/asn1/a_strex.c
crypto/asn1/a_time.c
crypto/asn1/a_verify.c
crypto/asn1/ameth_lib.c
crypto/asn1/asn_mime.c
crypto/asn1/asn_moid.c
crypto/asn1/d2i_param.c
crypto/asn1/d2i_pr.c
crypto/asn1/d2i_pu.c
crypto/asn1/f_int.c
crypto/asn1/f_string.c
crypto/asn1/i2d_param.c
crypto/asn1/i2d_pr.c
crypto/asn1/p8_pkey.c
crypto/asn1/t_pkey.c
crypto/asn1/tasn_enc.c
crypto/asn1/tasn_prn.c
crypto/asn1/x_algor.c
crypto/asn1/x_sig.c
crypto/asn1_dsa.c
crypto/async/async.c
crypto/async/async_locl.h
crypto/bio/b_print.c
crypto/blake2/m_blake2b.c
crypto/blake2/m_blake2s.c
crypto/bn/bn_conv.c
crypto/bn/bn_dh.c
crypto/bn/bn_lcl.h
crypto/bn/bn_rand.c
crypto/bn/bn_rsa_fips186_4.c
crypto/bn/bn_srp.c
crypto/chacha/chacha_enc.c
crypto/cmac/cm_ameth.c
crypto/cms/cms_env.c
crypto/cms/cms_ess.c
crypto/cms/cms_kari.c
crypto/cms/cms_pwri.c
crypto/cms/cms_sd.c
crypto/cms/cms_smime.c
crypto/comp/c_zlib.c
crypto/conf/conf_lib.c
crypto/context.c
crypto/core_namemap.c
crypto/cryptlib.c
crypto/ctype.c
crypto/dh/dh_ameth.c
crypto/dh/dh_key.c
crypto/dh/dh_pmeth.c
crypto/dh/dh_rfc5114.c
crypto/dh/dh_rfc7919.c
crypto/dllmain.c
crypto/dsa/dsa_ameth.c
crypto/dsa/dsa_asn1.c
crypto/dsa/dsa_ossl.c
crypto/dsa/dsa_pmeth.c
crypto/dso/dso_locl.h
crypto/ec/ec2_smpl.c
crypto/ec/ec_ameth.c
crypto/ec/ec_asn1.c
crypto/ec/ec_cvt.c
crypto/ec/ec_lcl.h
crypto/ec/ec_mult.c
crypto/ec/ec_pmeth.c
crypto/ec/ecdsa_ossl.c
crypto/ec/ecp_nistz256.c
crypto/ec/ecx_meth.c
crypto/engine/eng_int.h
crypto/engine/eng_openssl.c
crypto/engine/eng_rdrand.c
crypto/engine/tb_asnmth.c
crypto/err/err.c
crypto/err/err_all.c
crypto/err/openssl.ec
crypto/ess/ess_asn1.c
crypto/ess/ess_lib.c
crypto/evp/bio_md.c
crypto/evp/bio_ok.c
crypto/evp/c_allc.c
crypto/evp/c_alld.c
crypto/evp/cmeth_lib.c
crypto/evp/digest.c
crypto/evp/e_aes.c
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/evp/e_aes_cbc_hmac_sha256.c
crypto/evp/e_aria.c
crypto/evp/e_bf.c
crypto/evp/e_camellia.c
crypto/evp/e_cast.c
crypto/evp/e_chacha20_poly1305.c
crypto/evp/e_des.c
crypto/evp/e_des3.c
crypto/evp/e_idea.c
crypto/evp/e_null.c
crypto/evp/e_rc2.c
crypto/evp/e_rc4.c
crypto/evp/e_rc4_hmac_md5.c
crypto/evp/e_rc5.c
crypto/evp/e_seed.c
crypto/evp/e_sm4.c
crypto/evp/e_xcbc_d.c
crypto/evp/encode.c
crypto/evp/evp_enc.c
crypto/evp/evp_fetch.c
crypto/evp/evp_lib.c
crypto/evp/evp_pbe.c
crypto/evp/evp_pkey.c
crypto/evp/evp_utils.c
crypto/evp/exchange.c
crypto/evp/kdf_lib.c
crypto/evp/kdf_meth.c
crypto/evp/keymgmt_lib.c
crypto/evp/keymgmt_meth.c
crypto/evp/m_md2.c
crypto/evp/m_md4.c
crypto/evp/m_md5.c
crypto/evp/m_md5_sha1.c
crypto/evp/m_mdc2.c
crypto/evp/m_null.c
crypto/evp/m_ripemd.c
crypto/evp/m_sha1.c
crypto/evp/m_sha3.c
crypto/evp/m_sigver.c
crypto/evp/m_wp.c
crypto/evp/mac_lib.c
crypto/evp/mac_meth.c
crypto/evp/names.c
crypto/evp/p5_crpt2.c
crypto/evp/p_lib.c
crypto/evp/p_sign.c
crypto/evp/p_verify.c
crypto/evp/pkey_kdf.c
crypto/evp/pkey_mac.c
crypto/evp/pmeth_fn.c
crypto/evp/pmeth_gn.c
crypto/evp/pmeth_lib.c
crypto/ex_data.c
crypto/hmac/hm_ameth.c
crypto/include/internal/store.h [deleted file]
crypto/info.c
crypto/init.c
crypto/initthread.c
crypto/lhash/lhash.c
crypto/md4/md4_locl.h
crypto/md5/md5_locl.h
crypto/mem.c
crypto/modes/cbc128.c
crypto/modes/ccm128.c
crypto/modes/cfb128.c
crypto/modes/ctr128.c
crypto/modes/cts128.c
crypto/modes/gcm128.c
crypto/modes/ocb128.c
crypto/modes/ofb128.c
crypto/modes/siv128.c
crypto/modes/xts128.c
crypto/objects/o_names.c
crypto/objects/obj_dat.c
crypto/objects/obj_lib.c
crypto/ocsp/ocsp_ht.c
crypto/pem/pem_lib.c
crypto/pem/pem_pkey.c
crypto/pkcs12/p12_p8e.c
crypto/pkcs7/pk7_lib.c
crypto/poly1305/poly1305.c
crypto/poly1305/poly1305_ameth.c
crypto/ppccap.c
crypto/property/property.c
crypto/property/property_parse.c
crypto/property/property_string.c
crypto/provider_core.c
crypto/rand/drbg_lib.c
crypto/rand/rand_crng_test.c
crypto/rand/rand_lcl.h
crypto/rand/rand_lib.c
crypto/rand/rand_unix.c
crypto/rand/rand_vms.c
crypto/rand/rand_vxworks.c
crypto/rand/rand_win.c
crypto/ripemd/rmd_locl.h
crypto/rsa/rsa_ameth.c
crypto/rsa/rsa_crpt.c
crypto/rsa/rsa_lib.c
crypto/rsa/rsa_ossl.c
crypto/rsa/rsa_pmeth.c
crypto/rsa/rsa_sign.c
crypto/rsa/rsa_sp800_56b_check.c
crypto/rsa/rsa_sp800_56b_gen.c
crypto/s390xcap.c
crypto/sha/sha1dgst.c
crypto/sha/sha256.c
crypto/sha/sha512.c
crypto/sha/sha_locl.h
crypto/siphash/siphash.c
crypto/siphash/siphash_ameth.c
crypto/sm2/sm2_crypt.c
crypto/sm2/sm2_err.c
crypto/sm2/sm2_pmeth.c
crypto/sm2/sm2_sign.c
crypto/sm3/m_sm3.c
crypto/sm3/sm3_locl.h
crypto/sm4/sm4.c
crypto/sparse_array.c
crypto/srp/srp_lib.c
crypto/srp/srp_vfy.c
crypto/store/loader_file.c
crypto/store/store_init.c
crypto/store/store_lib.c
crypto/store/store_register.c
crypto/trace.c
crypto/ts/ts_rsp_sign.c
crypto/ts/ts_rsp_verify.c
crypto/x509/by_dir.c
crypto/x509/pcy_cache.c
crypto/x509/pcy_map.c
crypto/x509/t_x509.c
crypto/x509/v3_addr.c
crypto/x509/v3_asid.c
crypto/x509/v3_conf.c
crypto/x509/v3_crld.c
crypto/x509/v3_ncons.c
crypto/x509/v3_purp.c
crypto/x509/v3_skey.c
crypto/x509/v3_utl.c
crypto/x509/x509_cmp.c
crypto/x509/x509_ext.c
crypto/x509/x509_lu.c
crypto/x509/x509_obj.c
crypto/x509/x509_r2x.c
crypto/x509/x509_req.c
crypto/x509/x509_set.c
crypto/x509/x509_trs.c
crypto/x509/x509_vfy.c
crypto/x509/x509_vpm.c
crypto/x509/x509cset.c
crypto/x509/x509name.c
crypto/x509/x509rset.c
crypto/x509/x_all.c
crypto/x509/x_crl.c
crypto/x509/x_name.c
crypto/x509/x_pubkey.c
crypto/x509/x_req.c
crypto/x509/x_x509.c
crypto/x509/x_x509a.c
doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
doc/internal/man3/evp_keymgmt_export_to_provider.pod
doc/internal/man3/evp_keymgmt_freekey.pod
doc/internal/man3/ossl_init_thread_deregister.pod
doc/internal/man3/rand_bytes_ex.pod
include/crypto/__DECC_INCLUDE_EPILOGUE.H [moved from crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H with 100% similarity]
include/crypto/__DECC_INCLUDE_PROLOGUE.H [moved from crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H with 100% similarity]
include/crypto/aria.h [moved from crypto/include/internal/aria.h with 100% similarity]
include/crypto/asn1.h [moved from crypto/include/internal/asn1_int.h with 100% similarity]
include/crypto/asn1_dsa.h [moved from crypto/include/internal/asn1_dsa.h with 100% similarity]
include/crypto/async.h [moved from crypto/include/internal/async.h with 100% similarity]
include/crypto/bn.h [moved from crypto/include/internal/bn_int.h with 100% similarity]
include/crypto/bn_conf.h.in [moved from crypto/include/internal/bn_conf.h.in with 100% similarity]
include/crypto/bn_dh.h [moved from crypto/include/internal/bn_dh.h with 100% similarity]
include/crypto/bn_srp.h [moved from crypto/include/internal/bn_srp.h with 100% similarity]
include/crypto/chacha.h [moved from crypto/include/internal/chacha.h with 100% similarity]
include/crypto/ciphermode_platform.h [moved from crypto/include/internal/ciphermode_platform.h with 100% similarity]
include/crypto/cms.h [moved from crypto/include/internal/cms_int.h with 100% similarity]
include/crypto/cryptlib.h [moved from crypto/include/internal/cryptlib_int.h with 100% similarity]
include/crypto/ctype.h [moved from crypto/include/internal/ctype.h with 100% similarity]
include/crypto/dso_conf.h.in [moved from crypto/include/internal/dso_conf.h.in with 100% similarity]
include/crypto/ec.h [moved from crypto/include/internal/ec_int.h with 100% similarity]
include/crypto/engine.h [moved from crypto/include/internal/engine.h with 100% similarity]
include/crypto/err.h [moved from crypto/include/internal/err_int.h with 100% similarity]
include/crypto/ess.h [moved from crypto/include/internal/ess_int.h with 100% similarity]
include/crypto/evp.h [moved from crypto/include/internal/evp_int.h with 100% similarity]
include/crypto/lhash.h [moved from crypto/include/internal/lhash.h with 100% similarity]
include/crypto/md32_common.h [moved from crypto/include/internal/md32_common.h with 100% similarity]
include/crypto/modes.h [moved from crypto/include/internal/modes_int.h with 100% similarity]
include/crypto/objects.h [moved from crypto/include/internal/objects.h with 100% similarity]
include/crypto/poly1305.h [moved from crypto/include/internal/poly1305.h with 100% similarity]
include/crypto/rand.h [moved from crypto/include/internal/rand_int.h with 100% similarity]
include/crypto/sha.h [moved from crypto/include/internal/sha.h with 100% similarity]
include/crypto/siphash.h [moved from crypto/include/internal/siphash.h with 100% similarity]
include/crypto/siv.h [moved from crypto/include/internal/siv_int.h with 100% similarity]
include/crypto/sm2.h [moved from crypto/include/internal/sm2.h with 100% similarity]
include/crypto/sm2err.h [moved from crypto/include/internal/sm2err.h with 100% similarity]
include/crypto/sm4.h [moved from crypto/include/internal/sm4.h with 100% similarity]
include/crypto/sparse_array.h [moved from crypto/include/internal/sparse_array.h with 100% similarity]
include/crypto/store.h [moved from crypto/include/internal/store_int.h with 83% similarity]
include/crypto/x509.h [moved from crypto/include/internal/x509_int.h with 100% similarity]
providers/build.info
providers/common/ciphers/cipher_gcm.c
providers/common/ciphers/cipher_tdes.c
providers/common/digests/sha2_prov.c
providers/common/include/internal/ciphers/ciphercommon.h
providers/common/kdfs/hkdf.c
providers/common/kdfs/kbkdf.c
providers/common/kdfs/pbkdf2.c
providers/common/kdfs/sskdf.c
providers/common/kdfs/tls1_prf.c
providers/default/ciphers/cipher_aria.h
providers/default/ciphers/cipher_aria_ccm.h
providers/default/ciphers/cipher_aria_gcm.h
providers/default/ciphers/cipher_des.c
providers/default/ciphers/cipher_sm4.h
providers/default/ciphers/cipher_tdes_wrap.c
providers/default/kdfs/scrypt.c
providers/default/kdfs/sshkdf.c
providers/default/kdfs/x942kdf.c
providers/default/macs/poly1305_prov.c
providers/default/macs/siphash_prov.c
providers/fips/fipsprov.c
test/asn1_dsa_internal_test.c
test/asn1_internal_test.c
test/bn_internal_test.c
test/build.info
test/chacha_internal_test.c
test/ctype_internal_test.c
test/drbgtest.c
test/evp_extra_test.c
test/modes_internal_test.c
test/poly1305_internal_test.c
test/shlibloadtest.c
test/siphash_internal_test.c
test/sm2_internal_test.c
test/sm4_internal_test.c
test/sparse_array_test.c