From ec577822f95a8bca0023c5c77cef1a4916822d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Fri, 23 Apr 1999 22:13:45 +0000 Subject: Change #include filenames from to . Submitted by: Reviewed by: PR: --- Configure | 25 ++++++++++++++++++++++ Makefile.org | 4 +++- apps/apps.h | 10 ++++----- apps/asn1pars.c | 8 +++---- apps/ca.c | 20 ++++++++--------- apps/ciphers.c | 4 ++-- apps/crl.c | 10 ++++----- apps/crl2p7.c | 12 +++++------ apps/dgst.c | 12 +++++------ apps/dh.c | 12 +++++------ apps/dsa.c | 12 +++++------ apps/dsaparam.c | 14 ++++++------ apps/eay.c | 30 +++++++++++++------------- apps/enc.c | 14 ++++++------ apps/errstr.c | 8 +++---- apps/gendh.c | 14 ++++++------ apps/gendsa.c | 14 ++++++------ apps/genrsa.c | 16 +++++++------- apps/nseq.c | 4 ++-- apps/openssl.c | 16 +++++++------- apps/pem_mail.c | 12 +++++------ apps/pkcs12.c | 6 +++--- apps/pkcs7.c | 12 +++++------ apps/req.c | 20 ++++++++--------- apps/rsa.c | 12 +++++------ apps/s_cb.c | 6 +++--- apps/s_client.c | 8 +++---- apps/s_server.c | 12 +++++------ apps/s_socket.c | 2 +- apps/s_time.c | 8 +++---- apps/sc.c | 8 +++---- apps/sess_id.c | 10 ++++----- apps/speed.c | 38 ++++++++++++++++----------------- apps/verify.c | 8 +++---- apps/version.c | 4 ++-- apps/x509.c | 18 ++++++++-------- bugs/stream.c | 4 ++-- crypto/Makefile.ssl | 6 +++--- crypto/asn1/Makefile.ssl | 6 +++--- crypto/asn1/a_bitstr.c | 2 +- crypto/asn1/a_bmp.c | 2 +- crypto/asn1/a_bool.c | 2 +- crypto/asn1/a_bytes.c | 2 +- crypto/asn1/a_d2i_fp.c | 4 ++-- crypto/asn1/a_digest.c | 6 +++--- crypto/asn1/a_dup.c | 2 +- crypto/asn1/a_enum.c | 2 +- crypto/asn1/a_gentm.c | 2 +- crypto/asn1/a_hdr.c | 4 ++-- crypto/asn1/a_i2d_fp.c | 4 ++-- crypto/asn1/a_int.c | 2 +- crypto/asn1/a_meth.c | 4 ++-- crypto/asn1/a_object.c | 6 +++--- crypto/asn1/a_octet.c | 2 +- crypto/asn1/a_print.c | 2 +- crypto/asn1/a_set.c | 2 +- crypto/asn1/a_sign.c | 10 ++++----- 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 | 10 ++++----- crypto/asn1/a_vis.c | 2 +- crypto/asn1/asn1.h | 4 ++-- crypto/asn1/asn1_err.c | 4 ++-- crypto/asn1/asn1_lib.c | 4 ++-- crypto/asn1/asn1_mac.h | 6 +++--- crypto/asn1/asn1_par.c | 6 +++--- crypto/asn1/asn_pack.c | 2 +- crypto/asn1/d2i_dhp.c | 8 +++---- crypto/asn1/d2i_dsap.c | 8 +++---- crypto/asn1/d2i_pr.c | 8 +++---- crypto/asn1/d2i_pu.c | 8 +++---- crypto/asn1/d2i_r_pr.c | 8 +++---- crypto/asn1/d2i_r_pu.c | 8 +++---- crypto/asn1/d2i_s_pr.c | 8 +++---- crypto/asn1/d2i_s_pu.c | 8 +++---- crypto/asn1/evp_asn1.c | 4 ++-- crypto/asn1/f.c | 4 ++-- crypto/asn1/f_enum.c | 4 ++-- crypto/asn1/f_int.c | 4 ++-- crypto/asn1/f_string.c | 4 ++-- crypto/asn1/i2d_dhp.c | 6 +++--- crypto/asn1/i2d_dsap.c | 6 +++--- crypto/asn1/i2d_pr.c | 6 +++--- crypto/asn1/i2d_pu.c | 6 +++--- crypto/asn1/i2d_r_pr.c | 8 +++---- crypto/asn1/i2d_r_pu.c | 8 +++---- crypto/asn1/i2d_s_pr.c | 8 +++---- crypto/asn1/i2d_s_pu.c | 8 +++---- crypto/asn1/n_pkey.c | 10 ++++----- crypto/asn1/nsseq.c | 8 +++---- crypto/asn1/p5_pbe.c | 4 ++-- crypto/asn1/p5_pbev2.c | 4 ++-- crypto/asn1/p7_dgst.c | 4 ++-- crypto/asn1/p7_enc.c | 4 ++-- crypto/asn1/p7_enc_c.c | 4 ++-- crypto/asn1/p7_evp.c | 4 ++-- crypto/asn1/p7_i_s.c | 4 ++-- crypto/asn1/p7_lib.c | 4 ++-- crypto/asn1/p7_recip.c | 4 ++-- crypto/asn1/p7_s_e.c | 4 ++-- crypto/asn1/p7_signd.c | 4 ++-- crypto/asn1/p7_signi.c | 4 ++-- crypto/asn1/p8_pkey.c | 2 +- crypto/asn1/pkcs8.c | 4 ++-- crypto/asn1/t_crl.c | 10 ++++----- crypto/asn1/t_pkey.c | 10 ++++----- crypto/asn1/t_req.c | 8 +++---- crypto/asn1/t_x509.c | 14 ++++++------ crypto/asn1/x_algor.c | 2 +- crypto/asn1/x_attrib.c | 4 ++-- crypto/asn1/x_cinf.c | 2 +- crypto/asn1/x_crl.c | 4 ++-- crypto/asn1/x_exten.c | 4 ++-- crypto/asn1/x_info.c | 6 +++--- crypto/asn1/x_name.c | 4 ++-- crypto/asn1/x_pkey.c | 6 +++--- crypto/asn1/x_pubkey.c | 2 +- crypto/asn1/x_req.c | 4 ++-- crypto/asn1/x_sig.c | 2 +- crypto/asn1/x_spki.c | 4 ++-- crypto/asn1/x_val.c | 2 +- crypto/asn1/x_x509.c | 4 ++-- crypto/bf/Makefile.ssl | 6 +++--- crypto/bf/bf_cbc.c | 2 +- crypto/bf/bf_cfb64.c | 2 +- crypto/bf/bf_ecb.c | 4 ++-- crypto/bf/bf_enc.c | 2 +- crypto/bf/bf_locl.h | 2 +- crypto/bf/bf_ofb64.c | 2 +- crypto/bf/bf_opts.c | 2 +- crypto/bf/bf_skey.c | 2 +- crypto/bf/bfspeed.c | 2 +- crypto/bf/bftest.c | 2 +- crypto/bio/Makefile.ssl | 6 +++--- crypto/bio/b_dump.c | 2 +- crypto/bio/b_print.c | 2 +- crypto/bio/b_sock.c | 2 +- crypto/bio/bf_buff.c | 4 ++-- crypto/bio/bf_nbio.c | 6 +++--- crypto/bio/bf_null.c | 4 ++-- crypto/bio/bio.h | 2 +- crypto/bio/bio_cb.c | 4 ++-- crypto/bio/bio_err.c | 4 ++-- crypto/bio/bio_lib.c | 6 +++--- crypto/bio/bss_acpt.c | 2 +- crypto/bio/bss_conn.c | 2 +- crypto/bio/bss_file.c | 4 ++-- crypto/bio/bss_log.c | 4 ++-- crypto/bio/bss_mem.c | 2 +- crypto/bio/bss_null.c | 2 +- crypto/bio/bss_rtcp.c | 2 +- crypto/bio/bss_sock.c | 2 +- crypto/bn/Makefile.ssl | 6 +++--- crypto/bn/bn.h | 2 +- crypto/bn/bn_err.c | 4 ++-- crypto/bn/bn_lcl.h | 2 +- crypto/bn/bn_m.c | 2 +- crypto/bn/bn_opts.c | 8 +++---- crypto/bn/bn_prime.c | 2 +- crypto/bn/bn_print.c | 2 +- crypto/bn/bn_rand.c | 2 +- crypto/bn/bnspeed.c | 8 +++---- crypto/bn/bntest.c | 12 +++++------ crypto/bn/d.c | 2 +- crypto/bn/exp.c | 2 +- crypto/bn/expspeed.c | 8 +++---- crypto/bn/exptest.c | 8 +++---- crypto/buffer/Makefile.ssl | 6 +++--- crypto/buffer/buf_err.c | 4 ++-- crypto/buffer/buffer.c | 2 +- crypto/cast/Makefile.ssl | 6 +++--- crypto/cast/c_cfb64.c | 2 +- crypto/cast/c_ecb.c | 4 ++-- crypto/cast/c_enc.c | 2 +- crypto/cast/c_ofb64.c | 2 +- crypto/cast/c_skey.c | 2 +- crypto/cast/cast_spd.c | 2 +- crypto/cast/castopts.c | 2 +- crypto/cast/casttest.c | 2 +- crypto/comp/Makefile.ssl | 6 +++--- crypto/comp/c_rle.c | 4 ++-- crypto/comp/c_zlib.c | 4 ++-- crypto/comp/comp.h | 2 +- crypto/comp/comp_err.c | 4 ++-- crypto/comp/comp_lib.c | 4 ++-- crypto/conf/Makefile.ssl | 6 +++--- crypto/conf/cnf_save.c | 2 +- crypto/conf/conf.c | 10 ++++----- crypto/conf/conf.h | 4 ++-- crypto/conf/conf_err.c | 4 ++-- crypto/conf/test.c | 4 ++-- crypto/cpt_err.c | 4 ++-- crypto/cryptall.h | 52 ++++++++++++++++++++++----------------------- crypto/cryptlib.c | 2 +- crypto/cryptlib.h | 12 +++++------ crypto/crypto.c | 30 +++++++++++++------------- crypto/crypto.h | 4 ++-- crypto/cversion.c | 2 +- crypto/des/Makefile.ssl | 6 +++--- crypto/des/des.c | 2 +- crypto/des/des.h | 2 +- crypto/des/des_locl.h | 4 ++-- crypto/des/des_opts.c | 2 +- crypto/des/destest.c | 2 +- crypto/des/ecb_enc.c | 2 +- crypto/des/rpw.c | 2 +- crypto/des/speed.c | 2 +- crypto/dh/Makefile.ssl | 6 +++--- crypto/dh/dh.h | 2 +- crypto/dh/dh_check.c | 4 ++-- crypto/dh/dh_err.c | 4 ++-- crypto/dh/dh_gen.c | 4 ++-- crypto/dh/dh_key.c | 6 +++--- crypto/dh/dh_lib.c | 4 ++-- crypto/dh/dhtest.c | 8 +++---- crypto/dh/p1024.c | 8 +++---- crypto/dh/p192.c | 8 +++---- crypto/dh/p512.c | 8 +++---- crypto/dsa/Makefile.ssl | 6 +++--- crypto/dsa/dsa.h | 2 +- crypto/dsa/dsa_asn1.c | 6 +++--- crypto/dsa/dsa_err.c | 4 ++-- crypto/dsa/dsa_gen.c | 8 +++---- crypto/dsa/dsa_key.c | 8 +++---- crypto/dsa/dsa_lib.c | 6 +++--- crypto/dsa/dsa_sign.c | 8 +++---- crypto/dsa/dsa_vrf.c | 10 ++++----- crypto/dsa/dsagen.c | 2 +- crypto/dsa/dsatest.c | 10 ++++----- crypto/err/Makefile.ssl | 6 +++--- crypto/err/err.c | 10 ++++----- crypto/err/err_all.c | 32 ++++++++++++++-------------- crypto/err/err_prn.c | 10 ++++----- crypto/evp/Makefile.ssl | 6 +++--- crypto/evp/bio_b64.c | 4 ++-- crypto/evp/bio_enc.c | 4 ++-- crypto/evp/bio_md.c | 4 ++-- crypto/evp/bio_ok.c | 8 +++---- crypto/evp/c_all.c | 6 +++--- crypto/evp/digest.c | 4 ++-- crypto/evp/e_cbc_3d.c | 4 ++-- crypto/evp/e_cbc_bf.c | 4 ++-- crypto/evp/e_cbc_c.c | 4 ++-- crypto/evp/e_cbc_d.c | 4 ++-- crypto/evp/e_cbc_i.c | 4 ++-- crypto/evp/e_cbc_r2.c | 4 ++-- crypto/evp/e_cbc_r5.c | 4 ++-- crypto/evp/e_cfb_3d.c | 4 ++-- crypto/evp/e_cfb_bf.c | 4 ++-- crypto/evp/e_cfb_c.c | 4 ++-- crypto/evp/e_cfb_d.c | 4 ++-- crypto/evp/e_cfb_i.c | 4 ++-- crypto/evp/e_cfb_r2.c | 4 ++-- crypto/evp/e_cfb_r5.c | 4 ++-- crypto/evp/e_dsa.c | 6 +++--- crypto/evp/e_ecb_3d.c | 4 ++-- crypto/evp/e_ecb_bf.c | 4 ++-- crypto/evp/e_ecb_c.c | 4 ++-- crypto/evp/e_ecb_d.c | 4 ++-- crypto/evp/e_ecb_i.c | 4 ++-- crypto/evp/e_ecb_r2.c | 4 ++-- crypto/evp/e_ecb_r5.c | 4 ++-- crypto/evp/e_null.c | 4 ++-- crypto/evp/e_ofb_3d.c | 4 ++-- crypto/evp/e_ofb_bf.c | 4 ++-- crypto/evp/e_ofb_c.c | 4 ++-- crypto/evp/e_ofb_d.c | 4 ++-- crypto/evp/e_ofb_i.c | 4 ++-- crypto/evp/e_ofb_r2.c | 4 ++-- crypto/evp/e_ofb_r5.c | 4 ++-- crypto/evp/e_rc4.c | 4 ++-- crypto/evp/e_xcbc_d.c | 4 ++-- crypto/evp/encode.c | 2 +- crypto/evp/evp.h | 32 ++++++++++++++-------------- crypto/evp/evp_enc.c | 2 +- crypto/evp/evp_err.c | 4 ++-- crypto/evp/evp_key.c | 6 +++--- crypto/evp/evp_lib.c | 4 ++-- crypto/evp/evp_pbe.c | 4 ++-- crypto/evp/evp_pkey.c | 4 ++-- crypto/evp/m_dss.c | 6 +++--- crypto/evp/m_dss1.c | 6 +++--- crypto/evp/m_md2.c | 6 +++--- crypto/evp/m_md5.c | 6 +++--- crypto/evp/m_mdc2.c | 6 +++--- crypto/evp/m_null.c | 6 +++--- crypto/evp/m_ripemd.c | 6 +++--- crypto/evp/m_sha.c | 6 +++--- crypto/evp/m_sha1.c | 6 +++--- crypto/evp/names.c | 6 +++--- crypto/evp/p_dec.c | 10 ++++----- crypto/evp/p_enc.c | 10 ++++----- crypto/evp/p_lib.c | 8 +++---- crypto/evp/p_open.c | 6 +++--- crypto/evp/p_seal.c | 10 ++++----- crypto/evp/p_sign.c | 6 +++--- crypto/evp/p_verify.c | 6 +++--- crypto/ex_data.c | 6 +++--- crypto/hmac/Makefile.ssl | 6 +++--- crypto/hmac/hmac.c | 2 +- crypto/hmac/hmac.h | 2 +- crypto/hmac/hmactest.c | 2 +- crypto/idea/Makefile.ssl | 6 +++--- crypto/idea/i_cbc.c | 2 +- crypto/idea/i_cfb64.c | 2 +- crypto/idea/i_ecb.c | 4 ++-- crypto/idea/i_ofb64.c | 2 +- crypto/idea/i_skey.c | 2 +- crypto/idea/idea.h | 2 +- crypto/idea/idea_spd.c | 2 +- crypto/idea/ideatest.c | 2 +- crypto/lhash/Makefile.ssl | 6 +++--- crypto/lhash/lh_stats.c | 2 +- crypto/lhash/lh_test.c | 2 +- crypto/lhash/lhash.c | 4 ++-- crypto/md2/Makefile.ssl | 6 +++--- crypto/md2/md2.c | 2 +- crypto/md2/md2.h | 2 +- crypto/md2/md2_dgst.c | 4 ++-- crypto/md2/md2_one.c | 2 +- crypto/md2/md2test.c | 2 +- crypto/md5/Makefile.ssl | 6 +++--- crypto/md5/md5.c | 2 +- crypto/md5/md5_dgst.c | 2 +- crypto/md5/md5_locl.h | 2 +- crypto/md5/md5test.c | 2 +- crypto/mdc2/Makefile.ssl | 6 +++--- crypto/mdc2/mdc2.h | 2 +- crypto/mdc2/mdc2_one.c | 2 +- crypto/mdc2/mdc2dgst.c | 4 ++-- crypto/mdc2/mdc2test.c | 2 +- crypto/mem.c | 6 +++--- crypto/objects/Makefile.ssl | 6 +++--- crypto/objects/o_names.c | 4 ++-- crypto/objects/obj_dat.c | 6 +++--- crypto/objects/obj_err.c | 4 ++-- crypto/objects/obj_lib.c | 6 +++--- crypto/objects/objects.h | 4 ++-- crypto/pem/Makefile.ssl | 6 +++--- crypto/pem/pem.h | 6 +++--- crypto/pem/pem_all.c | 10 ++++----- crypto/pem/pem_err.c | 4 ++-- crypto/pem/pem_info.c | 10 ++++----- crypto/pem/pem_lib.c | 14 ++++++------ crypto/pem/pem_seal.c | 10 ++++----- crypto/pem/pem_sign.c | 10 ++++----- crypto/pkcs12/Makefile.ssl | 6 +++--- crypto/pkcs12/p12_add.c | 2 +- crypto/pkcs12/p12_attr.c | 2 +- crypto/pkcs12/p12_bags.c | 4 ++-- 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_lib.c | 4 ++-- crypto/pkcs12/p12_mac.c | 4 ++-- crypto/pkcs12/p12_mutl.c | 6 +++--- crypto/pkcs12/p12_sbag.c | 4 ++-- crypto/pkcs12/p12_utl.c | 2 +- crypto/pkcs12/pk12err.c | 4 ++-- crypto/pkcs12/pkcs12.h | 4 ++-- crypto/pkcs7/Makefile.ssl | 6 +++--- crypto/pkcs7/bio_ber.c | 4 ++-- crypto/pkcs7/dec.c | 8 +++---- crypto/pkcs7/enc.c | 6 +++--- crypto/pkcs7/example.c | 2 +- crypto/pkcs7/pk7_dgst.c | 10 ++++----- crypto/pkcs7/pk7_doit.c | 6 +++--- crypto/pkcs7/pk7_enc.c | 10 ++++----- crypto/pkcs7/pk7_lib.c | 4 ++-- crypto/pkcs7/pkcs7.h | 4 ++-- crypto/pkcs7/pkcs7err.c | 4 ++-- crypto/pkcs7/sign.c | 6 +++--- crypto/pkcs7/verify.c | 8 +++---- crypto/rand/Makefile.ssl | 6 +++--- crypto/rand/md_rand.c | 14 ++++++------ crypto/rand/rand_lib.c | 2 +- crypto/rand/randfile.c | 4 ++-- crypto/rand/randtest.c | 2 +- crypto/rc2/Makefile.ssl | 6 +++--- crypto/rc2/rc2.h | 2 +- crypto/rc2/rc2_cbc.c | 2 +- crypto/rc2/rc2_ecb.c | 4 ++-- crypto/rc2/rc2_skey.c | 2 +- crypto/rc2/rc2cfb64.c | 2 +- crypto/rc2/rc2ofb64.c | 2 +- crypto/rc2/rc2speed.c | 2 +- crypto/rc2/rc2test.c | 2 +- crypto/rc4/Makefile.ssl | 6 +++--- crypto/rc4/rc4.c | 2 +- crypto/rc4/rc4.h | 2 +- crypto/rc4/rc4_enc.c | 2 +- crypto/rc4/rc4_locl.h | 2 +- crypto/rc4/rc4_skey.c | 4 ++-- crypto/rc4/rc4speed.c | 2 +- crypto/rc4/rc4test.c | 2 +- crypto/rc5/Makefile.ssl | 6 +++--- crypto/rc5/rc5_ecb.c | 4 ++-- crypto/rc5/rc5_enc.c | 2 +- crypto/rc5/rc5_skey.c | 2 +- crypto/rc5/rc5cfb64.c | 2 +- crypto/rc5/rc5ofb64.c | 2 +- crypto/rc5/rc5speed.c | 2 +- crypto/rc5/rc5test.c | 2 +- crypto/ripemd/Makefile.ssl | 6 +++--- crypto/ripemd/rmd160.c | 2 +- crypto/ripemd/rmd_dgst.c | 2 +- crypto/ripemd/rmd_locl.h | 2 +- crypto/ripemd/rmdtest.c | 2 +- crypto/rsa/Makefile.ssl | 6 +++--- crypto/rsa/rsa.h | 4 ++-- crypto/rsa/rsa_eay.c | 6 +++--- crypto/rsa/rsa_err.c | 4 ++-- crypto/rsa/rsa_gen.c | 4 ++-- crypto/rsa/rsa_lib.c | 8 +++---- crypto/rsa/rsa_none.c | 6 +++--- crypto/rsa/rsa_oaep.c | 8 +++---- crypto/rsa/rsa_oaep_test.c | 6 +++--- crypto/rsa/rsa_pk1.c | 6 +++--- crypto/rsa/rsa_saos.c | 8 +++---- crypto/rsa/rsa_sign.c | 8 +++---- crypto/rsa/rsa_ssl.c | 6 +++--- crypto/sha/Makefile.ssl | 6 +++--- crypto/sha/sha.c | 2 +- crypto/sha/sha1.c | 2 +- crypto/sha/sha1_one.c | 2 +- crypto/sha/sha1dgst.c | 4 ++-- crypto/sha/sha1test.c | 2 +- crypto/sha/sha_dgst.c | 4 ++-- crypto/sha/sha_one.c | 2 +- crypto/sha/shatest.c | 2 +- crypto/stack/Makefile.ssl | 6 +++--- crypto/stack/safestack.h | 2 +- crypto/stack/stack.c | 2 +- crypto/threads/mttest.c | 12 +++++------ crypto/threads/th-lock.c | 14 ++++++------ crypto/tmdiff.c | 2 +- crypto/txt_db/Makefile.ssl | 6 +++--- crypto/txt_db/txt_db.c | 4 ++-- crypto/txt_db/txt_db.h | 4 ++-- crypto/x509/Makefile.ssl | 6 +++--- crypto/x509/by_dir.c | 4 ++-- crypto/x509/by_file.c | 8 +++---- crypto/x509/x509.h | 18 ++++++++-------- crypto/x509/x509_cmp.c | 6 +++--- crypto/x509/x509_d2.c | 4 ++-- crypto/x509/x509_def.c | 4 ++-- crypto/x509/x509_err.c | 4 ++-- crypto/x509/x509_ext.c | 10 ++++----- crypto/x509/x509_lu.c | 4 ++-- crypto/x509/x509_obj.c | 8 +++---- crypto/x509/x509_r2x.c | 12 +++++------ crypto/x509/x509_req.c | 14 ++++++------ crypto/x509/x509_set.c | 8 +++---- crypto/x509/x509_txt.c | 12 +++++------ crypto/x509/x509_v3.c | 10 ++++----- crypto/x509/x509_vfy.c | 14 ++++++------ crypto/x509/x509_vfy.h | 4 ++-- crypto/x509/x509name.c | 10 ++++----- crypto/x509/x509rset.c | 8 +++---- crypto/x509/x509type.c | 6 +++--- crypto/x509/x_all.c | 10 ++++----- crypto/x509v3/Makefile.ssl | 6 +++--- crypto/x509v3/v3_akey.c | 8 +++---- crypto/x509v3/v3_alt.c | 4 ++-- crypto/x509v3/v3_bcons.c | 8 +++---- crypto/x509v3/v3_bitst.c | 4 ++-- crypto/x509v3/v3_conf.c | 6 +++--- crypto/x509v3/v3_cpols.c | 8 +++---- crypto/x509v3/v3_crld.c | 8 +++---- crypto/x509v3/v3_enum.c | 2 +- crypto/x509v3/v3_extku.c | 6 +++--- crypto/x509v3/v3_genn.c | 8 +++---- crypto/x509v3/v3_ia5.c | 6 +++--- crypto/x509v3/v3_int.c | 2 +- crypto/x509v3/v3_lib.c | 4 ++-- crypto/x509v3/v3_pku.c | 6 +++--- crypto/x509v3/v3_prn.c | 4 ++-- crypto/x509v3/v3_skey.c | 2 +- crypto/x509v3/v3_sxnet.c | 8 +++---- crypto/x509v3/v3_utl.c | 4 ++-- crypto/x509v3/v3conf.c | 10 ++++----- crypto/x509v3/v3err.c | 4 ++-- crypto/x509v3/v3prin.c | 10 ++++----- crypto/x509v3/x509v3.h | 4 ++-- demos/b64.c | 12 +++++------ demos/bio/saccept.c | 4 ++-- demos/bio/sconnect.c | 4 ++-- demos/eay/base64.c | 4 ++-- demos/eay/conn.c | 4 ++-- demos/eay/loadrsa.c | 2 +- demos/maurice/example1.c | 14 ++++++------ demos/maurice/example2.c | 14 ++++++------ demos/maurice/loadkeys.c | 14 ++++++------ demos/maurice/loadkeys.h | 2 +- demos/prime/prime.c | 2 +- demos/selfsign.c | 14 ++++++------ demos/sign/sign.c | 14 ++++++------ demos/spkigen.c | 12 +++++------ mt/mttest.c | 12 +++++------ perl/openssl.h | 16 +++++++------- rsaref/Makefile.ssl | 6 +++--- rsaref/rsar_err.c | 4 ++-- rsaref/rsaref.c | 8 +++---- rsaref/rsaref.h | 2 +- ssl/Makefile.ssl | 6 +++--- ssl/bio_ssl.c | 8 +++---- ssl/s23_clnt.c | 8 +++---- ssl/s23_lib.c | 2 +- ssl/s23_meth.c | 2 +- ssl/s23_pkt.c | 4 ++-- ssl/s23_srvr.c | 8 +++---- ssl/s2_clnt.c | 8 +++---- ssl/s2_lib.c | 4 ++-- ssl/s2_meth.c | 2 +- ssl/s2_srvr.c | 8 +++---- ssl/s3_both.c | 10 ++++----- ssl/s3_clnt.c | 8 +++---- ssl/s3_enc.c | 2 +- ssl/s3_lib.c | 2 +- ssl/s3_meth.c | 2 +- ssl/s3_pkt.c | 4 ++-- ssl/s3_srvr.c | 10 ++++----- ssl/ssl.c | 32 ++++++++++++++-------------- ssl/ssl.h | 20 ++++++++--------- ssl/ssl3.h | 2 +- ssl/ssl_algs.c | 4 ++-- ssl/ssl_asn1.c | 4 ++-- ssl/ssl_cert.c | 6 +++--- ssl/ssl_ciph.c | 4 ++-- ssl/ssl_err.c | 4 ++-- ssl/ssl_err2.c | 4 ++-- ssl/ssl_lib.c | 4 ++-- ssl/ssl_locl.h | 22 +++++++++---------- ssl/ssl_rsa.c | 10 ++++----- ssl/ssl_sess.c | 4 ++-- ssl/ssl_task.c | 8 +++---- ssl/ssl_txt.c | 2 +- ssl/ssltest.c | 12 +++++------ ssl/t1_clnt.c | 8 +++---- ssl/t1_enc.c | 6 +++--- ssl/t1_lib.c | 2 +- ssl/t1_meth.c | 2 +- ssl/t1_srvr.c | 10 ++++----- ssl/tls1.h | 2 +- test/methtest.c | 6 +++--- util/mk1mf.pl | 13 ++++++++---- util/mklink.sh | 11 +++++++++- 552 files changed, 1605 insertions(+), 1564 deletions(-) diff --git a/Configure b/Configure index abf0562c8a..3085fa0f1a 100755 --- a/Configure +++ b/Configure @@ -542,6 +542,31 @@ if($IsWindows) { system 'make -f Makefile.ssl links' if !$IsWindows; +my $pwd=`pwd`; +chop($pwd); +print < +should be used instead of #include . +These new file locations allow installing the OpenSSL header +files in /usr/local/include/openssl/ and should help avoid +conflicts with other libraries. + +To compile programs that use the old form , +usually an additional compiler option will suffice: E.g., add + -I/usr/local/include/openssl +or + -I$pwd/include/openssl +to the CFLAGS in the Makefile of the program that you want to compile. + +Please make sure that no old OpenSSL header files are around: +The include directory should now be empty except for the openssl +subdirectory. +EOF + exit(0); sub bad_target diff --git a/Makefile.org b/Makefile.org index 074899f306..23be9bc14b 100644 --- a/Makefile.org +++ b/Makefile.org @@ -215,7 +215,8 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/mklink.sh include $(EXHEADER) + @-mkdir -p include/openssl 2>/dev/null + @$(TOP)/util/mklink.sh include/openssl $(EXHEADER) @for i in $(DIRS); do \ (cd $$i && echo "making links in $$i..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \ @@ -290,6 +291,7 @@ install: all @-mkdir -p $(INSTALLTOP)/bin 2>/dev/null @-mkdir -p $(INSTALLTOP)/lib 2>/dev/null @-mkdir -p $(INSTALLTOP)/include 2>/dev/null + @-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null @-mkdir -p $(INSTALLTOP)/certs 2>/dev/null @-mkdir -p $(INSTALLTOP)/private 2>/dev/null @for i in $(DIRS) ;\ diff --git a/apps/apps.h b/apps/apps.h index 25a9262e03..3ad21bb9a9 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -59,11 +59,11 @@ #ifndef HEADER_APPS_H #define HEADER_APPS_H -#include "e_os.h" +#include -#include "buffer.h" -#include "bio.h" -#include "crypto.h" +#include +#include +#include #include "progs.h" #ifdef NO_STDIO @@ -88,7 +88,7 @@ extern BIO *bio_err; #else #define MAIN(a,v) PROG(a,v) -#include "conf.h" +#include extern LHASH *config; extern char *default_config_file; extern BIO *bio_err; diff --git a/apps/asn1pars.c b/apps/asn1pars.c index 39e97887af..a5e4bfcf5e 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -64,10 +64,10 @@ #include #include #include "apps.h" -#include "err.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include /* -inform arg - input format - default PEM (DER or PEM) * -in arg - input file - default stdin diff --git a/apps/ca.c b/apps/ca.c index 5ce0dc202b..16afb8d7ee 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -64,16 +64,16 @@ #include #include #include "apps.h" -#include "conf.h" -#include "bio.h" -#include "err.h" -#include "bn.h" -#include "txt_db.h" -#include "evp.h" -#include "x509.h" -#include "x509v3.h" -#include "objects.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef W_OK #include diff --git a/apps/ciphers.c b/apps/ciphers.c index b02b64b5df..3c76782b7e 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -63,8 +63,8 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "err.h" -#include "ssl.h" +#include +#include #undef PROG #define PROG ciphers_main diff --git a/apps/crl.c b/apps/crl.c index 0c03f5fb6c..cdbee4847d 100644 --- a/apps/crl.c +++ b/apps/crl.c @@ -60,11 +60,11 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "x509.h" -#include "x509v3.h" -#include "pem.h" +#include +#include +#include +#include +#include #undef PROG #define PROG crl_main diff --git a/apps/crl2p7.c b/apps/crl2p7.c index aa407b7098..12e535a282 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -65,12 +65,12 @@ #include #include #include "apps.h" -#include "err.h" -#include "evp.h" -#include "x509.h" -#include "pkcs7.h" -#include "pem.h" -#include "objects.h" +#include +#include +#include +#include +#include +#include #ifndef NOPROTO static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile); diff --git a/apps/dgst.c b/apps/dgst.c index 2926e5514f..82bb20a8be 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -60,12 +60,12 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #undef BUFSIZE #define BUFSIZE 1024*8 diff --git a/apps/dh.c b/apps/dh.c index 0b548ef570..02742485ce 100644 --- a/apps/dh.c +++ b/apps/dh.c @@ -61,12 +61,12 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "bn.h" -#include "dh.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #undef PROG #define PROG dh_main diff --git a/apps/dsa.c b/apps/dsa.c index 312ed31798..dc282b77d0 100644 --- a/apps/dsa.c +++ b/apps/dsa.c @@ -61,12 +61,12 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "dsa.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #undef PROG #define PROG dsa_main diff --git a/apps/dsaparam.c b/apps/dsaparam.c index 085e4845c1..e733b53db4 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -61,13 +61,13 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "bn.h" -#include "rand.h" -#include "dsa.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include #undef PROG #define PROG dsaparam_main diff --git a/apps/eay.c b/apps/eay.c index 7c3bae3bfb..80a141b938 100644 --- a/apps/eay.c +++ b/apps/eay.c @@ -64,27 +64,27 @@ #define USE_SOCKETS #include "../e_os.h" -#include "bio.h" -#include "stack.h" -#include "lhash.h" +#include +#include +#include -#include "err.h" +#include -#include "bn.h" +#include -#include "evp.h" +#include -#include "rand.h" -#include "conf.h" -#include "txt_db.h" +#include +#include +#include -#include "err.h" +#include -#include "x509.h" -#include "pkcs7.h" -#include "pem.h" -#include "asn1.h" -#include "objects.h" +#include +#include +#include +#include +#include #define MONOLITH diff --git a/apps/enc.c b/apps/enc.c index b561326733..84a81ffb23 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -60,15 +60,15 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include +#include +#include +#include +#include #ifdef NO_MD5 -#include "md5.h" +#include #endif -#include "pem.h" +#include #ifndef NOPROTO int set_hex(char *in,unsigned char *out,int size); diff --git a/apps/errstr.c b/apps/errstr.c index ee51abaf34..c86b5d940b 100644 --- a/apps/errstr.c +++ b/apps/errstr.c @@ -60,10 +60,10 @@ #include #include #include "apps.h" -#include "bio.h" -#include "lhash.h" -#include "err.h" -#include "ssl.h" +#include +#include +#include +#include #undef PROG #define PROG errstr_main diff --git a/apps/gendh.c b/apps/gendh.c index 8900b4f1af..c69147e370 100644 --- a/apps/gendh.c +++ b/apps/gendh.c @@ -61,13 +61,13 @@ #include #include #include "apps.h" -#include "bio.h" -#include "rand.h" -#include "err.h" -#include "bn.h" -#include "dh.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include #define DEFBITS 512 #undef PROG diff --git a/apps/gendsa.c b/apps/gendsa.c index 3e198a24f9..db641da503 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -61,13 +61,13 @@ #include #include #include "apps.h" -#include "bio.h" -#include "rand.h" -#include "err.h" -#include "bn.h" -#include "dsa.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include #define DEFBITS 512 #undef PROG diff --git a/apps/genrsa.c b/apps/genrsa.c index f83bafc7f1..30f1618f18 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -61,14 +61,14 @@ #include #include #include "apps.h" -#include "bio.h" -#include "rand.h" -#include "err.h" -#include "bn.h" -#include "rsa.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include +#include #define DEFBITS 512 #undef PROG diff --git a/apps/nseq.c b/apps/nseq.c index a36f29f518..9c84d93b81 100644 --- a/apps/nseq.c +++ b/apps/nseq.c @@ -58,8 +58,8 @@ #include #include -#include "pem.h" -#include "err.h" +#include +#include #include "apps.h" #undef PROG diff --git a/apps/openssl.c b/apps/openssl.c index 21724201d6..bae0c4f004 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -63,19 +63,19 @@ #include #include #include -#include "bio.h" -#include "crypto.h" -#include "lhash.h" -#include "conf.h" -#include "x509.h" -#include "pem.h" -#include "ssl.h" +#include +#include +#include +#include +#include +#include +#include #define SSLEAY /* turn off a few special case MONOLITH macros */ #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ #define SSLEAY_SRC #include "apps.h" #include "s_apps.h" -#include "err.h" +#include /* #ifdef WINDOWS diff --git a/apps/pem_mail.c b/apps/pem_mail.c index acbf7bd9a0..b60c9a3922 100644 --- a/apps/pem_mail.c +++ b/apps/pem_mail.c @@ -57,12 +57,12 @@ */ #include -#include "rsa.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" -#include "err.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #include "apps.h" #undef PROG diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 97b7c88ef9..79fd19a69f 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -59,9 +59,9 @@ #include #include #include -#include -#include -#include "pkcs12.h" +#include +#include +#include #include "apps.h" #define PROG pkcs12_main diff --git a/apps/pkcs7.c b/apps/pkcs7.c index ece2cd7d68..24b3e57882 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -61,12 +61,12 @@ #include #include #include "apps.h" -#include "err.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" -#include "pkcs7.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #undef PROG #define PROG pkcs7_main diff --git a/apps/req.c b/apps/req.c index 69f371697b..78a50a5525 100644 --- a/apps/req.c +++ b/apps/req.c @@ -64,16 +64,16 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "bio.h" -#include "evp.h" -#include "rand.h" -#include "conf.h" -#include "err.h" -#include "asn1.h" -#include "x509.h" -#include "x509v3.h" -#include "objects.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define SECTION "req" diff --git a/apps/rsa.c b/apps/rsa.c index e09eeda16e..1372a5fac9 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -61,12 +61,12 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "rsa.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include #undef PROG #define PROG rsa_main diff --git a/apps/s_cb.c b/apps/s_cb.c index ad5bc26e31..fdb11a1d11 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -63,9 +63,9 @@ #include "apps.h" #undef NON_MAIN #undef USE_SOCKETS -#include "err.h" -#include "x509.h" -#include "ssl.h" +#include +#include +#include #include "s_apps.h" int verify_depth=0; diff --git a/apps/s_client.c b/apps/s_client.c index 20e581ec20..9e90b483f2 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -64,10 +64,10 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "x509.h" -#include "ssl.h" -#include "err.h" -#include "pem.h" +#include +#include +#include +#include #include "s_apps.h" #undef PROG diff --git a/apps/s_server.c b/apps/s_server.c index f026fa1b6b..0198cb8a05 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -64,14 +64,14 @@ #ifdef NO_STDIO #define APPS_WIN16 #endif -#include "lhash.h" -#include "bn.h" +#include +#include #define USE_SOCKETS #include "apps.h" -#include "err.h" -#include "pem.h" -#include "x509.h" -#include "ssl.h" +#include +#include +#include +#include #include "s_apps.h" #ifndef NOPROTO diff --git a/apps/s_socket.c b/apps/s_socket.c index 2c83dbb607..9110234ed2 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -67,7 +67,7 @@ #undef USE_SOCKETS #undef NON_MAIN #include "s_apps.h" -#include "ssl.h" +#include #ifndef NOPROTO static struct hostent *GetHostByName(char *name); diff --git a/apps/s_time.c b/apps/s_time.c index 1e335ef4b2..187c09d12e 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -70,13 +70,13 @@ #ifdef NO_STDIO #define APPS_WIN16 #endif -#include "x509.h" -#include "ssl.h" -#include "pem.h" +#include +#include +#include #define USE_SOCKETS #include "apps.h" #include "s_apps.h" -#include "err.h" +#include #ifdef WIN32_STUFF #include "winmain.h" #include "wintext.h" diff --git a/apps/sc.c b/apps/sc.c index 816040d28a..e6da658f06 100644 --- a/apps/sc.c +++ b/apps/sc.c @@ -64,10 +64,10 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "x509.h" -#include "ssl.h" -#include "err.h" -#include "pem.h" +#include +#include +#include +#include #include "s_apps.h" #ifdef WINDOWS diff --git a/apps/sess_id.c b/apps/sess_id.c index c1b497981e..11cf837267 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -60,11 +60,11 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "x509.h" -#include "pem.h" -#include "ssl.h" +#include +#include +#include +#include +#include #undef PROG #define PROG sess_id_main diff --git a/apps/speed.c b/apps/speed.c index 6c88a1c3d1..d6ee53e9fe 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -78,9 +78,9 @@ #ifdef NO_STDIO #define APPS_WIN16 #endif -#include "crypto.h" -#include "rand.h" -#include "err.h" +#include +#include +#include #ifndef MSDOS #define TIMES @@ -114,47 +114,47 @@ struct tms { #endif #ifndef NO_DES -#include "des.h" +#include #endif #ifndef NO_MD2 -#include "md2.h" +#include #endif #ifndef NO_MDC2 -#include "mdc2.h" +#include #endif #ifndef NO_MD5 -#include "md5.h" -#include "hmac.h" -#include "evp.h" +#include +#include +#include #endif #ifndef NO_SHA1 -#include "sha.h" +#include #endif #ifndef NO_RMD160 -#include "ripemd.h" +#include #endif #ifndef NO_RC4 -#include "rc4.h" +#include #endif #ifndef NO_RC5 -#include "rc5.h" +#include #endif #ifndef NO_RC2 -#include "rc2.h" +#include #endif #ifndef NO_IDEA -#include "idea.h" +#include #endif #ifndef NO_BLOWFISH -#include "blowfish.h" +#include #endif #ifndef NO_CAST -#include "cast.h" +#include #endif #ifndef NO_RSA -#include "rsa.h" +#include #endif -#include "x509.h" +#include #include "./testrsa.h" #ifndef NO_DSA #include "./testdsa.h" diff --git a/apps/verify.c b/apps/verify.c index 1a324c3da9..aa6ee03a1d 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -60,10 +60,10 @@ #include #include #include "apps.h" -#include "bio.h" -#include "err.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include #undef PROG #define PROG verify_main diff --git a/apps/version.c b/apps/version.c index fd46e17688..f249d15aa6 100644 --- a/apps/version.c +++ b/apps/version.c @@ -60,8 +60,8 @@ #include #include #include "apps.h" -#include "evp.h" -#include "crypto.h" +#include +#include #undef PROG #define PROG version_main diff --git a/apps/x509.c b/apps/x509.c index f1975dca9d..f336f24077 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -63,15 +63,15 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "bio.h" -#include "asn1.h" -#include "err.h" -#include "bn.h" -#include "evp.h" -#include "x509.h" -#include "x509v3.h" -#include "objects.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #undef PROG #define PROG x509_main diff --git a/bugs/stream.c b/bugs/stream.c index 50a3884995..d2967c837d 100644 --- a/bugs/stream.c +++ b/bugs/stream.c @@ -57,11 +57,11 @@ */ #include -#include "rc4.h" +#include #ifdef NO_DES #include #else -#include "des.h" +#include #endif /* show how stream ciphers are not very good. The mac has no affect diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 9e4df74f9e..1cef8d80ed 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -69,7 +69,7 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/mklink.sh ../include $(EXHEADER) + @$(TOP)/util/mklink.sh ../include/openssl $(EXHEADER) @$(TOP)/util/mklink.sh ../test $(TEST) @$(TOP)/util/mklink.sh ../apps $(APPS) @$(TOP)/util/point.sh Makefile.ssl Makefile @@ -100,8 +100,8 @@ tests: install: @for i in $(EXHEADER) ;\ do \ - (cp $$i $(INSTALLTOP)/include/$$i; \ - chmod 644 $(INSTALLTOP)/include/$$i ); \ + (cp $$i $(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \ done; @for i in $(SDIRS) ;\ do \ diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index c6e1f2f8a4..df36d7312f 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -83,15 +83,15 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/mklink.sh ../../include $(EXHEADER) + @$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER) @$(TOP)/util/mklink.sh ../../test $(TEST) @$(TOP)/util/mklink.sh ../../apps $(APPS) install: @for i in $(EXHEADER) ; \ do \ - (cp $$i $(INSTALLTOP)/include/$$i; \ - chmod 644 $(INSTALLTOP)/include/$$i ); \ + (cp $$i $(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \ done; tags: diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index cd4d835003..d1d28bd9bb 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_ASN1_STRING_NEW,ASN1_R_STRING_TOO_SHORT); * ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,ASN1_R_EXPECTING_A_BIT_STRING); diff --git a/crypto/asn1/a_bmp.c b/crypto/asn1/a_bmp.c index 2cb322ab43..e492ab9ec0 100644 --- a/crypto/asn1/a_bmp.c +++ b/crypto/asn1/a_bmp.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_EXPECTING_AN_INTEGER); */ diff --git a/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c index fc55a92f48..711c57e5c0 100644 --- a/crypto/asn1/a_bool.c +++ b/crypto/asn1/a_bool.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_EXPECTING_A_BOOLEAN); * ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_BOOLEAN_IS_WRONG_LENGTH); diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c index fdfe9ea8ef..153be36660 100644 --- a/crypto/asn1/a_bytes.c +++ b/crypto/asn1/a_bytes.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1_mac.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,ASN1_R_WRONG_TYPE); * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index 465986eb63..a49d1cb289 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "asn1_mac.h" +#include +#include #define HEADER_SIZE 8 diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 20cde71f03..f3de491665 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -62,9 +62,9 @@ #include #include "cryptlib.h" -#include "evp.h" -#include "x509.h" -#include "buffer.h" +#include +#include +#include int ASN1_digest(int (*i2d)(), EVP_MD *type, char *data, unsigned char *md, unsigned int *len) diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c index cf5748296c..c0a8709f3b 100644 --- a/crypto/asn1/a_dup.c +++ b/crypto/asn1/a_dup.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1_mac.h" +#include #define READ_CHUNK 2048 diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index 0f8ad843c0..7ad863a4bc 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* Support for ASN1 ENUMERATED type: based on a_int.c */ diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index 7992739cad..3952eaf170 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -61,7 +61,7 @@ #include #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_NEW,ASN1_R_GENERALIZEDTIME_TOO_LONG); * ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME,ASN1_R_EXPECTING_A_GENERALIZEDTIME); diff --git a/crypto/asn1/a_hdr.c b/crypto/asn1/a_hdr.c index d1bf08af4b..1d44b9d5a1 100644 --- a/crypto/asn1/a_hdr.c +++ b/crypto/asn1/a_hdr.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "asn1_mac.h" -#include "asn1.h" +#include +#include /* * ASN1err(ASN1_F_D2I_ASN1_HEADER,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c index f010ec1272..6bd845443c 100644 --- a/crypto/asn1/a_i2d_fp.c +++ b/crypto/asn1/a_i2d_fp.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "asn1_mac.h" +#include +#include #ifndef NO_FP_API int ASN1_i2d_fp(int (*i2d)(), FILE *out, unsigned char *x) diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index acfc855261..dcae5cce35 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER); */ diff --git a/crypto/asn1/a_meth.c b/crypto/asn1/a_meth.c index 961085578e..32c8693955 100644 --- a/crypto/asn1/a_meth.c +++ b/crypto/asn1/a_meth.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include +#include static ASN1_METHOD ia5string_meth={ (int (*)()) i2d_ASN1_IA5STRING, diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index ef77bb0d2d..9f9b2f04f2 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "asn1.h" -#include "objects.h" +#include +#include +#include /* ASN1err(ASN1_F_ASN1_OBJECT_NEW,ASN1_R_EXPECTING_AN_OBJECT); * ASN1err(ASN1_F_D2I_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER); diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c index 2509175185..16cf8133af 100644 --- a/crypto/asn1/a_octet.c +++ b/crypto/asn1/a_octet.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ASN1_R_EXPECTING_AN_OCTET_STRING); */ diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index babb571c5b..4e50f6ec8b 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_WRONG_PRINTABLE_TYPE); * ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_TAG_VALUE_TOO_HIGH); diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c index 406c68face..17c0a5f841 100644 --- a/crypto/asn1/a_set.c +++ b/crypto/asn1/a_set.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1_mac.h" +#include /* ASN1err(ASN1_F_ASN1_TYPE_NEW,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 7ce246c7cf..57595692e5 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -62,11 +62,11 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "x509.h" -#include "objects.h" -#include "buffer.h" +#include +#include +#include +#include +#include int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey, diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 495f0814a3..19bfdda7c4 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -64,7 +64,7 @@ #include #include #include "cryptlib.h" -#include "asn1.h" +#include int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp) { diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 5ccd5de00e..c9b5e7d047 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1_mac.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_BYTES,ASN1_R_WRONG_TAG); * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 291c0fda69..5c5d8a1cab 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -59,7 +59,7 @@ #include #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_ASN1_UTCTIME_NEW,ASN1_R_UTCTIME_TOO_LONG); * ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_EXPECTING_A_UTCTIME); diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c index 2babbe712d..70078b68f9 100644 --- a/crypto/asn1/a_utf8.c +++ b/crypto/asn1/a_utf8.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_UTF8STRING,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index fc2711058b..6383d2c698 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -62,11 +62,11 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "x509.h" -#include "objects.h" -#include "buffer.h" -#include "evp.h" +#include +#include +#include +#include +#include int ASN1_verify(int (*i2d)(), X509_ALGOR *a, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey) diff --git a/crypto/asn1/a_vis.c b/crypto/asn1/a_vis.c index 2e5a709016..b47e4b3042 100644 --- a/crypto/asn1/a_vis.c +++ b/crypto/asn1/a_vis.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1err(ASN1_F_D2I_ASN1_VISIBLESTRING,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 6b9062d5d0..4c38772efb 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -64,8 +64,8 @@ extern "C" { #endif #include -#include "bn.h" -#include "stack.h" +#include +#include #define V_ASN1_UNIVERSAL 0x00 #define V_ASN1_APPLICATION 0x40 diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c index 463500b40f..744135e935 100644 --- a/crypto/asn1/asn1_err.c +++ b/crypto/asn1/asn1_err.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include -#include "err.h" -#include "asn1.h" +#include +#include /* BEGIN ERROR CODES */ #ifndef NO_ERR diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index f67ed0fc86..628b864015 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "asn1.h" -#include "asn1_mac.h" +#include +#include #ifndef NOPROTO static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max); diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h index b7a90f820d..4d1731de7c 100644 --- a/crypto/asn1/asn1_mac.h +++ b/crypto/asn1/asn1_mac.h @@ -63,9 +63,9 @@ extern "C" { #endif -#include "asn1.h" -#include "x509.h" -#include "pkcs7.h" +#include +#include +#include #ifndef ASN1_MAC_ERR_LIB #define ASN1_MAC_ERR_LIB ERR_LIB_ASN1 diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index ab5521a7b3..fd36b4c13d 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "objects.h" -#include "x509.h" +#include +#include +#include #ifndef NOPROTO static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed, diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index c094d64e1c..4e846285a8 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -58,7 +58,7 @@ #include #include "cryptlib.h" -#include "asn1.h" +#include /* ASN1 packing and unpacking functions */ diff --git a/crypto/asn1/d2i_dhp.c b/crypto/asn1/d2i_dhp.c index 4fea5af8e3..f76a9d4423 100644 --- a/crypto/asn1/d2i_dhp.c +++ b/crypto/asn1/d2i_dhp.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "dh.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_dsap.c b/crypto/asn1/d2i_dsap.c index 2f3b6b6a57..df48eda2f4 100644 --- a/crypto/asn1/d2i_dsap.c +++ b/crypto/asn1/d2i_dsap.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 0fee334e77..43c7a3b917 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include +#include +#include +#include EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index d89c6e287c..eace9e88c7 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include +#include +#include +#include EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_r_pr.c b/crypto/asn1/d2i_r_pr.c index 3a4267bf97..8e46efce8a 100644 --- a/crypto/asn1/d2i_r_pr.c +++ b/crypto/asn1/d2i_r_pr.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_r_pu.c b/crypto/asn1/d2i_r_pu.c index 5a98e55930..6ccec8c9b6 100644 --- a/crypto/asn1/d2i_r_pu.c +++ b/crypto/asn1/d2i_r_pu.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_s_pr.c b/crypto/asn1/d2i_s_pr.c index b318b1e3b5..35fb3334e0 100644 --- a/crypto/asn1/d2i_s_pr.c +++ b/crypto/asn1/d2i_s_pr.c @@ -60,10 +60,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_s_pu.c b/crypto/asn1/d2i_s_pu.c index c7b7ad0a43..562acd6922 100644 --- a/crypto/asn1/d2i_s_pu.c +++ b/crypto/asn1/d2i_s_pu.c @@ -60,10 +60,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c index 8197fcd8f7..7528b2d97f 100644 --- a/crypto/asn1/evp_asn1.c +++ b/crypto/asn1/evp_asn1.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "asn1.h" -#include "asn1_mac.h" +#include +#include int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len) { diff --git a/crypto/asn1/f.c b/crypto/asn1/f.c index 2ab3a262ac..82bccdfd51 100644 --- a/crypto/asn1/f.c +++ b/crypto/asn1/f.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include -#include "asn1.h" -#include "err.h" +#include +#include main() { diff --git a/crypto/asn1/f_enum.c b/crypto/asn1/f_enum.c index 392e6b0184..ea460eb1df 100644 --- a/crypto/asn1/f_enum.c +++ b/crypto/asn1/f_enum.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include +#include /* Based on a_int.c: equivalent ENUMERATED functions */ diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 85ec6cec66..4d6c9b2278 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include +#include int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a) { diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index ab7a7b1f6b..9bcc5a93c9 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -58,8 +58,8 @@ #include #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include +#include int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type) { diff --git a/crypto/asn1/i2d_dhp.c b/crypto/asn1/i2d_dhp.c index 690ba1ab8f..c3763eb6a5 100644 --- a/crypto/asn1/i2d_dhp.c +++ b/crypto/asn1/i2d_dhp.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "asn1_mac.h" -#include "dh.h" +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_dsap.c b/crypto/asn1/i2d_dsap.c index 402ed199dc..a7d03fe6d6 100644 --- a/crypto/asn1/i2d_dsap.c +++ b/crypto/asn1/i2d_dsap.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "asn1_mac.h" -#include "dsa.h" +#include +#include +#include /* * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index f173c9a5c1..71d6910204 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" +#include +#include +#include int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c index 8139175e18..8f73d37d03 100644 --- a/crypto/asn1/i2d_pu.c +++ b/crypto/asn1/i2d_pu.c @@ -58,9 +58,9 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" +#include +#include +#include int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/i2d_r_pr.c b/crypto/asn1/i2d_r_pr.c index cfd1fc74f5..cc61637de4 100644 --- a/crypto/asn1/i2d_r_pr.c +++ b/crypto/asn1/i2d_r_pr.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_r_pu.c b/crypto/asn1/i2d_r_pu.c index 4f0a022317..eabc0ba892 100644 --- a/crypto/asn1/i2d_r_pu.c +++ b/crypto/asn1/i2d_r_pu.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include +#include /* * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_s_pr.c b/crypto/asn1/i2d_s_pr.c index 7374f7e9b5..afd8f5af03 100644 --- a/crypto/asn1/i2d_s_pr.c +++ b/crypto/asn1/i2d_s_pr.c @@ -58,10 +58,10 @@ #include #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include +#include +#include