Upgrade to OpenSSL 0.9.8b.

1 files changed, 70 insertions, 49 deletions

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index a7fa039..6edefc1 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 SHLIBDIR?=	/lib
+SUBDIR=		engines
 
 .include <bsd.own.mk>
 
 LIB=		crypto
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 
 NO_LINT=
 
@@ -20,7 +21,7 @@ MAN+=	config.5 des_modes.7
 
 # base sources
 SRCS=	cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.c \
-	mem_dbg.c o_time.c o_str.c tmdiff.c uid.c
+	mem_dbg.c o_dir.c o_str.c o_time.c tmdiff.c uid.c
 INCS=	crypto.h ebcdic.h opensslv.h ossl_typ.h symhacks.h tmdiff.h \
 	../e_os.h ../e_os2.h
 
@@ -29,19 +30,19 @@ SRCS+=	aes_cbc.c aes_cfb.c aes_core.c aes_ctr.c aes_ecb.c aes_misc.c aes_ofb.c
 INCS+=	aes.h aes_locl.h
 
 # asn1
-SRCS+=	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_hdr.c a_i2d_fp.c a_int.c \
-	a_mbstr.c a_meth.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 asn1_err.c asn1_lib.c \
-	asn1_par.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 nsseq.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_dec.c tasn_enc.c tasn_fre.c tasn_new.c tasn_typ.c \
-	tasn_utl.c x_algor.c x_attrib.c x_bignum.c x_crl.c \
-	x_exten.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
+SRCS+=	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_hdr.c a_i2d_fp.c a_int.c a_mbstr.c \
+	a_meth.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 asn1_err.c asn1_gen.c asn1_lib.c asn1_par.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 nsseq.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_dec.c tasn_enc.c tasn_fre.c \
+	tasn_new.c tasn_typ.c tasn_utl.c x_algor.c x_attrib.c \
+	x_bignum.c x_crl.c x_exten.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
 INCS+=	asn1.h asn1_mac.h asn1t.h
 
 # bf
@@ -60,15 +61,16 @@ INCS+=	blowfish.h
 # bio
 SRCS+=	b_dump.c b_print.c b_sock.c bf_buff.c bf_lbuf.c bf_nbio.c \
 	bf_null.c bio_cb.c bio_err.c bio_lib.c bss_acpt.c bss_bio.c \
-	bss_conn.c bss_fd.c bss_file.c bss_log.c bss_mem.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
-INCS+=	bio.h
+INCS+=	bio.h bio_lcl.h
 
 # bn
-SRCS+=	bn_add.c bn_blind.c bn_ctx.c bn_div.c bn_err.c bn_exp.c \
-	bn_exp2.c bn_gcd.c bn_kron.c bn_lib.c bn_mod.c bn_mont.c \
-	bn_mpi.c bn_mul.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
+SRCS+=	bn_add.c bn_blind.c bn_const.c bn_ctx.c bn_depr.c bn_div.c \
+	bn_err.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
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	bn-586.s co-586.s
 .elif ${MACHINE_ARCH} == "amd64"
@@ -114,11 +116,12 @@ SRCS+=	des_enc.c fcrypt_b.c
 INCS+=	des.h des_old.h
 
 # dh
-SRCS+=	dh_asn1.c dh_check.c dh_err.c dh_gen.c dh_key.c dh_lib.c
+SRCS+=	dh_asn1.c dh_check.c dh_err.c dh_depr.c dh_gen.c dh_key.c dh_lib.c
 INCS+=	dh.h
 
 # dsa
-SRCS+=	dsa_asn1.c dsa_err.c dsa_gen.c dsa_key.c dsa_lib.c dsa_ossl.c dsa_sign.c dsa_vrf.c
+SRCS+=	dsa_asn1.c dsa_err.c dsa_depr.c dsa_gen.c dsa_key.c dsa_lib.c \
+	dsa_ossl.c dsa_sign.c dsa_vrf.c
 INCS+=	dsa.h
 
 # dso
@@ -126,22 +129,26 @@ SRCS+=	dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c dso_openssl.c
 INCS+=	dso.h
 
 # ec
-SRCS+=	ec_cvt.c ec_err.c ec_lib.c ec_mult.c ecp_mont.c ecp_nist.c \
-	ecp_recp.c ecp_smpl.c
+SRCS+=	ec_asn1.c ec_check.c ec_curve.c ec_cvt.c ec_err.c ec_key.c \
+	ec_lib.c ec_mult.c ec_print.c ecp_mont.c ecp_nist.c \
+	ecp_smpl.c ec2_mult.c ec2_smpl.c
 INCS+=	ec.h
 
+# ecdh
+SRCS+=	ech_err.c ech_key.c ech_lib.c ech_ossl.c
+INCS+=	ecdh.h
+
+# ecdsa
+SRCS+=	ecs_asn1.c ecs_err.c ecs_lib.c ecs_ossl.c ecs_sign.c ecs_vrf.c
+INCS+=	ecdsa.h
+
 # engine
-SRCS+=	eng_all.c eng_cnf.c eng_ctrl.c eng_dyn.c eng_err.c eng_fat.c \
-	eng_init.c eng_lib.c eng_list.c eng_openssl.c eng_padlock.c eng_pkey.c \
-	eng_table.c hw_4758_cca.c hw_4758_cca_err.c hw_aep.c hw_aep_err.c \
-	hw_atalla.c hw_atalla_err.c hw_cryptodev.c hw_cswift.c \
-	hw_cswift_err.c hw_ncipher.c hw_ncipher_err.c hw_nuron.c \
-	hw_nuron_err.c hw_sureware.c hw_sureware_err.c hw_ubsec.c \
-	hw_ubsec_err.c tb_cipher.c tb_dh.c tb_digest.c tb_dsa.c tb_rand.c \
-	tb_rsa.c
-INCS+=	eng_int.h engine.h hw_4758_cca_err.h hw_aep_err.h hw_atalla_err.h \
-	hw_cswift_err.h hw_ncipher_err.h hw_nuron_err.h hw_sureware_err.h \
-	hw_ubsec_err.h
+SRCS+=	eng_all.c eng_cnf.c eng_cryptodev.c eng_ctrl.c eng_dyn.c \
+	eng_err.c eng_fat.c eng_init.c eng_lib.c eng_list.c \
+	eng_openssl.c eng_padlock.c eng_pkey.c eng_table.c tb_cipher.c \
+	tb_dh.c tb_digest.c tb_dsa.c tb_ecdh.c tb_ecdsa.c tb_rand.c \
+	tb_rsa.c tb_store.c
+INCS+=	engine.h
 
 # err
 SRCS+=	err.c err_all.c err_prn.c
@@ -151,12 +158,11 @@ INCS+=	err.h
 SRCS+=	bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
 	digest.c e_aes.c e_bf.c e_cast.c e_des.c e_des3.c e_idea.c \
 	e_null.c e_old.c e_rc2.c e_rc4.c e_rc5.c e_xcbc_d.c encode.c \
-	evp_acnf.c \
-	evp_enc.c evp_err.c evp_key.c evp_lib.c evp_pbe.c evp_pkey.c \
-	m_dss.c m_dss1.c m_md2.c m_md4.c m_md5.c m_mdc2.c m_null.c \
-	m_ripemd.c m_sha.c m_sha1.c names.c openbsd_hw.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
+	evp_acnf.c evp_enc.c evp_err.c evp_key.c evp_lib.c evp_pbe.c \
+	evp_pkey.c m_dss.c m_dss1.c m_ecdsa.c m_md2.c m_md4.c m_md5.c \
+	m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.c names.c \
+	openbsd_hw.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
 INCS+=	evp.h
 
 # fips
@@ -223,6 +229,10 @@ INCS+=	pkcs12.h pkcs7.h
 SRCS+=	example.c pk7_asn1.c pk7_attr.c pk7_dgst.c pk7_doit.c \
 	pk7_lib.c pk7_mime.c pk7_smime.c pkcs7err.c
 
+# pqueue
+SRCS+=	pqueue.c
+INCS+=	pqueue.h pq_compat.h
+
 # rand
 SRCS+=	md_rand.c rand_egd.c rand_err.c rand_lib.c rand_unix.c randfile.c
 INCS+=	rand.h
@@ -256,11 +266,11 @@ INCS+=	ripemd.h
 # rsa
 SRCS+=	rsa_asn1.c rsa_chk.c rsa_eay.c rsa_err.c rsa_gen.c rsa_lib.c \
 	rsa_none.c rsa_null.c rsa_oaep.c rsa_pk1.c rsa_saos.c \
-	rsa_sign.c rsa_ssl.c
+	rsa_sign.c rsa_ssl.c rsa_depr.c rsa_pss.c rsa_x931.c
 INCS+=	rsa.h
 
 # sha
-SRCS+=	sha1_one.c sha1dgst.c sha_dgst.c sha_one.c
+SRCS+=	sha1_one.c sha1dgst.c sha_dgst.c sha_one.c sha256.c sha512.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	sha1-586.s
 .endif
@@ -270,6 +280,10 @@ INCS+=	sha.h
 SRCS+=	stack.c
 INCS+=	stack.h safestack.h
 
+# store
+SRCS+=	str_err.c str_lib.c str_meth.c str_mem.c
+INCS+=	store.h
+
 # threads
 SRCS+=	th-lock.c
 
@@ -286,14 +300,16 @@ SRCS+=	by_dir.c by_file.c x509_att.c x509_cmp.c x509_d2.c \
 	x509_def.c x509_err.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 x509cset.c x509name.c x509rset.c \
-	x509spki.c x509type.c x_all.c
+	x509spki.c x509type.c x_all.c x509_vpm.c
 INCS+=	x509.h x509_vfy.h
 
 # x509v3
-SRCS+=	v3_akey.c v3_akeya.c v3_alt.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_ocsp.c \
-	v3_pku.c v3_prn.c v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
+SRCS+=	pcy_cache.c pcy_data.c pcy_lib.c pcy_map.c pcy_node.c \
+	pcy_tree.c v3_akey.c v3_akeya.c v3_alt.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_pcia.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 v3err.c
 INCS+=	x509v3.h
 
 SRCS+=	buildinf.h
@@ -370,6 +386,8 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/dsa \
 	${LCRYPTO_SRC}/crypto/dso \
 	${LCRYPTO_SRC}/crypto/ec \
+	${LCRYPTO_SRC}/crypto/ecdh \
+	${LCRYPTO_SRC}/crypto/ecdsa \
 	${LCRYPTO_SRC}/crypto/engine \
 	${LCRYPTO_SRC}/crypto/err \
 	${LCRYPTO_SRC}/crypto/evp \
@@ -386,6 +404,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/pem \
 	${LCRYPTO_SRC}/crypto/pkcs12 \
 	${LCRYPTO_SRC}/crypto/pkcs7 \
+	${LCRYPTO_SRC}/crypto/pqueue \
 	${LCRYPTO_SRC}/crypto/rand \
 	${LCRYPTO_SRC}/crypto/rc2 \
 	${LCRYPTO_SRC}/crypto/rc4 \
@@ -394,10 +413,12 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/rsa \
 	${LCRYPTO_SRC}/crypto/sha \
 	${LCRYPTO_SRC}/crypto/stack \
+	${LCRYPTO_SRC}/crypto/store \
 	${LCRYPTO_SRC}/crypto/threads \
 	${LCRYPTO_SRC}/crypto/txt_db \
 	${LCRYPTO_SRC}/crypto/ui \
 	${LCRYPTO_SRC}/crypto/x509 \
 	${LCRYPTO_SRC}/crypto/x509v3 \
+	${LCRYPTO_SRC}/engines \
 	${LCRYPTO_SRC} \
 	${.CURDIR}/man