CVSROOT:        /cvs
Module name:    src
Changes by:     js...@cvs.openbsd.org   2014/07/11 02:44:49

Modified files:
        lib/libssl/src/crypto: cryptlib.c cryptlib.h cversion.c 
                               ex_data.c 
        lib/libssl/src/crypto/aes: aes_ige.c aes_wrap.c 
        lib/libssl/src/crypto/asn1: a_bitstr.c a_bool.c a_bytes.c 
                                    a_d2i_fp.c a_digest.c a_dup.c 
                                    a_enum.c a_gentm.c a_i2d_fp.c 
                                    a_int.c a_mbstr.c a_object.c 
                                    a_octet.c a_print.c a_set.c a_sign.c 
                                    a_strex.c a_strnid.c a_time.c 
                                    a_type.c a_utctm.c a_utf8.c 
                                    a_verify.c ameth_lib.c asn1_gen.c 
                                    asn1_lib.c asn1_par.c asn_mime.c 
                                    asn_moid.c asn_pack.c d2i_pr.c 
                                    d2i_pu.c evp_asn1.c f_enum.c f_int.c 
                                    f_string.c i2d_pr.c i2d_pu.c 
                                    n_pkey.c p5_pbe.c p5_pbev2.c 
                                    p8_pkey.c t_bitst.c t_crl.c t_pkey.c 
                                    t_req.c t_spki.c t_x509.c t_x509a.c 
                                    tasn_enc.c tasn_prn.c x_attrib.c 
                                    x_bignum.c x_crl.c x_info.c x_long.c 
                                    x_name.c x_pkey.c x_pubkey.c x_req.c 
                                    x_sig.c x_spki.c x_val.c x_x509.c 
                                    x_x509a.c 
        lib/libssl/src/crypto/bio: b_dump.c b_sock.c bf_buff.c bf_lbuf.c 
                                   bf_nbio.c bf_null.c bio_cb.c 
                                   bio_lib.c bss_acpt.c bss_conn.c 
                                   bss_dgram.c bss_fd.c bss_file.c 
                                   bss_log.c bss_mem.c bss_null.c 
                                   bss_sock.c 
        lib/libssl/src/crypto/bn: bn_add.c bn_asm.c bn_blind.c bn_ctx.c 
                                  bn_depr.c bn_div.c bn_exp.c bn_exp2.c 
                                  bn_gcd.c bn_gf2m.c bn_kron.c bn_lib.c 
                                  bn_mod.c bn_mont.c bn_mpi.c bn_mul.c 
                                  bn_nist.c bn_prime.c bn_print.c 
                                  bn_rand.c bn_recp.c bn_shift.c 
                                  bn_sqr.c bn_sqrt.c bn_word.c 
        lib/libssl/src/crypto/buffer: buf_str.c buffer.c 
        lib/libssl/src/crypto/cmac: cm_ameth.c cm_pmeth.c cmac.c 
        lib/libssl/src/crypto/cms: cms_cd.c cms_dd.c cms_enc.c cms_env.c 
                                   cms_ess.c cms_pwri.c cms_sd.c 
                                   cms_smime.c 
        lib/libssl/src/crypto/conf: conf_def.c conf_mall.c conf_mod.c 
                                    conf_sap.c 
        lib/libssl/src/crypto/des: enc_read.c enc_writ.c 
        lib/libssl/src/crypto/dh: dh_ameth.c dh_asn1.c dh_check.c 
                                  dh_depr.c dh_gen.c dh_key.c dh_lib.c 
                                  dh_pmeth.c dh_prn.c 
        lib/libssl/src/crypto/dsa: dsa_ameth.c dsa_asn1.c dsa_depr.c 
                                   dsa_gen.c dsa_key.c dsa_lib.c 
                                   dsa_ossl.c dsa_pmeth.c dsa_prn.c 
                                   dsa_sign.c dsa_vrf.c 
        lib/libssl/src/crypto/dso: dso_dlfcn.c dso_lib.c dso_null.c 
                                   dso_openssl.c 
        lib/libssl/src/crypto/ec: ec_ameth.c ec_pmeth.c eck_prn.c 
        lib/libssl/src/crypto/ecdh: ech_ossl.c 
        lib/libssl/src/crypto/engine: eng_aesni.c eng_int.h eng_list.c 
                                      eng_openssl.c eng_table.c 
        lib/libssl/src/crypto/err: err.c err.h err_prn.c 
        lib/libssl/src/crypto/evp: bio_b64.c bio_enc.c bio_md.c c_allc.c 
                                   c_alld.c digest.c e_bf.c e_cast.c 
                                   e_des.c e_des3.c e_idea.c e_null.c 
                                   e_rc2.c e_rc4.c e_rc5.c e_xcbc_d.c 
                                   encode.c evp_enc.c evp_key.c 
                                   evp_lib.c evp_pbe.c evp_pkey.c 
                                   m_dss.c m_dss1.c m_ecdsa.c m_md4.c 
                                   m_md5.c m_mdc2.c m_null.c m_ripemd.c 
                                   m_sha.c m_sha1.c m_sigver.c m_wp.c 
                                   names.c p5_crpt.c p5_crpt2.c p_dec.c 
                                   p_enc.c p_lib.c p_open.c p_seal.c 
                                   p_sign.c p_verify.c pmeth_fn.c 
                                   pmeth_gn.c pmeth_lib.c 
        lib/libssl/src/crypto/hmac: hm_ameth.c hm_pmeth.c hmac.c 
        lib/libssl/src/crypto/lhash: lh_stats.c 
        lib/libssl/src/crypto/mdc2: mdc2_one.c 
        lib/libssl/src/crypto/objects: obj_dat.c obj_lib.c 
        lib/libssl/src/crypto/ocsp: ocsp_cl.c ocsp_ext.c ocsp_lib.c 
                                    ocsp_srv.c 
        lib/libssl/src/crypto/pem: pem_all.c pem_info.c pem_lib.c 
                                   pem_oth.c pem_pk8.c pem_pkey.c 
                                   pem_seal.c pem_sign.c pem_x509.c 
                                   pem_xaux.c pvkfmt.c 
        lib/libssl/src/crypto/pkcs12: p12_add.c p12_asn.c p12_attr.c 
                                      p12_crpt.c p12_crt.c p12_decr.c 
                                      p12_init.c p12_key.c p12_kiss.c 
                                      p12_mutl.c p12_p8d.c p12_p8e.c 
                                      p12_utl.c 
        lib/libssl/src/crypto/pkcs7: pk7_asn1.c pk7_doit.c pk7_lib.c 
                                     pk7_mime.c pk7_smime.c 
        lib/libssl/src/crypto/rand: rand_lib.c 
        lib/libssl/src/crypto/rc4: rc4_locl.h 
        lib/libssl/src/crypto/rsa: rsa_ameth.c rsa_asn1.c rsa_crpt.c 
                                   rsa_depr.c rsa_eay.c rsa_gen.c 
                                   rsa_lib.c rsa_none.c rsa_oaep.c 
                                   rsa_pk1.c rsa_pmeth.c rsa_prn.c 
                                   rsa_pss.c rsa_saos.c rsa_sign.c 
                                   rsa_ssl.c rsa_x931.c 
        lib/libssl/src/crypto/sha: sha512.c 
        lib/libssl/src/crypto/srp: srp_lib.c srp_vfy.c 
        lib/libssl/src/crypto/stack: stack.c 
        lib/libssl/src/crypto/ts: ts_conf.c ts_lib.c ts_req_print.c 
                                  ts_req_utils.c ts_rsp_print.c 
                                  ts_rsp_sign.c ts_rsp_utils.c 
                                  ts_rsp_verify.c ts_verify_ctx.c 
        lib/libssl/src/crypto/txt_db: txt_db.c 
        lib/libssl/src/crypto/ui: ui_lib.c ui_openssl.c 
        lib/libssl/src/crypto/x509: by_dir.c by_file.c x509_att.c 
                                    x509_cmp.c x509_d2.c x509_ext.c 
                                    x509_lu.c x509_obj.c x509_r2x.c 
                                    x509_req.c x509_set.c x509_trs.c 
                                    x509_txt.c x509_v3.c x509_vfy.c 
                                    x509_vpm.c x509cset.c x509name.c 
                                    x509rset.c x509spki.c x509type.c 
                                    x_all.c 
        lib/libssl/src/crypto/x509v3: pcy_cache.c pcy_data.c pcy_lib.c 
                                      pcy_map.c pcy_tree.c v3_addr.c 
                                      v3_akey.c v3_akeya.c v3_alt.c 
                                      v3_asid.c v3_bcons.c v3_bitst.c 
                                      v3_conf.c v3_cpols.c v3_crld.c 
                                      v3_enum.c v3_extku.c v3_genn.c 
                                      v3_ia5.c v3_info.c v3_int.c 
                                      v3_lib.c v3_ncons.c v3_ocsp.c 
                                      v3_pci.c v3_pcons.c v3_pku.c 
                                      v3_pmaps.c v3_prn.c v3_purp.c 
                                      v3_skey.c v3_sxnet.c v3_utl.c 

Log message:
Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@

Reply via email to