diff options
Diffstat (limited to 'lib/libssl/crypto')
| -rw-r--r-- | lib/libssl/crypto/Makefile | 155 | ||||
| -rw-r--r-- | lib/libssl/crypto/shlib_version | 4 |
2 files changed, 96 insertions, 63 deletions
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile index a05ac78e0ed..2bfd04d516a 100644 --- a/lib/libssl/crypto/Makefile +++ b/lib/libssl/crypto/Makefile @@ -1,13 +1,13 @@ LIB= crypto -SSLEAYDIST= src +SSLEAYDIST= openssl LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include .if ${MACHINE_ARCH} == "i386" -CFLAGS+= -DL_ENDIAN -DBN_ASM +CFLAGS+= -DL_ENDIAN .else .if ${MACHINE_ARCH} == "mips" CFLAGS+= -DL_ENDIAN @@ -24,10 +24,12 @@ CFLAGS+= -DB_ENDIAN .endif .endif -CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH -CFLAGS+= -DNO_RC5 +CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM +CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DSO_DLFCN -DHAVE_DLFCN_H +CFLAGS+= -DNO_WINDOWS_BRAINDEATH CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} CFLAGS+= -I${LCRYPTO_SRC} +SRCS+= o_time.c CFLAGS+= -I${LCRYPTO_INC} SRCS+= cryptlib.c ex_data.c cpt_err.c mem.c mem_dbg.c tmdiff.c cversion.c uid.c CFLAGS+= -I${LCRYPTO_SRC}/md2 @@ -42,14 +44,17 @@ CFLAGS+= -I${LCRYPTO_SRC}/hmac SRCS+= hmac.c CFLAGS+= -I${LCRYPTO_SRC}/ripemd SRCS+= rmd_dgst.c rmd_one.c +CFLAGS+= -I${LCRYPTO_SRC}/aes +SRCS+= aes_cbc.c aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c aes_core.c CFLAGS+= -I${LCRYPTO_SRC}/des SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ - des_enc.c fcrypt_b.c read2pwd.c \ + qud_cksm.c rand_key.c rpc_enc.c set_key.c \ + des_enc.c des_old.c fcrypt_b.c \ fcrypt.c xcbc_enc.c ede_cbcm_enc.c \ - str2key.c cfb64ede.c ofb64ede.c supp.c + str2key.c cfb64ede.c ofb64ede.c \ + des_old.c read2pwd.c CFLAGS+= -I${LCRYPTO_SRC}/rc2 SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c SRCS+= rc2ofb64.c @@ -69,18 +74,18 @@ CFLAGS+= -I${LCRYPTO_SRC}/bn SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c SRCS+= bn_mul.c bn_print.c bn_rand.c bn_shift.c SRCS+= bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c -SRCS+= bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c -#SRCS+= bn_comba.c d.c exp.c +SRCS+= bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c bn_mod.c SRCS+= bn_exp2.c bn_ctx.c +SRCS+= bn_sqrt.c bn_kron.c CFLAGS+= -I${LCRYPTO_SRC}/rsa SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c SRCS+= rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c -SRCS+= rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c +SRCS+= rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c rsa_asn1.c CFLAGS+= -I${LCRYPTO_SRC}/dsa SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c SRCS+= dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c CFLAGS+= -I${LCRYPTO_SRC}/dh -SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c +SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c CFLAGS+= -I${LCRYPTO_SRC}/buffer SRCS+= buffer.c buf_err.c CFLAGS+= -I${LCRYPTO_SRC}/bio @@ -94,75 +99,81 @@ SRCS+= stack.c CFLAGS+= -I${LCRYPTO_SRC}/lhash SRCS+= lhash.c lh_stats.c CFLAGS+= -I${LCRYPTO_SRC}/rand -SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c rand_win.c +SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c rand_unix.c CFLAGS+= -I${LCRYPTO_SRC}/err SRCS+= err.c err_all.c err_prn.c CFLAGS+= -I${LCRYPTO_SRC}/objects SRCS+= obj_dat.c obj_lib.c obj_err.c o_names.c CFLAGS+= -I${LCRYPTO_SRC}/evp -SRCS+= bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c -SRCS+= digest.c e_bf.c e_cast.c e_des.c e_des3.c -SRCS+= e_null.c e_rc2.c e_rc4.c e_xcbc_d.c encode.c evp_enc.c -SRCS+= evp_err.c evp_key.c evp_lib.c evp_pbe.c evp_pkey.c m_dss.c -SRCS+= m_dss1.c m_md2.c m_md4.c m_md5.c m_mdc2.c m_null.c m_ripemd.c -SRCS+= m_sha.c m_sha1.c names.c p5_crpt.c p5_crpt2.c p_dec.c p_enc.c -SRCS+= p_lib.c p_open.c p_seal.c p_sign.c p_verify.c +SRCS+= bio_b64.c e_bf.c evp_test.c m_sha.c p_open.c +SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c +SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c +SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c +SRCS+= c_all.c evp_err.c m_md4.c p5_crpt.c +SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c +SRCS+= c_alld.c e_null.c evp_lib.c m_mdc2.c p_dec.c +SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c +SRCS+= e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c CFLAGS+= -I${LCRYPTO_SRC}/md4 SRCS+= md4_dgst.c md4_one.c CFLAGS+= -I${LCRYPTO_SRC}/pem -SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c -SRCS+= pem_all.c pem_err.c +SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_pkey.c +SRCS+= pem_all.c pem_err.c pem_x509.c pem_pk8.c pem_oth.c pem_xaux.c +CFLAGS+= -I${LCRYPTO_SRC}/ui +SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_compat.c ui_util.c CFLAGS+= -I${LCRYPTO_SRC}/asn1 -SRCS+= a_object.c a_bitstr.c a_utctm.c a_int.c -SRCS+= a_octet.c a_print.c a_type.c a_set.c -SRCS+= a_dup.c a_d2i_fp.c a_i2d_fp.c a_sign.c -SRCS+= a_digest.c a_verify.c x_algor.c x_val.c -SRCS+= x_pubkey.c x_sig.c x_req.c x_attrib.c -SRCS+= x_name.c x_cinf.c x_x509.c x_crl.c -SRCS+= x_info.c x_spki.c d2i_r_pr.c i2d_r_pr.c -SRCS+= d2i_r_pu.c i2d_r_pu.c d2i_s_pr.c i2d_s_pr.c -SRCS+= d2i_s_pu.c i2d_s_pu.c d2i_pu.c d2i_pr.c -SRCS+= i2d_pu.c i2d_pr.c t_req.c t_x509.c -SRCS+= t_pkey.c p7_i_s.c p7_signi.c p7_signd.c -SRCS+= p7_recip.c p7_enc_c.c p7_evp.c p7_dgst.c -SRCS+= p7_s_e.c p7_enc.c p7_lib.c f_int.c -SRCS+= f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c -SRCS+= d2i_dsap.c n_pkey.c a_hdr.c x_pkey.c -SRCS+= a_bool.c x_exten.c asn1_par.c asn1_lib.c -SRCS+= asn1_err.c a_meth.c a_bytes.c evp_asn1.c -SRCS+= a_enum.c a_gentm.c a_time.c a_utf8.c a_vis.c -SRCS+= asn_pack.c f_enum.c nsseq.c p5_pbe.c p5_pbev2.c -SRCS+= p8_pkey.c t_crl.c a_meth.c a_null.c a_strnid.c a_mbstr.c -SRCS+= t_bitst.c t_spki.c t_x509a.c x_x509a.c a_strex.c +SRCS+= a_bitstr.c a_mbstr.c a_utctm.c f_enum.c t_bitst.c x_name.c +SRCS+= a_bool.c a_meth.c a_utf8.c f_int.c t_crl.c tasn_typ.c x_pkey.c +SRCS+= a_bytes.c a_object.c a_verify.c f_string.c t_pkey.c tasn_utl.c x_pubkey.c +SRCS+= a_d2i_fp.c a_octet.c asn1_err.c i2d_pr.c t_req.c x_algor.c x_req.c +SRCS+= a_digest.c a_print.c asn1_lib.c i2d_pu.c t_spki.c x_attrib.c x_sig.c +SRCS+= a_dup.c a_set.c asn1_par.c n_pkey.c t_x509.c x_bignum.c x_spki.c +SRCS+= a_enum.c a_sign.c asn_pack.c nsseq.c t_x509a.c x_val.c +SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c +SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c +SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c +SRCS+=a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c CFLAGS+= -I${LCRYPTO_SRC}/x509 -SRCS+= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c -SRCS+= x509_obj.c x509_req.c x509_vfy.c x509_set.c -SRCS+= x509rset.c x509_err.c x509name.c x509_v3.c -SRCS+= x509_ext.c x509type.c x509_lu.c x509_trs.c x509spki.c -SRCS+= x_all.c x509_txt.c by_file.c by_dir.c x509_att.c +SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c +SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c +SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c +SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c CFLAGS+= -I${LCRYPTO_SRC}/x509v3 SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c SRCS+= v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c SRCS+= v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c -SRCS+= v3err.c v3_info.c v3_purp.c +SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c CFLAGS+= -I${LCRYPTO_SRC}/conf -SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c cnf_save.c +SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c CFLAGS+= -I${LCRYPTO_SRC}/txt_db SRCS+= txt_db.c CFLAGS+= -I${LCRYPTO_SRC}/pkcs7 -SRCS+= pk7_lib.c pkcs7err.c pk7_doit.c pk7_attr.c pk7_mime.c pk7_smime.c +SRCS+= pk7_lib.c pkcs7err.c +SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c +SRCS+= pk7_attr.c pk7_smime.c CFLAGS+= -I${LCRYPTO_SRC}/comp -SRCS+= c_rle.c c_zlib.c comp_err.c comp_lib.c +SRCS+= c_rle.c c_zlib.c comp_lib.c CFLAGS+= -I${LCRYPTO_SRC}/pkcs12 -SRCS+= p12_add.c p12_attr.c p12_bags.c p12_crpt.c p12_crt.c -SRCS+= p12_decr.c p12_init.c p12_key.c p12_kiss.c p12_lib.c p12_mac.c -SRCS+= p12_mutl.c p12_sbag.c p12_utl.c pk12err.c p12_npas.c +SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c +SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c +SRCS+= p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c CFLAGS+= -I${LCRYPTO_SRC}/engine -SRCS+= engine_err.c engine_lib.c engine_list.c engine_openssl.c -SRCS+= hw_ncipher.c hw_atalla.c hw_cswift.c +SRCS+= eng_all.c eng_openssl.c hw_openbsd_dev_crypto.c eng_ctrl.c eng_pkey.c +SRCS+= hw_ubsec.c eng_dyn.c eng_table.c tb_cipher.c eng_err.c tb_rsa.c hw_aep.c +SRCS+= hw_sureware.c hw_cryptodev.c eng_cnf.c +SRCS+= tb_dh.c eng_fat.c hw_atalla.c tb_digest.c eng_init.c hw_cswift.c +SRCS+= tb_dsa.c eng_lib.c hw_ncipher.c tb_rand.c eng_list.c hw_nuron.c +SRCs+= tb_rsa.c CFLAGS+= -I${LCRYPTO_SRC}/dso SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c SRCS+= dso_openssl.c dso_win32.c dso_vms.c +CFLAGS+= -I${LCRYPTO_SRC}/oscp +SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c +SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c +CFLAGS+= -I${LCRYPTO_SRC}/ec +SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c +SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c + #HDRS= asn1.h dh.h md5.h rc4.h stack.h asn1_mac.h dsa.h mdc2.h rc5.h \ @@ -188,7 +199,6 @@ des.h \ dh.h \ dsa.h \ dso.h \ -e_os.h \ e_os2.h \ ebcdic.h \ engine.h \ @@ -215,7 +225,6 @@ rc4.h \ rc5.h \ ripemd.h \ rsa.h \ -rsaref.h \ safestack.h \ sha.h \ ssl.h \ @@ -229,7 +238,19 @@ tmdiff.h \ txt_db.h \ x509.h \ x509_vfy.h \ -x509v3.h +ossl_typ.h \ +x509v3.h \ +asn1t.h \ +des_old.h \ +ossl_typ.h \ +ui.h \ +ui_compat.h \ +aes.h \ +ec.h \ +ocsp.h + +SRC_HDRS= e_os.h + .PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \ @@ -237,12 +258,14 @@ x509v3.h ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \ ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \ - ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ + ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \ ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \ ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/comp \ ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 ${LCRYPTO_SRC}/engine \ - ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC} + ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui ${LCRYPTO_SRC}/ocsp \ + ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes ${LCRYPTO_SRC} + includes: @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl @@ -257,6 +280,16 @@ includes: echo $$j; \ eval "$$j"; \ done; \ + cd ${LCRYPTO_SRC}/../; for i in $(SRC_HDRS); do \ + f=`basename $$i`; \ + j="sed 's/<openssl/<ssl/' \ + ${LCRYPTO_SRC}/../$$i >$$d/$$f && \ + (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ + echo $$j; \ + eval "$$j"; \ + done; \ rm -rf $$d diff --git a/lib/libssl/crypto/shlib_version b/lib/libssl/crypto/shlib_version index 900b4048a96..9c1551636c5 100644 --- a/lib/libssl/crypto/shlib_version +++ b/lib/libssl/crypto/shlib_version @@ -1,2 +1,2 @@ -major=5 -minor=1 +major=6 +minor=0 |