OpenSSL 0.9.4 merge

2 files changed, 59 insertions, 36 deletions

diff --git a/lib/libssl/crypto-patent/Makefile b/lib/libssl/crypto-patent/Makefile
index 14ceca92d7e..c5b0623b0b0 100644
--- a/lib/libssl/crypto-patent/Makefile
+++ b/lib/libssl/crypto-patent/Makefile
@@ -4,6 +4,7 @@ LIB=	crypto
 SSLEAYDIST= src-patent
 
 LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include
 
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -23,10 +24,11 @@ CFLAGS+= -DB_ENDIAN
 .endif
 .endif 
 
-CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
+CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
 CFLAGS+= -I${LCRYPTO_SRC}
-SRCS+=	cryptlib.c mem.c cversion.c ex_data.c cpt_err.c			
+CFLAGS+= -I${LCRYPTO_INC}
+SRCS+=	cryptlib.c ex_data.c cpt_err.c mem.c tmdiff.c cversion.c
 CFLAGS+= -I${LCRYPTO_SRC}/md2
 SRCS+=	md2_dgst.c md2_one.c 					
 CFLAGS+= -I${LCRYPTO_SRC}/md5
@@ -45,36 +47,37 @@ SRCS+=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.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 \
-	fcrypt.c xcbc_enc.c \
+	fcrypt.c xcbc_enc.c ede_cbcm_enc.c \
 	str2key.c  cfb64ede.c ofb64ede.c supp.c
 CFLAGS+= -I${LCRYPTO_SRC}/rc2
-SRCS+=	rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c 	
+SRCS+=	rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c
 SRCS+=	rc2ofb64.c							
 CFLAGS+= -I${LCRYPTO_SRC}/rc4
 SRCS+=	rc4_skey.c rc4_enc.c
 CFLAGS+= -I${LCRYPTO_SRC}/rc5
 SRCS+=	rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c 	
 SRCS+=	rc5ofb64.c rc5_enc.c
-CFLAGS+= -I${LCRYPTO_SRC}/idea
-SRCS+=	i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c		
-SRCS+=	i_skey.c							
+#CFLAGS+= -I${LCRYPTO_SRC}/idea
+#SRCS+=	i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c		
+#SRCS+=	i_skey.c							
 CFLAGS+= -I${LCRYPTO_SRC}/bf
 SRCS+=	bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c		
 CFLAGS+= -I${LCRYPTO_SRC}/cast
 SRCS+=	c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c	
 CFLAGS+= -I${LCRYPTO_SRC}/bn
-SRCS+=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mod.c	
-SRCS+=	bn_mul.c bn_print.c bn_rand.c bn_shift.c bn_sub.c
+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		
-SRCS+=  bn_mulw.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_exp2.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							
+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
 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 					
+SRCS+=	dsa_sign.c dsa_err.c dsa_asn1.c					
 CFLAGS+= -I${LCRYPTO_SRC}/dh
 SRCS+=	dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c	
 CFLAGS+= -I${LCRYPTO_SRC}/buffer
@@ -84,17 +87,17 @@ SRCS+=	bio_lib.c bio_cb.c bio_err.c bss_mem.c
 SRCS+=	bss_null.c bss_fd.c bss_file.c bss_sock.c	
 SRCS+=	bss_conn.c bf_null.c bf_buff.c 
 SRCS+=	b_print.c b_dump.c b_sock.c bss_acpt.c 		
-SRCS+=	bf_nbio.c							
+SRCS+=	bf_nbio.c bss_bio.c bss_log.c
 CFLAGS+= -I${LCRYPTO_SRC}/stack
 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					
+SRCS+=	md_rand.c randfile.c rand_lib.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
+SRCS+=	obj_dat.c obj_lib.c obj_err.c o_names.c
 CFLAGS+= -I${LCRYPTO_SRC}/evp
 SRCS+=	encode.c digest.c evp_enc.c evp_key.c 		
 SRCS+=	e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c		
@@ -110,9 +113,10 @@ SRCS+=	m_dss1.c m_mdc2.c m_ripemd.c p_open.c
 SRCS+=	p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c
 SRCS+=	p_dec.c bio_md.c bio_b64.c bio_enc.c		
 SRCS+=	evp_err.c e_null.c c_all.c evp_lib.c
+SRCS+=	bio_ok.c evp_pbe.c evp_pkey.c p5_crpt.c p5_crpt2.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_all.c pem_err.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	
@@ -130,28 +134,42 @@ 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+=	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
 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 x509pack.c x509type.c x509_lu.c	
+SRCS+=	x509_ext.c x509type.c x509_lu.c	
 SRCS+=	x_all.c x509_txt.c by_file.c by_dir.c	
-SRCS+=	v3_net.c v3_x509.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
 CFLAGS+= -I${LCRYPTO_SRC}/conf
 SRCS+=	conf.c conf_err.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
+SRCS+=	pk7_lib.c pkcs7err.c pk7_doit.c 
+CFLAGS+= -I${LCRYPTO_SRC}/comp
+SRCS+=	c_rle.c c_zlib.c comp_err.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
+
+HDRS= asn1.h dh.h md5.h rc4.h stack.h asn1_mac.h dsa.h mdc2.h rc5.h	\
+      tls1.h bio.h e_os.h objects.h ripemd.h tmdiff.h blowfish.h	\
+      e_os2.h opensslconf.h rsa.h txt_db.h bn.h ebcdic.h opensslv.h	\
+      rsaref.h x509.h buffer.h err.h pem.h safestack.h x509_vfy.h	\
+      cast.h evp.h pem2.h sha.h x509v3.h comp.h hmac.h pkcs12.h ssl.h	\
+      conf.h idea.h pkcs7.h ssl2.h crypto.h lhash.h rand.h ssl23.h	\
+      des.h md2.h rc2.h ssl3.h
 
-HDRS= 	asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
-	bn/bn.h buffer/buffer.h cast/cast.h conf/conf.h des/des.h dh/dh.h \
-	dsa/dsa.h err/err.h evp/evp.h hmac/hmac.h idea/idea.h lhash/lhash.h \
-	md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
-	pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
-	ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
-	x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
 
 .PATH:	${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2	\
 	${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des  ${LCRYPTO_SRC}/rc2 \
@@ -161,18 +179,23 @@ HDRS= 	asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
    	${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}
 
 includes:
 	@test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
-	@cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
-		j="cmp -s ${LCRYPTO_SRC}/$$i \
-		${DESTDIR}/usr/include/ssl/`basename $$i` || \
+	@d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
+	cd ${LCRYPTO_INC}/openssl; for i in $(HDRS); do \
+		f=`basename $$i`; \
+		j="sed 's/<openssl/<ssl/' \
+		       ${LCRYPTO_INC}/openssl/$$i >$$d/$$f && \
+		(cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
 		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/ssl"; \
+			   $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
 		echo $$j; \
 		eval "$$j"; \
-	done
+	done; \
+	rm -rf $$d
 
 
 .include <bsd.lib.mk>
diff --git a/lib/libssl/crypto-patent/shlib_version b/lib/libssl/crypto-patent/shlib_version
index 893819d18ff..c6e3f4d3fc0 100644
--- a/lib/libssl/crypto-patent/shlib_version
+++ b/lib/libssl/crypto-patent/shlib_version
@@ -1,2 +1,2 @@
-major=1
+major=2
 minor=1