PSARC/2006/019 OpenSSL upgrade to 0.9.8a

6352999 upgrade OpenSSL to 0.9.8a

--HG--
rename : usr/src/common/openssl/crypto/asn1/f.c => deleted_files/usr/src/common/openssl/crypto/asn1/f.c
rename : usr/src/common/openssl/crypto/asn1/x_cinf.c => deleted_files/usr/src/common/openssl/crypto/asn1/x_cinf.c
rename : usr/src/common/openssl/crypto/ec/ecp_recp.c => deleted_files/usr/src/common/openssl/crypto/ec/ecp_recp.c
rename : usr/src/common/openssl/crypto/engine/hw.ec => deleted_files/usr/src/common/openssl/crypto/engine/hw.ec
rename : usr/src/common/openssl/crypto/engine/hw_4758_cca.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_4758_cca.c
rename : usr/src/common/openssl/crypto/engine/hw_4758_cca_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_4758_cca_err.c
rename : usr/src/common/openssl/crypto/engine/hw_4758_cca_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_4758_cca_err.h
rename : usr/src/common/openssl/crypto/engine/hw_aep.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_aep.c
rename : usr/src/common/openssl/crypto/engine/hw_aep_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_aep_err.c
rename : usr/src/common/openssl/crypto/engine/hw_aep_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_aep_err.h
rename : usr/src/common/openssl/crypto/engine/hw_atalla.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_atalla.c
rename : usr/src/common/openssl/crypto/engine/hw_atalla_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_atalla_err.c
rename : usr/src/common/openssl/crypto/engine/hw_atalla_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_atalla_err.h
rename : usr/src/common/openssl/crypto/engine/hw_cryptodev.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_cryptodev.c
rename : usr/src/common/openssl/crypto/engine/hw_cswift.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_cswift.c
rename : usr/src/common/openssl/crypto/engine/hw_cswift_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_cswift_err.c
rename : usr/src/common/openssl/crypto/engine/hw_cswift_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_cswift_err.h
rename : usr/src/common/openssl/crypto/engine/hw_ncipher.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_ncipher.c
rename : usr/src/common/openssl/crypto/engine/hw_ncipher_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_ncipher_err.c
rename : usr/src/common/openssl/crypto/engine/hw_ncipher_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_ncipher_err.h
rename : usr/src/common/openssl/crypto/engine/hw_nuron.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_nuron.c
rename : usr/src/common/openssl/crypto/engine/hw_nuron_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_nuron_err.c
rename : usr/src/common/openssl/crypto/engine/hw_nuron_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_nuron_err.h
rename : usr/src/common/openssl/crypto/engine/hw_sureware.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_sureware.c
rename : usr/src/common/openssl/crypto/engine/hw_sureware_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_sureware_err.c
rename : usr/src/common/openssl/crypto/engine/hw_sureware_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_sureware_err.h
rename : usr/src/common/openssl/crypto/engine/hw_ubsec.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_ubsec.c
rename : usr/src/common/openssl/crypto/engine/hw_ubsec_err.c => deleted_files/usr/src/common/openssl/crypto/engine/hw_ubsec_err.c
rename : usr/src/common/openssl/crypto/engine/hw_ubsec_err.h => deleted_files/usr/src/common/openssl/crypto/engine/hw_ubsec_err.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/aep.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/aep.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/atalla.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/atalla.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/cswift.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/cswift.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/hw_4758_cca.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/hw_4758_cca.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/hw_ubsec.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/hw_ubsec.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/hwcryptohook.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/hwcryptohook.h
rename : usr/src/common/openssl/crypto/engine/vendor_defns/sureware.h => deleted_files/usr/src/common/openssl/crypto/engine/vendor_defns/sureware.h

2 files changed, 150 insertions, 98 deletions

diff --git a/usr/src/stand/lib/crypto/Makefile b/usr/src/stand/lib/crypto/Makefile
index 3fa8dc0620..62014fc66d 100644
--- a/usr/src/stand/lib/crypto/Makefile
+++ b/usr/src/stand/lib/crypto/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # 
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -30,82 +29,128 @@
 #
 
 LIBRARY = libcrypto.a
-OBJECTS = \
-	cryptlib.o mem.o      mem_dbg.o  ex_data.o  \
-	cpt_err.o  mem_clr.o  o_time.o                         \
-	a_object.o a_bitstr.o a_utctm.o  a_gentm.o  a_time.o   a_int.o    \
-        a_octet.o  a_print.o  a_type.o   a_set.o    a_dup.o    a_d2i_fp.o \
-        a_i2d_fp.o a_enum.o   a_utf8.o   a_sign.o   a_digest.o a_verify.o \
-        a_mbstr.o  a_strex.o  x_algor.o  x_val.o    x_pubkey.o x_sig.o    \
-        x_req.o    x_attrib.o x_bignum.o x_long.o   x_name.o   x_x509.o   \
-        x_x509a.o  x_crl.o    x_info.o   x_spki.o   nsseq.o    d2i_pu.o   \
-        d2i_pr.o   i2d_pu.o   i2d_pr.o   t_x509.o   t_x509a.o  \
-        t_pkey.o   tasn_new.o tasn_fre.o \
-        tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o f_int.o    f_string.o \
-        x_pkey.o   a_bool.o   x_exten.o  \
-        asn1_par.o asn1_lib.o asn1_err.o a_bytes.o  a_strnid.o \
-        evp_asn1.o asn_pack.o p5_pbe.o   p5_pbev2.o p8_pkey.o  \
-	bf_skey.o  bf_ecb.o   bf_cfb64.o bf_ofb64.o bf_enc.o              \
-	dsa_lib.o  dsa_asn1.o dsa_vrf.o  dsa_sign.o \
-	dsa_err.o  dsa_ossl.o                                             \
-	bio_lib.o  bio_err.o  bss_sock.o bss_file.o \
-        b_dump.o   bf_buff.o  b_print.o  \
-	bn_add.o   bn_div.o   bn_exp.o   bn_lib.o   bn_ctx.o   bn_mul.o   \
-        bn_mod.o   bn_print.o bn_rand.o  bn_shift.o bn_word.o  bn_blind.o \
-        bn_gcd.o   bn_err.o   bn_sqr.o   \
-        bn_asm.o   bn_recp.o  bn_mont.o  bn_exp2.o             \
-	buffer.o   buf_err.o                                              \
-	comp_lib.o conf_err.o conf_err.o conf_lib.o \
-        conf_api.o conf_def.o \
-	set_key.o  ecb_enc.o  ecb3_enc.o cfb64enc.o cfb64ede.o \
-        ofb64ede.o ofb64enc.o \
-        des_enc.o  \
-        xcbc_enc.o \
-	dh_asn1.o  dh_key.o   dh_lib.o   dh_err.o   \
-	err.o      err_all.o  err_prn.o                                   \
-	encode.o   digest.o   evp_enc.o  evp_key.o  e_des.o    \
-        e_bf.o     e_des3.o   e_rc2.o    names.o    e_xcbc_d.o \
-        m_md5.o    m_sha.o    m_sha1.o   m_dss.o    \
-        m_dss1.o   p_sign.o   \
-        p_verify.o p_lib.o    \
-        evp_err.o  e_null.o   c_all.o    c_allc.o   c_alld.o   \
-        evp_lib.o  evp_pkey.o evp_pbe.o  p5_crpt.o  p5_crpt2.o \
-        eng_err.o              \
-        eng_init.o             eng_lib.o              eng_list.o              \
-        eng_table.o            \
-        tb_cipher.o             \
-        tb_dh.o                tb_digest.o            tb_dsa.o                \
-        tb_rand.o              tb_rsa.o                                       \
-	hmac.o                                                            \
-	lhash.o   \
-	o_names.o obj_dat.o   obj_lib.o   obj_err.o                       \
-	ocsp_asn.o   ocsp_err.o   \
-	pem_info.o pem_lib.o pem_all.o pem_err.o    \
-	pem_x509.o pem_xaux.o pem_oth.o  pem_pkey.o             \
-	p12_add.o  p12_asn.o  p12_attr.o p12_crpt.o p12_decr.o \
-        p12_key.o  p12_mutl.o p12_utl.o  \
-        pk12err.o  p12_p8d.o  p12_p8e.o                                   \
-	pk7_asn1.o pk7_lib.o  pkcs7err.o \
-	md_rand.o randfile.o rand_lib.o rand_err.o rand_unix.o            \
-	rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o              \
-	rsa_eay.o rsa_lib.o rsa_sign.o rsa_err.o     \
-	rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o \
-	rsa_asn1.o                                                        \
-	sha_dgst.o sha1dgst.o \
-	md5_dgst.o \
-	md5-sparcv9.o \
-	stack.o \
-	ui_err.o                                                          \
-	x509_def.o x509_d2.o  x509_cmp.o x509_obj.o x509_req.o \
-        x509_vfy.o x509rset.o x509_err.o \
-        x509name.o x509_v3.o  x509_ext.o x509_att.o x509type.o x509_lu.o  \
-        x_all.o    x509_txt.o x509_trs.o by_file.o  by_dir.o   v3_bcons.o \
-        v3_bitst.o v3_conf.o  v3_extku.o v3_ia5.o   v3_lib.o   v3_prn.o   \
-        v3_utl.o   v3err.o    v3_genn.o  v3_alt.o   v3_skey.o  v3_akey.o  \
-        v3_pku.o   v3_int.o   v3_enum.o  v3_sxnet.o v3_cpols.o v3_crld.o  \
-        v3_purp.o  v3_info.o  v3_ocsp.o  v3_akeya.o                       \
+
+OBJECTS = cryptlib.o	mem.o		mem_dbg.o	ex_data.o	\
+	cpt_err.o	o_time.o	mem_clr.o	o_dir.o		\
+	\
+	a_object.o	a_bitstr.o	a_utctm.o	a_gentm.o	\
+	a_time.o	a_int.o		a_octet.o	a_print.o	\
+	a_type.o	a_set.o		a_dup.o		a_d2i_fp.o	\
+	a_i2d_fp.o	a_enum.o	a_utf8.o	a_sign.o	\
+	a_digest.o	a_verify.o	a_mbstr.o	a_strex.o	\
+	x_algor.o	x_val.o		x_pubkey.o	x_sig.o		\
+	x_req.o		x_attrib.o	x_bignum.o	x_long.o	\
+	x_name.o	x_x509.o	x_x509a.o	x_crl.o		\
+	x_info.o	x_spki.o	nsseq.o		d2i_pu.o	\
+	d2i_pr.o	i2d_pu.o	i2d_pr.o	t_x509.o	\
+	t_x509a.o	t_pkey.o	tasn_new.o	tasn_fre.o	\
+	tasn_enc.o	tasn_dec.o	tasn_utl.o	tasn_typ.o	\
+	f_int.o		f_string.o	x_pkey.o	a_bool.o	\
+	x_exten.o	asn1_par.o	asn1_lib.o	asn1_err.o	\
+	a_bytes.o	a_strnid.o	evp_asn1.o	asn_pack.o	\
+	p5_pbe.o	p5_pbev2.o	p8_pkey.o	asn1_gen.o	\
+	\
+	bf_skey.o	bf_ecb.o	bf_cfb64.o	bf_ofb64.o	\
+	bf_enc.o							\
+	\
+	bio_lib.o	bio_err.o	bss_file.o	bss_sock.o	\
+	bf_buff.o	b_print.o	b_dump.o			\
+	\
+	bn_add.o	bn_div.o	bn_exp.o	bn_lib.o	\
+	bn_ctx.o	bn_mul.o	bn_mod.o	bn_print.o	\
+	bn_rand.o	bn_shift.o	bn_word.o	bn_blind.o	\
+	bn_gcd.o	bn_prime.o	bn_asm.o	bn_mont.o	\
+	bn_err.o	bn_sqr.o	bn_recp.o	bn_exp2.o	\
+	\
+	buffer.o	buf_err.o					\
+	\
+	comp_lib.o							\
+	\
+	conf_err.o	conf_lib.o	conf_api.o	conf_def.o	\
+	conf_mod.o							\
+	\
+	set_key.o	ecb_enc.o	ecb3_enc.o	ofb64enc.o	\
+	cfb64enc.o	cfb64ede.o	cfb_enc.o	ofb64ede.o	\
+	\
+	xcbc_enc.o	des_enc.o					\
+	\
+	dh_asn1.o	dh_key.o	dh_lib.o	dh_check.o	\
+	dh_err.o							\
+	\
+	dsa_vrf.o	dsa_sign.o	dsa_err.o	dsa_ossl.o	\
+	dsa_lib.o	dsa_asn1.o					\
+	\
+	dso_lib.o	dso_null.o	dso_openssl.o			\
+	\
+	err.o		err_all.o	err_prn.o			\
+	\
+	c_all.o		c_allc.o	c_alld.o	digest.o	\
+	e_des3.o	e_null.o	e_rc2.o		e_xcbc_d.o	\
+	e_bf.o		e_des.o		encode.o	evp_enc.o	\
+	evp_err.o	evp_key.o	evp_lib.o	evp_pbe.o	\
+	evp_pkey.o	m_dss.o		m_dss1.o	m_md5.o		\
+	m_sha.o		m_sha1.o	names.o		p5_crpt.o	\
+	p5_crpt2.o	p_lib.o		p_sign.o	p_verify.o	\
+	\
+	eng_list.o	eng_ctrl.o	eng_table.o	tb_cipher.o	\
+	eng_err.o	tb_dh.o		tb_digest.o	eng_init.o	\
+	tb_dsa.o	eng_lib.o	tb_rand.o	tb_rsa.o	\
+	\
+	hmac.o								\
+	\
+	lhash.o								\
+	\
+	md5_dgst.o	md5-sparcv9.o					\
+	\
+	o_names.o	obj_dat.o	obj_err.o	obj_lib.o	\
+	\
+	ocsp_asn.o	ocsp_err.o					\
+	\
+	pem_info.o	pem_lib.o	pem_all.o	pem_err.o	\
+	pem_x509.o	pem_xaux.o	pem_oth.o	pem_pkey.o	\
+	\
+	p12_add.o	p12_asn.o	p12_crpt.o	p12_key.o	\
+	p12_mutl.o	p12_utl.o	pk12err.o	p12_p8d.o	\
+	p12_attr.o	p12_decr.o	p12_p8e.o			\
+	\
+	pk7_asn1.o	pk7_lib.o	pkcs7err.o			\
+	\
+	md_rand.o	randfile.o	rand_lib.o	rand_err.o	\
+	rand_unix.o							\
+	\
+	rc2_cbc.o	rc2_ecb.o	rc2_skey.o	rc2cfb64.o	\
+	rc2ofb64.o							\
+	\
+	rsa_eay.o	rsa_lib.o	rsa_sign.o	rsa_err.o	\
+	rsa_pk1.o	rsa_ssl.o	rsa_none.o	rsa_oaep.o	\
+	rsa_asn1.o	rsa_x931.o					\
+	\
+	sha_dgst.o	sha1dgst.o	sha256.o	sha512.o	\
+	\
+	stack.o								\
+	\
+	ui_err.o							\
+	\
+	x509_def.o	x509_d2.o 	x509_cmp.o	x509_obj.o	\
+	x509_req.o 	x509_vfy.o	x509rset.o	x509_err.o	\
+	x509name.o	x509_v3.o	x509_ext.o	x509_att.o	\
+	x509type.o	x509_lu.o	x_all.o		x509_txt.o	\
+	x509_trs.o	by_file.o	by_dir.o	x509_vpm.o	\
+	\
+	v3_ia5.o	v3_lib.o	v3_prn.o	v3_utl.o	\
+	v3_pku.o	v3_int.o	v3_enum.o	v3err.o		\
+	v3_alt.o	v3_genn.o	v3_pci.o	v3_pcia.o	\
+	v3_purp.o	v3_info.o	v3_ocsp.o	v3_bitst.o	\
+	v3_conf.o	v3_extku.o	v3_cpols.o	v3_crld.o	\
+	v3_akey.o	v3_akeya.o	v3_skey.o	v3_sxnet.o	\
+	v3_ncons.o	v3_bcons.o	v3_pcons.o	v3_pmaps.o	\
+	\
+	pcy_cache.o	pcy_tree.o	pcy_data.o	pcy_lib.o	\
+	pcy_map.o	pcy_node.o					\
+	\
 	$($(MACH)_OBJECTS)
 
+
 include $(SRC)/lib/openssl/Makefile.openssl
 include ../Makefile.com
 
@@ -188,6 +233,9 @@ objs/%.o: $(SRCDIR)/bf/%.c
 objs/%.o: $(SRCDIR)/dsa/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
+objs/%.o: $(SRCDIR)/dso/%.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
 objs/%.o: $(SRCDIR)/bio/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/stand/lib/ssl/Makefile b/usr/src/stand/lib/ssl/Makefile
index 1256758d31..080c39a18e 100644
--- a/usr/src/stand/lib/ssl/Makefile
+++ b/usr/src/stand/lib/ssl/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,38 +19,43 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # 
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = libssl.a
+
 LOCOBJS = stubs.o
-CMNOBJS = \
-	s3_both.o \
-	s3_clnt.o \
-	s3_enc.o \
-	s3_lib.o \
-	s3_pkt.o \
-	ssl_algs.o \
-	ssl_cert.o \
-	ssl_ciph.o \
-	ssl_err.o \
-	ssl_err2.o \
-	ssl_lib.o \
-	ssl_rsa.o \
-	ssl_sess.o \
+
+COMPOBJS = c_zlib.o
+
+CMNOBJS = s3_both.o	s3_clnt.o	s3_enc.o	s3_lib.o	\
+	s3_pkt.o							\
+	\
+	ssl_algs.o	ssl_cert.o	ssl_ciph.o	ssl_err.o	\
+	ssl_err2.o	ssl_lib.o	ssl_rsa.o	ssl_sess.o	\
+	\
 	$($(MACH)_OBJECTS)
 
-OBJECTS = $(LOCOBJS) $(CMNOBJS)
+OBJECTS = $(LOCOBJS) $(COMPOBJS) $(CMNOBJS)
 
 include $(SRC)/lib/openssl/Makefile.openssl
 include ../Makefile.com
 
 CMNDIR	= $(TOPDIR)/common/openssl/ssl
-SRCS	= $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(CMNOBJS:%.o=$(CMNDIR)/%.c)
+COMPDIR	= $(TOPDIR)/common/openssl/crypto/comp
+
+SRCS	= $(LOCOBJS:%.o=$(SRCDIR)/%.c) \
+	$(COMPOBJS:%.o=$(COMPDIR)/%.c) \
+	$(CMNOBJS:%.o=$(CMNDIR)/%.c)
+
 CPPFLAGS += $(OPENSSL_BUILD_CPPFLAGS) $(SOCKCPPFLAGS)
 $(LINTLIB) :=	SRCS = $(CMNDIR)/$(LINTSRC)
 
+objs/%.o: $(TOPDIR)/common/openssl/crypto/comp/%.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
 include ../Makefile.targ