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

3 files changed, 41 insertions, 56 deletions

diff --git a/usr/src/lib/openssl/libssl/Makefile b/usr/src/lib/openssl/libssl/Makefile
index 996311de49..21e76291e0 100644
--- a/usr/src/lib/openssl/libssl/Makefile
+++ b/usr/src/lib/openssl/libssl/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"
@@ -34,7 +33,8 @@ HDRS = \
 	ssl2.h \
 	ssl3.h \
 	ssl23.h \
-	tls1.h
+	tls1.h \
+	dtls1.h
 
 HDRDIR=		$(OPENSSL_SRC)/ssl
 ROOTHDRDIR=	$(ROOTSFWINCLUDE)/openssl
diff --git a/usr/src/lib/openssl/libssl/Makefile.com b/usr/src/lib/openssl/libssl/Makefile.com
index 3e8ea65a5c..69d5be31d1 100644
--- a/usr/src/lib/openssl/libssl/Makefile.com
+++ b/usr/src/lib/openssl/libssl/Makefile.com
@@ -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"
@@ -28,45 +27,31 @@
 # usr/src/lib/openssl/ssl/Makefile.com
 #
 
-LIBRARY= libssl.a
+LIBRARY = libssl.a
 
-OBJECTS= \
-	bio_ssl.o \
-	kssl.o \
-	s23_clnt.o \
-	s23_lib.o \
-	s23_meth.o \
-	s23_pkt.o \
-	s23_srvr.o \
-	s2_clnt.o \
-	s2_enc.o \
-	s2_lib.o \
-	s2_meth.o \
-	s2_pkt.o \
-	s2_srvr.o \
-	s3_both.o \
-	s3_clnt.o \
-	s3_enc.o \
-	s3_lib.o \
-	s3_meth.o \
-	s3_pkt.o \
-	s3_srvr.o \
-	ssl_algs.o \
-	ssl_asn1.o \
-	ssl_cert.o \
-	ssl_ciph.o \
-	ssl_err.o \
-	ssl_err2.o \
-	ssl_lib.o \
-	ssl_rsa.o \
-	ssl_sess.o \
-	ssl_stat.o \
-	ssl_txt.o \
-	t1_clnt.o \
-	t1_enc.o \
-	t1_lib.o \
-	t1_meth.o \
-	t1_srvr.o \
+OBJECTS = bio_ssl.o							\
+	\
+	d1_both.o	d1_clnt.o	d1_enc.o	d1_lib.o	\
+	d1_meth.o	d1_pkt.o	d1_srvr.o			\
+	\
+	kssl.o								\
+	\
+	s2_clnt.o	s2_enc.o	s2_lib.o	s2_meth.o	\
+	s2_pkt.o	s2_srvr.o					\
+	\
+	s23_clnt.o	s23_lib.o	s23_meth.o	s23_pkt.o	\
+	s23_srvr.o							\
+	\
+	s3_both.o	s3_clnt.o	s3_enc.o	s3_lib.o	\
+	s3_meth.o	s3_pkt.o	s3_srvr.o			\
+	\
+	ssl_algs.o	ssl_asn1.o	ssl_cert.o	ssl_ciph.o	\
+	ssl_err.o	ssl_err2.o	ssl_lib.o	ssl_rsa.o	\
+	ssl_sess.o	ssl_stat.o	ssl_txt.o			\
+	\
+	t1_clnt.o	t1_enc.o	t1_lib.o	t1_meth.o	\
+	t1_srvr.o							\
+	\
 	$($(MACH)_OBJECTS)
 
 include ../../Makefile.com
@@ -74,15 +59,15 @@ include ../../Makefile.com
 LIBS =		$(DYNLIB) $(LINTLIB)
 SRCDIR =	../../../../common/openssl/ssl
 
-$(LINTLIB):= 	SRCS = $(SRCDIR)/$(LINTSRC)
+$(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
 
-LDLIBS += $(OPENSSL_LDFLAGS) -lcrypto -lc 
-DYNFLAGS += $(OPENSSL_FILTER_FLAG) $(OPENSSL_DYNFLAGS)
+LDLIBS +=	$(OPENSSL_LDFLAGS) -lcrypto -lc 
+DYNFLAGS +=	$(OPENSSL_FILTER_FLAG) $(OPENSSL_DYNFLAGS)
 
 .KEEP_STATE:
 
-all: $(LIBS)
+all:		$(LIBS)
 
-lint: lintcheck
+lint:		lintcheck
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/openssl/libssl/sparcv9/Makefile b/usr/src/lib/openssl/libssl/sparcv9/Makefile
index 1317575d42..9bc61b7520 100644
--- a/usr/src/lib/openssl/libssl/sparcv9/Makefile
+++ b/usr/src/lib/openssl/libssl/sparcv9/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"
@@ -29,5 +28,6 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
+CFLAGS64 += $(C_BIGPICFLAGS64)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64)