From b39fc560612984e65ec30d7f37487303bf514fb3 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 14 May 2015 16:56:48 +0200 Subject: Identify and move common internal libcrypto header files There are header files in crypto/ that are used by a number of crypto/ submodules. Move those to crypto/include/internal and adapt the affected source code and Makefiles. The header files that got moved are: crypto/cryptolib.h crypto/md32_common.h Reviewed-by: Rich Salz --- crypto/Makefile | 2 +- crypto/aes/aes_ige.c | 2 +- crypto/aes/aes_wrap.c | 2 +- crypto/asn1/a_bitstr.c | 2 +- crypto/asn1/a_d2i_fp.c | 2 +- crypto/asn1/a_digest.c | 2 +- crypto/asn1/a_dup.c | 2 +- crypto/asn1/a_enum.c | 2 +- crypto/asn1/a_gentm.c | 2 +- crypto/asn1/a_i2d_fp.c | 2 +- crypto/asn1/a_int.c | 2 +- crypto/asn1/a_mbstr.c | 2 +- crypto/asn1/a_object.c | 2 +- crypto/asn1/a_octet.c | 2 +- crypto/asn1/a_print.c | 2 +- crypto/asn1/a_sign.c | 2 +- crypto/asn1/a_strex.c | 2 +- crypto/asn1/a_strnid.c | 2 +- crypto/asn1/a_time.c | 2 +- crypto/asn1/a_type.c | 2 +- crypto/asn1/a_utctm.c | 2 +- crypto/asn1/a_utf8.c | 2 +- crypto/asn1/a_verify.c | 2 +- crypto/asn1/ameth_lib.c | 2 +- crypto/asn1/asn1_gen.c | 2 +- crypto/asn1/asn1_lib.c | 2 +- crypto/asn1/asn1_par.c | 2 +- crypto/asn1/asn_mime.c | 2 +- crypto/asn1/asn_moid.c | 2 +- crypto/asn1/asn_mstbl.c | 2 +- crypto/asn1/asn_pack.c | 2 +- crypto/asn1/d2i_pr.c | 2 +- crypto/asn1/d2i_pu.c | 2 +- crypto/asn1/evp_asn1.c | 2 +- crypto/asn1/f_enum.c | 2 +- crypto/asn1/f_int.c | 2 +- crypto/asn1/f_string.c | 2 +- crypto/asn1/i2d_pr.c | 2 +- crypto/asn1/i2d_pu.c | 2 +- crypto/asn1/n_pkey.c | 2 +- crypto/asn1/p5_pbe.c | 2 +- crypto/asn1/p5_pbev2.c | 2 +- crypto/asn1/p8_pkey.c | 2 +- crypto/asn1/t_bitst.c | 2 +- crypto/asn1/t_crl.c | 2 +- crypto/asn1/t_pkey.c | 2 +- crypto/asn1/t_req.c | 2 +- crypto/asn1/t_spki.c | 2 +- crypto/asn1/t_x509.c | 2 +- crypto/asn1/t_x509a.c | 2 +- crypto/asn1/tasn_enc.c | 2 +- crypto/asn1/tasn_prn.c | 2 +- crypto/asn1/tasn_scn.c | 2 +- crypto/asn1/x_bignum.c | 2 +- crypto/asn1/x_crl.c | 2 +- crypto/asn1/x_info.c | 2 +- crypto/asn1/x_long.c | 2 +- crypto/asn1/x_pkey.c | 2 +- crypto/asn1/x_pubkey.c | 2 +- crypto/asn1/x_req.c | 2 +- crypto/asn1/x_sig.c | 2 +- crypto/asn1/x_spki.c | 2 +- crypto/asn1/x_val.c | 2 +- crypto/asn1/x_x509.c | 2 +- crypto/asn1/x_x509a.c | 2 +- crypto/bio/b_dump.c | 2 +- crypto/bio/b_print.c | 2 +- crypto/bio/b_sock.c | 2 +- crypto/bio/bf_buff.c | 2 +- crypto/bio/bf_lbuf.c | 2 +- crypto/bio/bf_nbio.c | 2 +- crypto/bio/bf_null.c | 2 +- crypto/bio/bio_cb.c | 2 +- crypto/bio/bio_lib.c | 2 +- crypto/bio/bss_acpt.c | 2 +- crypto/bio/bss_conn.c | 2 +- crypto/bio/bss_dgram.c | 2 +- crypto/bio/bss_fd.c | 2 +- crypto/bio/bss_file.c | 2 +- crypto/bio/bss_log.c | 2 +- crypto/bio/bss_mem.c | 2 +- crypto/bio/bss_null.c | 2 +- crypto/bio/bss_sock.c | 2 +- crypto/bn/bn_add.c | 2 +- crypto/bn/bn_asm.c | 2 +- crypto/bn/bn_blind.c | 2 +- crypto/bn/bn_ctx.c | 2 +- crypto/bn/bn_depr.c | 2 +- crypto/bn/bn_div.c | 2 +- crypto/bn/bn_exp.c | 2 +- crypto/bn/bn_exp2.c | 2 +- crypto/bn/bn_gcd.c | 2 +- crypto/bn/bn_gf2m.c | 2 +- crypto/bn/bn_intern.c | 2 +- crypto/bn/bn_kron.c | 2 +- crypto/bn/bn_lib.c | 2 +- crypto/bn/bn_mod.c | 2 +- crypto/bn/bn_mont.c | 2 +- crypto/bn/bn_mpi.c | 2 +- crypto/bn/bn_mul.c | 2 +- crypto/bn/bn_nist.c | 2 +- crypto/bn/bn_prime.c | 2 +- crypto/bn/bn_print.c | 2 +- crypto/bn/bn_rand.c | 2 +- crypto/bn/bn_recp.c | 2 +- crypto/bn/bn_shift.c | 2 +- crypto/bn/bn_sqr.c | 2 +- crypto/bn/bn_sqrt.c | 2 +- crypto/bn/bn_word.c | 2 +- crypto/bn/vms-helper.c | 2 +- crypto/buffer/buf_str.c | 2 +- crypto/buffer/buffer.c | 2 +- crypto/cmac/cm_ameth.c | 2 +- crypto/cmac/cm_pmeth.c | 2 +- crypto/cmac/cmac.c | 2 +- crypto/cms/cms_cd.c | 2 +- crypto/cms/cms_dd.c | 2 +- crypto/cms/cms_enc.c | 2 +- crypto/cms/cms_env.c | 2 +- crypto/cms/cms_ess.c | 2 +- crypto/cms/cms_kari.c | 2 +- crypto/cms/cms_pwri.c | 2 +- crypto/cms/cms_sd.c | 2 +- crypto/cms/cms_smime.c | 2 +- crypto/conf/conf_def.c | 2 +- crypto/conf/conf_mall.c | 2 +- crypto/conf/conf_mod.c | 2 +- crypto/conf/conf_sap.c | 2 +- crypto/cryptlib.c | 2 +- crypto/cryptlib.h | 111 --------- crypto/cversion.c | 2 +- crypto/des/enc_read.c | 2 +- crypto/des/enc_writ.c | 2 +- crypto/dh/dh_ameth.c | 2 +- crypto/dh/dh_asn1.c | 2 +- crypto/dh/dh_check.c | 2 +- crypto/dh/dh_depr.c | 2 +- crypto/dh/dh_gen.c | 2 +- crypto/dh/dh_key.c | 2 +- crypto/dh/dh_lib.c | 2 +- crypto/dh/dh_pmeth.c | 2 +- crypto/dh/dh_prn.c | 2 +- crypto/dh/dh_rfc5114.c | 2 +- crypto/dsa/dsa_ameth.c | 2 +- crypto/dsa/dsa_asn1.c | 2 +- crypto/dsa/dsa_depr.c | 2 +- crypto/dsa/dsa_gen.c | 2 +- crypto/dsa/dsa_key.c | 2 +- crypto/dsa/dsa_lib.c | 2 +- crypto/dsa/dsa_ossl.c | 2 +- crypto/dsa/dsa_pmeth.c | 2 +- crypto/dsa/dsa_prn.c | 2 +- crypto/dsa/dsa_sign.c | 2 +- crypto/dsa/dsa_vrf.c | 2 +- crypto/dso/dso_dl.c | 2 +- crypto/dso/dso_dlfcn.c | 2 +- crypto/dso/dso_lib.c | 2 +- crypto/dso/dso_null.c | 2 +- crypto/dso/dso_openssl.c | 2 +- crypto/dso/dso_vms.c | 2 +- crypto/dso/dso_win32.c | 2 +- crypto/ec/ec_ameth.c | 2 +- crypto/ec/ec_pmeth.c | 2 +- crypto/ec/eck_prn.c | 2 +- crypto/ec/ecp_nistz256.c | 2 +- crypto/ecdh/ech_ossl.c | 2 +- crypto/engine/eng_all.c | 2 +- crypto/engine/eng_int.h | 2 +- crypto/engine/eng_openssl.c | 2 +- crypto/engine/eng_table.c | 2 +- crypto/err/err.c | 2 +- crypto/err/err_prn.c | 2 +- crypto/evp/bio_b64.c | 2 +- crypto/evp/bio_enc.c | 2 +- crypto/evp/bio_md.c | 2 +- crypto/evp/bio_ok.c | 2 +- crypto/evp/c_all.c | 2 +- crypto/evp/c_allc.c | 2 +- crypto/evp/c_alld.c | 2 +- crypto/evp/digest.c | 2 +- crypto/evp/e_bf.c | 2 +- crypto/evp/e_cast.c | 2 +- crypto/evp/e_des.c | 2 +- crypto/evp/e_des3.c | 2 +- crypto/evp/e_dsa.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_rc5.c | 2 +- crypto/evp/e_xcbc_d.c | 2 +- crypto/evp/encode.c | 2 +- crypto/evp/evp_acnf.c | 2 +- crypto/evp/evp_cnf.c | 2 +- crypto/evp/evp_enc.c | 2 +- crypto/evp/evp_key.c | 2 +- crypto/evp/evp_lib.c | 2 +- crypto/evp/evp_pbe.c | 2 +- crypto/evp/evp_pkey.c | 2 +- crypto/evp/m_dss1.c | 2 +- crypto/evp/m_ecdsa.c | 2 +- crypto/evp/m_md2.c | 2 +- crypto/evp/m_md4.c | 2 +- crypto/evp/m_md5.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 | 2 +- crypto/evp/m_sigver.c | 2 +- crypto/evp/m_wp.c | 2 +- crypto/evp/names.c | 2 +- crypto/evp/p5_crpt.c | 2 +- crypto/evp/p5_crpt2.c | 2 +- crypto/evp/p_dec.c | 2 +- crypto/evp/p_enc.c | 2 +- crypto/evp/p_lib.c | 2 +- crypto/evp/p_open.c | 2 +- crypto/evp/p_seal.c | 2 +- crypto/evp/p_sign.c | 2 +- crypto/evp/p_verify.c | 2 +- crypto/evp/pmeth_fn.c | 2 +- crypto/evp/pmeth_gn.c | 2 +- crypto/evp/pmeth_lib.c | 2 +- crypto/ex_data.c | 2 +- crypto/hmac/hm_ameth.c | 2 +- crypto/hmac/hm_pmeth.c | 2 +- crypto/hmac/hmac.c | 2 +- crypto/include/internal/cryptlib.h | 111 +++++++++ crypto/include/internal/md32_common.h | 417 ++++++++++++++++++++++++++++++++++ crypto/lhash/lh_stats.c | 2 +- crypto/lock.c | 2 +- crypto/md2/md2_one.c | 2 +- crypto/md32_common.h | 417 ---------------------------------- crypto/md4/md4_locl.h | 2 +- crypto/md5/md5_locl.h | 2 +- crypto/mdc2/mdc2_one.c | 2 +- crypto/mem.c | 2 +- crypto/mem_dbg.c | 2 +- crypto/modes/wrap128.c | 2 +- crypto/o_fips.c | 2 +- crypto/objects/obj_dat.c | 2 +- crypto/objects/obj_lib.c | 2 +- crypto/ocsp/ocsp_cl.c | 2 +- crypto/ocsp/ocsp_ext.c | 2 +- crypto/ocsp/ocsp_lib.c | 2 +- crypto/ocsp/ocsp_srv.c | 2 +- crypto/ocsp/v3_ocsp.c | 2 +- crypto/pem/pem_all.c | 2 +- crypto/pem/pem_info.c | 2 +- crypto/pem/pem_lib.c | 2 +- crypto/pem/pem_oth.c | 2 +- crypto/pem/pem_pk8.c | 2 +- crypto/pem/pem_pkey.c | 2 +- crypto/pem/pem_seal.c | 2 +- crypto/pem/pem_sign.c | 2 +- crypto/pem/pem_x509.c | 2 +- crypto/pem/pem_xaux.c | 2 +- crypto/pem/pvkfmt.c | 2 +- crypto/pkcs12/p12_add.c | 2 +- crypto/pkcs12/p12_asn.c | 2 +- crypto/pkcs12/p12_attr.c | 2 +- crypto/pkcs12/p12_crpt.c | 2 +- crypto/pkcs12/p12_crt.c | 2 +- crypto/pkcs12/p12_decr.c | 2 +- crypto/pkcs12/p12_init.c | 2 +- crypto/pkcs12/p12_key.c | 2 +- crypto/pkcs12/p12_kiss.c | 2 +- crypto/pkcs12/p12_mutl.c | 2 +- crypto/pkcs12/p12_p8d.c | 2 +- crypto/pkcs12/p12_p8e.c | 2 +- crypto/pkcs12/p12_utl.c | 2 +- crypto/pkcs7/pk7_asn1.c | 2 +- crypto/pkcs7/pk7_dgst.c | 2 +- crypto/pkcs7/pk7_doit.c | 2 +- crypto/pkcs7/pk7_enc.c | 2 +- crypto/pkcs7/pk7_lib.c | 2 +- crypto/pkcs7/pk7_mime.c | 2 +- crypto/pkcs7/pk7_smime.c | 2 +- crypto/pqueue/pqueue.c | 2 +- crypto/rand/rand_lib.c | 2 +- crypto/rand/rand_nw.c | 2 +- crypto/rand/rand_os2.c | 2 +- crypto/rand/rand_unix.c | 2 +- crypto/rand/rand_win.c | 2 +- crypto/rc4/rc4_locl.h | 2 +- crypto/ripemd/rmd_locl.h | 2 +- crypto/rsa/rsa_ameth.c | 2 +- crypto/rsa/rsa_asn1.c | 2 +- crypto/rsa/rsa_crpt.c | 2 +- crypto/rsa/rsa_depr.c | 2 +- crypto/rsa/rsa_eay.c | 2 +- crypto/rsa/rsa_gen.c | 2 +- crypto/rsa/rsa_lib.c | 2 +- crypto/rsa/rsa_none.c | 2 +- crypto/rsa/rsa_null.c | 2 +- crypto/rsa/rsa_oaep.c | 2 +- crypto/rsa/rsa_pk1.c | 2 +- crypto/rsa/rsa_pmeth.c | 2 +- crypto/rsa/rsa_prn.c | 2 +- crypto/rsa/rsa_pss.c | 2 +- crypto/rsa/rsa_saos.c | 2 +- crypto/rsa/rsa_sign.c | 2 +- crypto/rsa/rsa_ssl.c | 2 +- crypto/rsa/rsa_x931.c | 2 +- crypto/sha/sha256.c | 2 +- crypto/sha/sha512.c | 2 +- crypto/sha/sha_locl.h | 2 +- crypto/srp/srp_lib.c | 2 +- crypto/srp/srp_vfy.c | 2 +- crypto/stack/stack.c | 2 +- crypto/thr_id.c | 2 +- crypto/ts/ts_conf.c | 2 +- crypto/ts/ts_lib.c | 2 +- crypto/ts/ts_req_print.c | 2 +- crypto/ts/ts_req_utils.c | 2 +- crypto/ts/ts_rsp_print.c | 2 +- crypto/ts/ts_rsp_sign.c | 2 +- crypto/ts/ts_rsp_utils.c | 2 +- crypto/ts/ts_rsp_verify.c | 2 +- crypto/ts/ts_verify_ctx.c | 2 +- crypto/txt_db/txt_db.c | 2 +- crypto/ui/ui_lib.c | 2 +- crypto/ui/ui_openssl.c | 2 +- crypto/x509/by_dir.c | 2 +- crypto/x509/by_file.c | 2 +- crypto/x509/x509_att.c | 2 +- crypto/x509/x509_cmp.c | 2 +- crypto/x509/x509_d2.c | 2 +- crypto/x509/x509_def.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 | 2 +- crypto/x509/x509_trs.c | 2 +- crypto/x509/x509_txt.c | 2 +- crypto/x509/x509_v3.c | 2 +- crypto/x509/x509_vfy.c | 2 +- crypto/x509/x509_vpm.c | 2 +- crypto/x509/x509cset.c | 2 +- crypto/x509/x509name.c | 2 +- crypto/x509/x509rset.c | 2 +- crypto/x509/x509spki.c | 2 +- crypto/x509/x509type.c | 2 +- crypto/x509/x_all.c | 2 +- crypto/x509/x_attrib.c | 2 +- crypto/x509/x_name.c | 2 +- crypto/x509v3/pcy_cache.c | 2 +- crypto/x509v3/pcy_data.c | 2 +- crypto/x509v3/pcy_lib.c | 2 +- crypto/x509v3/pcy_map.c | 2 +- crypto/x509v3/pcy_tree.c | 2 +- crypto/x509v3/v3_addr.c | 2 +- crypto/x509v3/v3_akey.c | 2 +- crypto/x509v3/v3_akeya.c | 2 +- crypto/x509v3/v3_alt.c | 2 +- crypto/x509v3/v3_asid.c | 2 +- crypto/x509v3/v3_bcons.c | 2 +- crypto/x509v3/v3_bitst.c | 2 +- crypto/x509v3/v3_conf.c | 2 +- crypto/x509v3/v3_cpols.c | 2 +- crypto/x509v3/v3_crld.c | 2 +- crypto/x509v3/v3_enum.c | 2 +- crypto/x509v3/v3_extku.c | 2 +- crypto/x509v3/v3_genn.c | 2 +- crypto/x509v3/v3_ia5.c | 2 +- crypto/x509v3/v3_info.c | 2 +- crypto/x509v3/v3_int.c | 2 +- crypto/x509v3/v3_lib.c | 2 +- crypto/x509v3/v3_ncons.c | 2 +- crypto/x509v3/v3_pci.c | 2 +- crypto/x509v3/v3_pcons.c | 2 +- crypto/x509v3/v3_pku.c | 2 +- crypto/x509v3/v3_pmaps.c | 2 +- crypto/x509v3/v3_prn.c | 2 +- crypto/x509v3/v3_purp.c | 2 +- crypto/x509v3/v3_scts.c | 2 +- crypto/x509v3/v3_skey.c | 2 +- crypto/x509v3/v3_sxnet.c | 2 +- crypto/x509v3/v3_utl.c | 2 +- crypto/x509v3/v3conf.c | 2 +- 382 files changed, 906 insertions(+), 906 deletions(-) delete mode 100644 crypto/cryptlib.h create mode 100644 crypto/include/internal/cryptlib.h create mode 100644 crypto/include/internal/md32_common.h delete mode 100644 crypto/md32_common.h diff --git a/crypto/Makefile b/crypto/Makefile index 33ec1b83b3..caffc77b4a 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -43,7 +43,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ SRC= $(LIBSRC) -HEADER= cryptlib.h buildinf.h md32_common.h +HEADER= buildinf.h arm_arch.h ppc_arch.h sparc_arch.h ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c index cf31c9bba4..c789cc06ab 100644 --- a/crypto/aes/aes_ige.c +++ b/crypto/aes/aes_ige.c @@ -49,7 +49,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "aes_locl.h" diff --git a/crypto/aes/aes_wrap.c b/crypto/aes/aes_wrap.c index b7b64d57a4..b370a4f9a0 100644 --- a/crypto/aes/aes_wrap.c +++ b/crypto/aes/aes_wrap.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index 60b6e6d403..5f7ae6a373 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index 13e47fde08..2e61029a1d 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 8fac13b89e..57adcccd49 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef NO_SYS_TYPES_H # include diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c index 349ab56213..60d3544365 100644 --- a/crypto/asn1/a_dup.c +++ b/crypto/asn1/a_dup.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #ifndef NO_OLD_ASN1 diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index aed3de5fee..81c0f3a14c 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index 324496e30c..209880ced8 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -62,7 +62,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c index e0f236e640..353c2c5605 100644 --- a/crypto/asn1/a_i2d_fp.c +++ b/crypto/asn1/a_i2d_fp.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index 228297803b..56a72fb759 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c index ddb2798069..241eb60bcc 100644 --- a/crypto/asn1/a_mbstr.c +++ b/crypto/asn1/a_mbstr.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include static int traverse_string(const unsigned char *p, int len, int inform, diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 7cedce82e7..ab37fa315f 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c index f6fd62224a..430f00faee 100644 --- a/crypto/asn1/a_octet.c +++ b/crypto/asn1/a_octet.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x) diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index 0e129cb142..05d12a5927 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include int ASN1_PRINTABLE_type(const unsigned char *s, int len) diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index e189958174..ab1959e812 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -112,7 +112,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef NO_SYS_TYPES_H # include diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 243e29a8fe..2f233a2608 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index 92d4134fc5..7bfc76816f 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 6114c52dc7..c2b556523b 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -63,7 +63,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 283baaaeae..474aecadc6 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 5fd1a6a3c4..9144922ab4 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "asn1_locl.h" diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c index 23dc2e828a..8697c66efd 100644 --- a/crypto/asn1/a_utf8.c +++ b/crypto/asn1/a_utf8.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include /* UTF8 utilities */ diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index 5b908f14ce..540b71c4d4 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef NO_SYS_TYPES_H # include diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index ce4c0dcaf9..1a615431cc 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #ifndef OPENSSL_NO_ENGINE diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index 3ff1db8e0b..5f01b8dac1 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -57,7 +57,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index bda6ab09b4..b611f35f22 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index 574e8de867..9a370cd4bc 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index 9ce4013049..2a227be5c5 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -55,7 +55,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index 9459bb249e..bb334d015e 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -60,7 +60,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/asn_mstbl.c b/crypto/asn1/asn_mstbl.c index a2e80b1fd6..b53715783a 100644 --- a/crypto/asn1/asn_mstbl.c +++ b/crypto/asn1/asn_mstbl.c @@ -56,7 +56,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index b80016ba82..d8655badb8 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include /* ASN1 packing and unpacking functions */ diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 793532f493..b92af8b5f4 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index 189cfddf1e..11176f0e16 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c index bf131a44f0..4c3f3e0ffe 100644 --- a/crypto/asn1/evp_asn1.c +++ b/crypto/asn1/evp_asn1.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/f_enum.c b/crypto/asn1/f_enum.c index eabfd3796e..4b85be933c 100644 --- a/crypto/asn1/f_enum.c +++ b/crypto/asn1/f_enum.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 880c284024..61029fa586 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index c82f2a192d..cecbb4a0b2 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 2a6aa19c07..54a3d7b4bd 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "internal/asn1_int.h" diff --git a/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c index b8ed355411..e1f702acd8 100644 --- a/crypto/asn1/i2d_pu.c +++ b/crypto/asn1/i2d_pu.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 0d8480b8dd..1b8c4c0a8d 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef OPENSSL_NO_RSA # include # include diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c index ec738ded18..cc91fad53b 100644 --- a/crypto/asn1/p5_pbe.c +++ b/crypto/asn1/p5_pbe.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index c7a12402b2..23ed232dd3 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index 0a425cd29d..ff55a5bdb0 100644 --- a/crypto/asn1/p8_pkey.c +++ b/crypto/asn1/p8_pkey.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c index 83c5af7005..daee7f550c 100644 --- a/crypto/asn1/t_bitst.c +++ b/crypto/asn1/t_bitst.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/t_crl.c b/crypto/asn1/t_crl.c index 7becb4ce4e..96c5226a5c 100644 --- a/crypto/asn1/t_crl.c +++ b/crypto/asn1/t_crl.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index f31e5e175f..b137da7cb2 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "internal/bn_int.h" diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 01eabfadd8..fd83023335 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c index 3bf48db509..46914f900f 100644 --- a/crypto/asn1/t_spki.c +++ b/crypto/asn1/t_spki.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #ifndef OPENSSL_NO_RSA diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index 76c6c1ecbc..377be399df 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #ifndef OPENSSL_NO_RSA diff --git a/crypto/asn1/t_x509a.c b/crypto/asn1/t_x509a.c index f4b8f94cb3..12fedb8edf 100644 --- a/crypto/asn1/t_x509a.c +++ b/crypto/asn1/t_x509a.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 74f3eda2e7..35860e4514 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index e080e724a4..716db8f7c2 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/tasn_scn.c b/crypto/asn1/tasn_scn.c index 43a125cb55..f0d37d1044 100644 --- a/crypto/asn1/tasn_scn.c +++ b/crypto/asn1/tasn_scn.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c index a5a403c26e..8307a2d729 100644 --- a/crypto/asn1/x_bignum.c +++ b/crypto/asn1/x_bignum.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index 0d759beb6d..d264ec7091 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "asn1_locl.h" #include diff --git a/crypto/asn1/x_info.c b/crypto/asn1/x_info.c index 856bcf58b2..5be934c690 100644 --- a/crypto/asn1/x_info.c +++ b/crypto/asn1/x_info.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c index 3aed44a3dd..d4b75e6b9a 100644 --- a/crypto/asn1/x_long.c +++ b/crypto/asn1/x_long.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c index b01616fb8d..afd3aab2d2 100644 --- a/crypto/asn1/x_pkey.c +++ b/crypto/asn1/x_pkey.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 2605f07013..d20afb982e 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "internal/asn1_int.h" diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index ae293aa0ca..1679a56070 100644 --- a/crypto/asn1/x_req.c +++ b/crypto/asn1/x_req.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c index dd33720c10..472174b3c6 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c index 1df6b87d2b..88625655f1 100644 --- a/crypto/asn1/x_spki.c +++ b/crypto/asn1/x_spki.c @@ -62,7 +62,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c index ee75a1e254..845a7c30f6 100644 --- a/crypto/asn1/x_val.c +++ b/crypto/asn1/x_val.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index 1b353af844..17bbb913f6 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c index b0a6b4a70a..d81ccfb62f 100644 --- a/crypto/asn1/x_x509a.c +++ b/crypto/asn1/x_x509a.c @@ -58,7 +58,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c index 622a261d52..33191c1b30 100644 --- a/crypto/bio/b_dump.c +++ b/crypto/bio/b_dump.c @@ -61,7 +61,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bio_lcl.h" #define TRUNCATE diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index 7c81e25d48..06cadc8a63 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -72,7 +72,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef NO_SYS_TYPES_H # include #endif diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index e3a1ee94da..48e40360ad 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -60,7 +60,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK) # include diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index 6487f437d5..4fd8d15405 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include static int buffer_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c index e948e924b9..cc429813e2 100644 --- a/crypto/bio/bf_lbuf.c +++ b/crypto/bio/bf_lbuf.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index dc98c4fd5d..7980711d3d 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index e0c79e8291..0d55b15150 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include /* diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index dcb428b351..f0dfe8268c 100644 --- a/crypto/bio/bio_cb.c +++ b/crypto/bio/bio_cb.c @@ -59,7 +59,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index 7542d1c885..19cd06983f 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -59,7 +59,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 48435b09eb..16a660800d 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -59,7 +59,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #ifndef OPENSSL_NO_SOCK diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 9b2cee44cf..f23adb217a 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -59,7 +59,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #ifndef OPENSSL_NO_SOCK diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 268481c9ab..58725a1466 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -60,7 +60,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #ifndef OPENSSL_NO_DGRAM diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 5f4e34481b..5bade20e36 100644 --- a/crypto/bio/bss_fd.c +++ b/crypto/bio/bss_fd.c @@ -59,7 +59,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #if defined(OPENSSL_NO_POSIX_IO) /* diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 1da6b86181..cebad75456 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -85,7 +85,7 @@ # include # include -# include "cryptlib.h" +# include "internal/cryptlib.h" # include "bio_lcl.h" # include diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 2399ff8b10..f59ec7cce7 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -65,7 +65,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #if defined(OPENSSL_SYS_WINCE) #elif defined(OPENSSL_SYS_WIN32) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index c55344d320..a1f5e8d960 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include static int mem_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c index 6a03fa2465..ba39c4c8a1 100644 --- a/crypto/bio/bss_null.c +++ b/crypto/bio/bss_null.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include static int null_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 5a73e81315..1673b32b3d 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -59,7 +59,7 @@ #include #include #define USE_SOCKETS -#include "cryptlib.h" +#include "internal/cryptlib.h" #ifndef OPENSSL_NO_SOCK diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c index 57e1cdac16..a446686c74 100644 --- a/crypto/bn/bn_add.c +++ b/crypto/bn/bn_add.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /* r can == a or b */ diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c index cb5a8037b2..38c10e161c 100644 --- a/crypto/bn/bn_asm.c +++ b/crypto/bn/bn_asm.c @@ -63,7 +63,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #if defined(BN_LLONG) || defined(BN_UMULT_HIGH) diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c index 52f74d1e57..4ae6b09668 100644 --- a/crypto/bn/bn_blind.c +++ b/crypto/bn/bn_blind.c @@ -109,7 +109,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #define BN_BLINDING_COUNTER 32 diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c index 481c9d2496..c023303b67 100644 --- a/crypto/bn/bn_ctx.c +++ b/crypto/bn/bn_ctx.c @@ -62,7 +62,7 @@ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /*- diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c index bc15f8317e..c4a5c820d0 100644 --- a/crypto/bn/bn_depr.c +++ b/crypto/bn/bn_depr.c @@ -60,7 +60,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #include diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c index 1dead86e90..cbf27d3e94 100644 --- a/crypto/bn/bn_div.c +++ b/crypto/bn/bn_div.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /* The old slow way */ diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c index 17aa2ba5bf..6ce6f8d168 100644 --- a/crypto/bn/bn_exp.c +++ b/crypto/bn/bn_exp.c @@ -109,7 +109,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #include diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c index e36c23bc33..517b961023 100644 --- a/crypto/bn/bn_exp2.c +++ b/crypto/bn/bn_exp2.c @@ -110,7 +110,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #define TABLE_SIZE 32 diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c index 9902e4eee9..17c6cf5ce3 100644 --- a/crypto/bn/bn_gcd.c +++ b/crypto/bn/bn_gcd.c @@ -109,7 +109,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" static BIGNUM *euclid(BIGNUM *a, BIGNUM *b); diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c index 50d7c74085..caad2d0d0d 100644 --- a/crypto/bn/bn_gf2m.c +++ b/crypto/bn/bn_gf2m.c @@ -92,7 +92,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #ifndef OPENSSL_NO_EC2M diff --git a/crypto/bn/bn_intern.c b/crypto/bn/bn_intern.c index c3ea5619b2..0b222517d4 100644 --- a/crypto/bn/bn_intern.c +++ b/crypto/bn/bn_intern.c @@ -52,7 +52,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /* diff --git a/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c index 88d731ac75..5a0eb7dfd2 100644 --- a/crypto/bn/bn_kron.c +++ b/crypto/bn/bn_kron.c @@ -53,7 +53,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /* least significant word */ diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index fec70a5ccc..4dabe26b10 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -63,7 +63,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" const char BN_version[] = "Big Number" OPENSSL_VERSION_PTEXT; diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c index e4763ff2c6..d7e4f9a627 100644 --- a/crypto/bn/bn_mod.c +++ b/crypto/bn/bn_mod.c @@ -113,7 +113,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx) diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c index 613a384c51..c869101384 100644 --- a/crypto/bn/bn_mont.c +++ b/crypto/bn/bn_mont.c @@ -116,7 +116,7 @@ * sections 3.8 and 4.2 in http://security.ece.orst.edu/koc/papers/r01rsasw.pdf */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #define MONT_WORD /* use the faster word-based algorithm */ diff --git a/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c index 3bd40bbd2b..c4c0adfe61 100644 --- a/crypto/bn/bn_mpi.c +++ b/crypto/bn/bn_mpi.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" int BN_bn2mpi(const BIGNUM *a, unsigned char *d) diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c index f3b48590bc..b601923eef 100644 --- a/crypto/bn/bn_mul.c +++ b/crypto/bn/bn_mul.c @@ -62,7 +62,7 @@ #endif #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #if defined(OPENSSL_NO_ASM) || !defined(OPENSSL_BN_ASM_PART_WORDS) diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c index af048d3a3b..621b1424ce 100644 --- a/crypto/bn/bn_nist.c +++ b/crypto/bn/bn_nist.c @@ -57,7 +57,7 @@ */ #include "bn_lcl.h" -#include "cryptlib.h" +#include "internal/cryptlib.h" #define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2 #define BN_NIST_224_TOP (224+BN_BITS2-1)/BN_BITS2 diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index ebfcd97e6c..c83820cc25 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -111,7 +111,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #include diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 1ef5a879c2..b0b70b5dae 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -58,7 +58,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include "bn_lcl.h" diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index ed3c3c5911..4dd3f924a7 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -111,7 +111,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" #include #include diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c index 3ab486bf59..3dc2166c7d 100644 --- a/crypto/bn/bn_recp.c +++ b/crypto/bn/bn_recp.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" void BN_RECP_CTX_init(BN_RECP_CTX *recp) diff --git a/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c index 9895646afa..1b38bd861a 100644 --- a/crypto/bn/bn_shift.c +++ b/crypto/bn/bn_shift.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" int BN_lshift1(BIGNUM *r, const BIGNUM *a) diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c index aa31f6e825..9f5a5dc2d8 100644 --- a/crypto/bn/bn_sqr.c +++ b/crypto/bn/bn_sqr.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" /* r must not be a */ diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c index ab691b79aa..ec18641150 100644 --- a/crypto/bn/bn_sqrt.c +++ b/crypto/bn/bn_sqrt.c @@ -57,7 +57,7 @@ * */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) diff --git a/crypto/bn/bn_word.c b/crypto/bn/bn_word.c index a17e7029ba..57f0dcd115 100644 --- a/crypto/bn/bn_word.c +++ b/crypto/bn/bn_word.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w) diff --git a/crypto/bn/vms-helper.c b/crypto/bn/vms-helper.c index b226af32a7..c5cf468da5 100644 --- a/crypto/bn/vms-helper.c +++ b/crypto/bn/vms-helper.c @@ -54,7 +54,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include "bn_lcl.h" bn_div_words_abort(int i) diff --git a/crypto/buffer/buf_str.c b/crypto/buffer/buf_str.c index ebc5ab4646..1e8d7f6f10 100644 --- a/crypto/buffer/buf_str.c +++ b/crypto/buffer/buf_str.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include size_t BUF_strnlen(const char *str, size_t maxlen) diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c index b41b8f2b37..37e5484dbd 100644 --- a/crypto/buffer/buffer.c +++ b/crypto/buffer/buffer.c @@ -57,7 +57,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include /* diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c index 07853a63d3..223631c3c0 100644 --- a/crypto/cmac/cm_ameth.c +++ b/crypto/cmac/cm_ameth.c @@ -52,7 +52,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include "internal/asn1_int.h" diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c index 013ac57094..22c7dbee06 100644 --- a/crypto/cmac/cm_pmeth.c +++ b/crypto/cmac/cm_pmeth.c @@ -52,7 +52,7 @@ */ #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c index e7db3206f5..0711bffd8a 100644 --- a/crypto/cmac/cmac.c +++ b/crypto/cmac/cmac.c @@ -55,7 +55,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include struct CMAC_CTX_st { diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index 8673e00646..889133ee74 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c index 09ad319b87..d4067859a3 100644 --- a/crypto/cms/cms_dd.c +++ b/crypto/cms/cms_dd.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index ed20c53617..f9556acc2e 100644 --- a/crypto/cms/cms_enc.c +++ b/crypto/cms/cms_enc.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 7fefd246e3..5c86dd9972 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index 9dfbd67e5f..d75ea169e9 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index d860f0927d..d56dd9b84b 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index 1d505e9d1c..f722d9a9b6 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 7fb4385f60..ab574fc334 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index c161973d29..0d97d3e5f3 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -52,7 +52,7 @@ * ==================================================================== */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index ee71f48200..098fc8ec32 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -60,7 +60,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 8e16342e28..5db7da076d 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index b01319fd39..7fbb4ad9a4 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -60,7 +60,7 @@ #include #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 544fe97387..e99a38ef63 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -59,7 +59,7 @@ #include #include -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #include #include diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 69883ab929..6d050ffa3d 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -114,7 +114,7 @@ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */ -#include "cryptlib.h" +#include "internal/cryptlib.h" #include #if defined(OPENSSL_SYS_WIN32) diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h deleted file mode 100644 index fba180a6b2..0000000000 --- a/crypto/cryptlib.h +++ /dev/null @@ -1,111 +0,0 @@ -/* crypto/cryptlib.h */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.]