4 files changed, 69 insertions, 61 deletions

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 03098a3512f5..67ec798bd8cc 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -2,18 +2,19 @@
 
 .include "Makefile.inc"
 
-.PATH:  ${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \
+.PATH:	${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \
 	${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/buffer \
 	${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/conf \
 	${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/dsa \
-	${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/hmac \
-	${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 \
-	${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
-	${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
-	${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 \
-	${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref \
-	${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
-	${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
+	${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp \
+	${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 \
+	${LCRYPTO_SRC}/md4 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/mdc2 \
+	${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/pkcs7 \
+	${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/rc2 \
+	${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/ripemd \
+	${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref ${LCRYPTO_SRC}/sha \
+	${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/x509 \
+	${LCRYPTO_SRC}/x509v3
 
 .if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
 .PATH:  ${LCRYPTO_SRC}/idea
@@ -29,20 +30,22 @@ SRCS+=	cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_dbg.c \
 	tmdiff.c
 
 # asn1
+
 SRCS+=	a_bitstr.c a_bmp.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_null.c a_object.c a_octet.c a_print.c a_set.c a_sign.c \
-	a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c a_verify.c a_vis.c \
-	asn1_err.c asn1_lib.c asn1_par.c asn_pack.c d2i_dhp.c d2i_dsap.c \
-	d2i_pr.c d2i_pu.c d2i_r_pr.c d2i_r_pu.c d2i_s_pr.c d2i_s_pu.c \
-	evp_asn1.c f_enum.c f_int.c f_string.c i2d_dhp.c i2d_dsap.c i2d_pr.c \
-	i2d_pu.c i2d_r_pr.c i2d_r_pu.c i2d_s_pr.c i2d_s_pu.c n_pkey.c nsseq.c \
-	p5_pbe.c p5_pbev2.c p7_dgst.c p7_enc.c p7_enc_c.c p7_evp.c p7_i_s.c \
-	p7_lib.c p7_recip.c p7_s_e.c p7_signd.c p7_signi.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 \
-	x_algor.c x_attrib.c x_cinf.c x_crl.c x_exten.c x_info.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 \
+	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_null.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 a_vis.c asn1_err.c asn1_lib.c \
+	asn1_par.c asn_pack.c d2i_dhp.c d2i_dsap.c d2i_pr.c d2i_pu.c \
+	d2i_r_pr.c d2i_r_pu.c d2i_s_pr.c d2i_s_pu.c evp_asn1.c \
+	f_enum.c f_int.c f_string.c i2d_dhp.c i2d_dsap.c i2d_pr.c \
+	i2d_pu.c i2d_r_pr.c i2d_r_pu.c i2d_s_pr.c i2d_s_pu.c n_pkey.c \
+	nsseq.c p5_pbe.c p5_pbev2.c p7_dgst.c p7_enc.c p7_enc_c.c \
+	p7_evp.c p7_i_s.c p7_lib.c p7_recip.c p7_s_e.c p7_signd.c \
+	p7_signi.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 x_algor.c x_attrib.c x_cinf.c \
+	x_crl.c x_exten.c x_info.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.o
 
 # blowfish
 SRCS+=	bf_cfb64.c bf_ecb.c bf_enc.c bf_ofb64.c bf_skey.c
@@ -50,12 +53,14 @@ SRCS+=	bf_cfb64.c bf_ecb.c bf_enc.c bf_ofb64.c bf_skey.c
 # bio
 SRCS+=	b_dump.c b_print.c b_sock.c bf_buff.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_null.c bss_sock.c
+	bss_fd.c bss_file.c bss_log.c bss_mem.c bss_null.c bss_sock.o
 
 # bn
-SRCS+=	bn_add.c bn_asm.c bn_blind.c bn_ctx.c bn_div.c bn_err.c bn_exp.c \
-	bn_exp2.c bn_gcd.c bn_lib.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_word.c
+
+SRCS+=	bn_add.c bn_asm.c bn_blind.c bn_ctx.c bn_div.c bn_err.c \
+	bn_exp.c bn_exp2.c bn_gcd.c bn_lib.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_word.o
 
 # buffer
 SRCS+=	buf_err.c buffer.c 
@@ -67,14 +72,14 @@ SRCS+=	c_cfb64.c c_ecb.c c_enc.c c_ofb64.c c_skey.c
 SRCS+=	c_rle.c c_zlib.c comp_lib.c
 
 # conf
-SRCS+=	conf.c conf_err.c
+SRCS+=	conf_api.c conf_def.c conf_err.c conf_lib.c
 
 # des
 SRCS+=	cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c des_enc.c \
-	ecb3_enc.c ecb_enc.c ede_cbcm_enc.c enc_read.c enc_writ.c fcrypt.c \
-	fcrypt_b.c ofb64ede.c ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c \
-	rand_key.c read2pwd.c read_pwd.c rnd_keys.c rpc_enc.c set_key.c \
-	str2key.c supp.c xcbc_enc.c 
+	ecb3_enc.c ecb_enc.c ede_cbcm_enc.c enc_read.c enc_writ.c \
+	fcrypt.c fcrypt_b.c ofb64ede.c ofb64enc.c ofb_enc.c pcbc_enc.c \
+	qud_cksm.c rand_key.c read2pwd.c read_pwd.c rpc_enc.c \
+	set_key.c str2key.c xcbc_enc.c rnd_keys.c
 
 # dh
 SRCS+=	dh_check.c dh_err.c dh_gen.c dh_key.c dh_lib.c
@@ -83,21 +88,21 @@ SRCS+=	dh_check.c dh_err.c dh_gen.c dh_key.c dh_lib.c
 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
 
+# dso
+SRCS+=	dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
+	dso_openssl.c
+
 # err
 SRCS+=	err.c err_all.c err_prn.c
 
 # evp
 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_cbc_3d.c e_cbc_bf.c e_cbc_c.c e_cbc_d.c e_cbc_i.c \
-	e_cbc_r2.c e_cbc_r5.c e_cfb_3d.c e_cfb_bf.c e_cfb_c.c e_cfb_d.c \
-	e_cfb_i.c e_cfb_r2.c e_cfb_r5.c e_ecb_3d.c e_ecb_bf.c e_ecb_c.c \
-	e_ecb_d.c e_ecb_i.c e_ecb_r2.c e_ecb_r5.c e_null.c e_ofb_3d.c \
-	e_ofb_bf.c e_ofb_c.c e_ofb_d.c e_ofb_i.c e_ofb_r2.c e_ofb_r5.c \
-	e_rc4.c e_xcbc_d.c encode.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_md5.c \
-	m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.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
+	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_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 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
 
 # hmac
 SRCS+=	hmac.c
@@ -113,6 +118,9 @@ SRCS+=	lh_stats.c lhash.c
 # md2
 SRCS+=	md2_dgst.c md2_one.c
 
+# md4
+SRCS+=	md4_dgst.c md4_one.c
+
 # md5
 SRCS+=	md5_dgst.c md5_one.c
 
@@ -134,7 +142,7 @@ SRCS+=	p12_add.c p12_attr.c p12_bags.c p12_crpt.c p12_crt.c p12_decr.c \
 	p12_npas.c p12_sbag.c p12_utl.c pk12err.c
 
 # rand
-SRCS+=	md_rand.c rand_egd.c rand_err.c rand_lib.c randfile.c
+SRCS+=	md_rand.c rand_egd.c rand_err.c rand_lib.c rand_win.c randfile.c
 
 # rc2
 SRCS+=	rc2_cbc.c rc2cfb64.c rc2_ecb.c rc2ofb64.c rc2_skey.c 
@@ -165,15 +173,14 @@ SRCS+=	txt_db.c
 
 # x509
 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 x509name.c \
-	x509rset.c x509spki.c x509type.c x_all.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 x509name.c x509rset.c x509spki.c x509type.c x_all.c 
 # x509v3
 SRCS+=	v3_akey.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_pku.c v3_prn.c v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c \
-	v3err.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_pku.c v3_prn.c v3_purp.c v3_skey.c \
+	v3_sxnet.c v3_utl.c v3err.c
 
 POD1+=	apps/CA.pl.pod apps/asn1parse.pod apps/ca.pod apps/ciphers.pod \
 	apps/config.pod apps/crl.pod apps/crl2pkcs7.pod apps/dgst.pod \
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index df8adee1b98c..075d2467cf6e 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -23,10 +23,10 @@ HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \
 	rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h stack/safestack.h \
 	sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \
-	x509/x509_vfy.h x509v3/x509v3.h
+	x509/x509_vfy.h x509v3/x509v3.h symhacks.h objects/obj_mac.h md4/md4.h dso/dso.h conf/conf_api.h
 
 .if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
-HDRS+=	idea/idea.h
+HDRS+= idea/idea.h
 .endif
 
 .for h in ${HDRS}
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 6a3ab6c0ca87..623c06ec390d 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -12,11 +12,11 @@ SHLIB_MAJOR=	1
 MAINTAINER=	kris
 
 SRCS+=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
-	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c s3_both.c \
-	s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c s3_srvr.c ssl_algs.c \
-	ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_err2.c ssl_lib.c \
-	ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c t1_clnt.c t1_enc.c \
-	t1_lib.c t1_meth.c t1_srvr.c
+	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \
+	s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
+	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \
+	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
+	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \
 
 HDRS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 4aea4f09d294..a97daf4125c7 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -20,11 +20,12 @@ WITH_RSA?=	YES
 CFLAGS+=	-DNO_RSA -DNO_SSL2
 .endif
 
-SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c \
-	dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c gendsa.c \
-	genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c rand.c \
-	req.c rsa.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
-	sess_id.c smime.c speed.c spkac.c verify.c version.c x509.c
+SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
+	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c \
+	gendsa.c genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c \
+	pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c \
+	s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c \
+	spkac.c verify.c version.c x509.o
 
 .include <bsd.prog.mk>