6806387 Move OpenSSL from ON to SFW

19 files changed, 0 insertions, 1355 deletions

diff --git a/usr/src/lib/openssl/Makefile b/usr/src/lib/openssl/Makefile
deleted file mode 100644
index 6045425275..0000000000
--- a/usr/src/lib/openssl/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include		../Makefile.lib
-include		Makefile.openssl
-
-SUBDIRS =	libcrypto \
-		libssl
-
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-install :=	TARGET= install
-install_h :=	TARGET= install_h
-lint :=		TARGET= lint
-
-HDRS=		e_os2.h
-
-OPENSSL_SRC=	../../common/openssl
-HDRDIR=		$(OPENSSL_SRC)
-
-ROOTHDRDIR=	$(ROOT)/usr/include/openssl
-
-.KEEP_STATE:
-
-all clean clobber install lint: $(SUBDIRS)
-
-install_h: $(ROOTHDRDIR) $(ROOTHDRS) $(SUBDIRS)
-
-#
-# We don't check these header files because they're third-party swill.
-#
-check:
-
-libssl: libcrypto
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-$(ROOTHDRS): $(ROOTHDRDIR)
-
-$(ROOTHDRDIR):
-	$(INS.dir)
-
-include ../Makefile.targ
diff --git a/usr/src/lib/openssl/Makefile.com b/usr/src/lib/openssl/Makefile.com
deleted file mode 100644
index 2cd5acc78f..0000000000
--- a/usr/src/lib/openssl/Makefile.com
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include $(SRC)/lib/openssl/Makefile.openssl
-# must define VERS before including Makefile.lib
-VERS =		.$(OPENSSL_VERSION)
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.rootfs
-
-CPPFLAGS =	$(OPENSSL_BUILD_CPPFLAGS) $(CPPFLAGS.master)
-
-COPTFLAG =   -xO5
-sparcv9_COPTFLAG =	-xO5
-
-#
-# Ensure `all' is the default target.
-#
-all:
-
-# Normally ROOTLIBPCDIR would be expressed in terms of ROOTLIBDIR
-# however it should always be /usr/lib/pkgconfig so we can't do that here
-# because ROOTLIBDIR is actually ROOTFS_LIBDIR.
-# LIBPCSRC could be expressed in terms of LIBNAME in some cases but
-# not this one because the libraries are libcrypto and libssl but the
-# expected .pc file is openssl.pc
-#
-# The 64 bit directory isn't where one would normally expect but this is
-# what is documented in pkg-config(1) and it is also where all the
-# existing sparcv9 pkgconfig files are.
-
-LIBPCDIR =	/usr/lib/pkgconfig
-LIBPCDIR64 =	/usr/lib/$(MACH64)/pkgconfig
-LIBPCSRC =	openssl.pc
-
-OPENSSL_PREFIX = /usr
-$(LIBPCSRC): ../../$(LIBPCSRC).tmpl
-	$(SED)	-e s@__VERSION__@$(OPENSSL_VERSION)@ \
-		-e s@__PREFIX__@$(OPENSSL_PREFIX)@ \
-		-e s@__LIBDIR__@$(OPENSSL_LIBDIR)@ \
-		 < ../../$(LIBPCSRC).tmpl > $(LIBPCSRC)
-
-ROOTLIBPCDIR =	$(ROOT)/$(LIBPCDIR)
-ROOTLIBPC =	$(LIBPCSRC:%=$(ROOTLIBPCDIR)/%)
-
-ROOTLIBPCDIR64 = $(ROOT)/$(LIBPCDIR64)
-ROOTLIBPC64 =	$(LIBPCSRC:%=$(ROOTLIBPCDIR64)/%)
-
-$(ROOTLIBPCDIR):
-	$(INS.dir)
-
-$(ROOTLIBPCDIR)/%: $(ROOTLIBPCDIR) %
-	$(INS.file)
-
-$(ROOTLIBPCDIR64):
-	$(INS.dir)
-
-$(ROOTLIBPCDIR64)/%: $(ROOTLIBPCDIR64) %
-	$(INS.file)
diff --git a/usr/src/lib/openssl/Makefile.openssl b/usr/src/lib/openssl/Makefile.openssl
deleted file mode 100644
index e8d9be91cb..0000000000
--- a/usr/src/lib/openssl/Makefile.openssl
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# OpenSSL source is common between lib and stand (for wanboot).
-# For userland consumers it is in /usr so we define some macros in case
-# it moves else where later (it has moved thrice already!).
-
-OPENSSL_VERSION =	0.9.8
-OPENSSL_DATE =		"Oct 11 2005"
-
-# OPENSSL_ETCDIR, OPENSSL_NO_XX, OPENSSL_BUILD_CPPFLAGS are
-# for use only for building OpenSSL, they are here because we built it in
-# two different places. OPENSSL_SRC is set invidually for each library
-# as to suppress using absolute paths for source files which leads to
-# the workspace paths being embedded into the binaries.
-
-OPENSSL_ETCDIR =	/etc/openssl
-
-
-# The OPENSSL_NO_XXX variable is use to list the algorithms which Solaris
-# can not include due to patent, trademark or other legal issues.
-# We also exlude all engines, including dynamic support, except for
-# the PKCS#11 one.
-OPENSSL_NO_XXX = \
-	-DOPENSSL_NO_MDC2 \
-	-DOPENSSL_NO_RC3 \
-	-DOPENSSL_NO_RC5 \
-	-DOPENSSL_NO_IDEA \
-	-DOPENSSL_NO_EC \
-	-DOPENSSL_NO_ECDH \
-	-DOPENSSL_NO_ECDSA \
-	-DOPENSSL_NO_HW_4758_CCA \
-	-DOPENSSL_NO_HW_AEP \
-	-DOPENSSL_NO_HW_ATALLA \
-	-DOPENSSL_NO_HW_CHIL \
-	-DOPENSSL_NO_HW_CSWIFT \
-	-DOPENSSL_NO_HW_GMP \
-	-DOPENSSL_NO_HW_NURON \
-	-DOPENSSL_NO_HW_PADLOCK \
-	-DOPENSSL_NO_HW_SUREWARE \
-	-DOPENSSL_NO_HW_UBSEC
-
-OPENSSL_BUILD_CPPFLAGS_sparc = -DB_ENDIAN
-
-OPENSSL_BUILD_CPPFLAGS = \
-	-I$(ROOT)/usr/include \
-	-I$(OPENSSL_SRC)\
-	-I$(OPENSSL_SRC)/crypto \
-	-DSOLARIS_OPENSSL \
-	-DDEVRANDOM=\"/dev/urandom\" \
-	-DOPENSSLDIR=\"$(OPENSSL_ETCDIR)\" \
-	-DENGINESDIR=\"$(OPENSSL_ETCDIR)/lib/engines\" \
-	-DDSO_DLFCN -DHAVE_DLFCN_H \
-	-D_REENTRANT \
-	-DOPENSSL_THREADS \
-	$(OPENSSL_BUILD_CPPFLAGS_$(MACH)) \
-	$(OPENSSL_NO_XXX)
-
-OPENSSL_LIBDIR =	/lib
-
-CFLAGS +=		-_gcc=-fasm
diff --git a/usr/src/lib/openssl/libcrypto/Makefile b/usr/src/lib/openssl/libcrypto/Makefile
deleted file mode 100644
index 35f5181285..0000000000
--- a/usr/src/lib/openssl/libcrypto/Makefile
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include $(SRC)/lib/Makefile.lib
-include ../Makefile.com
-
-HDRS= \
-	aes.h \
-	asn1.h \
-	asn1_mac.h \
-	asn1t.h \
-	bio.h \
-	bio_lcl.h \
-	blowfish.h \
-	bn.h \
-	buffer.h \
-	cast.h \
-	comp.h \
-	conf.h \
-	conf_api.h \
-	crypto.h \
-	des.h \
-	des_old.h \
-	dh.h \
-	dsa.h \
-	dso.h \
-	ebcdic.h \
-	ec.h \
-	ecdh.h \
-	ecdsa.h \
-	ech_locl.h \
-	ecs_locl.h \
-	engine.h \
-	err.h \
-	evp.h \
-	hmac.h \
-	idea.h \
-	krb5_asn.h \
-	lhash.h \
-	md2.h \
-	md4.h \
-	md5.h \
-	mdc2.h \
-	o_dir.h \
-	o_str.h \
-	obj_mac.h \
-	objects.h \
-	ocsp.h \
-	opensslconf.h \
-	opensslv.h \
-	ossl_typ.h \
-	pcy_int.h \
-	pem.h \
-	pem2.h \
-	pkcs12.h \
-	pkcs7.h \
-	pq_compat.h \
-	pqueue.h \
-	rand.h \
-	rc2.h \
-	rc4.h \
-	rc5.h \
-	ripemd.h \
-	rsa.h \
-	safestack.h \
-	sha.h \
-	stack.h \
-	store.h \
-	str_locl.h \
-	symhacks.h \
-	tmdiff.h \
-	txt_db.h \
-	ui.h \
-	ui_compat.h \
-	x509.h \
-	x509_vfy.h \
-	x509v3.h
-
-OPENSSL_SRC =	../../../common/openssl
-HDRDIR =	$(OPENSSL_SRC)/crypto
-ROOTHDRDIR =	$(ROOT)/usr/include/openssl
-
-SUBDIRS =	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-install :=	TARGET= install
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-.PARALLEL:
-
-all clean clobber install lint: $(SUBDIRS)
-
-install_h:	$(ROOTHDRS)
-
-_msg:
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/aes/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/asn1/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/bf/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/bio/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/bn/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/buffer/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/cast/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/comp/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/conf/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/des/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/dh/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/dsa/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/dso/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ec/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ecdh/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ecdsa/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/engine/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/err/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/evp/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/hmac/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/idea/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/krb5/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/lhash/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/md2/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/md4/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/md5/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/mdc2/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/objects/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ocsp/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/pem/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/pkcs12/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/pkcs7/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/pqueue/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/rand/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/rc2/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/rc4/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/rc5/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ripemd/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/rsa/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/sha/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/stack/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/store/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/txt_db/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/ui/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/x509/%
-	 $(INS.file)
-
-$(ROOTHDRDIR)/%: $(HDRDIR)/x509v3/%
-	 $(INS.file)
-
-
-include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/openssl/libcrypto/Makefile.com b/usr/src/lib/openssl/libcrypto/Makefile.com
deleted file mode 100644
index 4fee2ad69a..0000000000
--- a/usr/src/lib/openssl/libcrypto/Makefile.com
+++ /dev/null
@@ -1,305 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-LIBRARY = libcrypto.a
-
-OBJECTS = \
-	cryptlib.o	mem.o		mem_dbg.o	cversion.o	\
-	ex_data.o	tmdiff.o	cpt_err.o	o_time.o	\
-	uid.o		mem_clr.o	o_str.o		o_dir.o		\
-	\
-	aes/aes_cbc.o	aes/aes_cfb.o	aes/aes_core.o	aes/aes_ctr.o	\
-	aes/aes_ecb.o	aes/aes_misc.o	aes/aes_ofb.o			\
-	\
-	asn1/a_object.o	asn1/a_bitstr.o	asn1/a_utctm.o	asn1/a_gentm.o	\
-	asn1/a_time.o	asn1/a_int.o	asn1/a_octet.o	asn1/a_print.o	\
-	asn1/a_type.o	asn1/a_set.o	asn1/a_dup.o	asn1/a_d2i_fp.o	\
-	asn1/a_i2d_fp.o	asn1/a_enum.o	asn1/a_utf8.o	asn1/a_sign.o	\
-	asn1/a_digest.o	asn1/a_verify.o	asn1/a_mbstr.o	asn1/a_strex.o	\
-	asn1/x_algor.o	asn1/x_val.o	asn1/x_pubkey.o	asn1/x_sig.o	\
-	asn1/x_req.o	asn1/x_attrib.o	asn1/x_bignum.o	asn1/x_long.o	\
-	asn1/x_name.o	asn1/x_x509.o	asn1/x_x509a.o	asn1/x_crl.o	\
-	asn1/x_info.o	asn1/x_spki.o	asn1/nsseq.o	asn1/d2i_pu.o	\
-	asn1/d2i_pr.o	asn1/i2d_pu.o	asn1/i2d_pr.o	asn1/t_req.o	\
-	asn1/t_x509.o	asn1/t_x509a.o	asn1/t_crl.o	asn1/t_pkey.o	\
-	asn1/t_spki.o	asn1/t_bitst.o	asn1/tasn_new.o	asn1/tasn_fre.o	\
-	asn1/tasn_enc.o	asn1/tasn_dec.o	asn1/tasn_utl.o	asn1/tasn_typ.o	\
-	asn1/f_int.o	asn1/f_string.o	asn1/n_pkey.o	asn1/f_enum.o	\
-	asn1/a_hdr.o	asn1/x_pkey.o	asn1/a_bool.o	asn1/x_exten.o	\
-	asn1/asn1_par.o	asn1/asn1_lib.o	asn1/asn1_err.o	asn1/a_meth.o	\
-	asn1/a_bytes.o	asn1/a_strnid.o	asn1/evp_asn1.o	asn1/asn_pack.o	\
-	asn1/p5_pbe.o	asn1/p5_pbev2.o	asn1/p8_pkey.o	asn1/asn_moid.o	\
-	asn1/asn1_gen.o							\
-	\
-	bf/bf_skey.o	bf/bf_ecb.o	bf/bf_cfb64.o	bf/bf_ofb64.o	\
-	bf/bf_enc.o							\
-	\
-	bio/bio_lib.o	bio/bio_cb.o	bio/bio_err.o	bio/bss_mem.o	\
-	bio/bss_null.o	bio/bss_fd.o	bio/bss_file.o	bio/bss_sock.o	\
-	bio/bss_conn.o	bio/bf_null.o	bio/bf_buff.o	bio/b_print.o	\
-	bio/b_dump.o	bio/b_sock.o	bio/bss_acpt.o	bio/bf_nbio.o	\
-	bio/bss_log.o	bio/bss_bio.o	bio/bss_dgram.o			\
-	\
-	bn/bn_add.o	bn/bn_div.o	bn/bn_exp.o	bn/bn_lib.o	\
-	bn/bn_ctx.o	bn/bn_mul.o	bn/bn_mod.o	bn/bn_print.o	\
-	bn/bn_rand.o	bn/bn_shift.o	bn/bn_word.o	bn/bn_blind.o	\
-	bn/bn_kron.o	bn/bn_sqrt.o	bn/bn_gcd.o	bn/bn_prime.o	\
-	bn/bn_err.o	bn/bn_sqr.o	bn/bn_recp.o	bn/bn_mont.o	\
-	bn/bn_const.o	bn/bn_depr.o	bn/bn_gf2m.o	bn/bn_nist.o	\
-	bn/bn_mpi.o	bn/bn_exp2.o					\
-	\
-	buffer/buffer.o	buffer/buf_err.o				\
-	\
-	cast/c_enc.o	cast/c_ecb.o	cast/c_cfb64.o	cast/c_ofb64.o	\
-	cast/c_skey.o							\
-	\
-	comp/comp_lib.o	comp/c_rle.o	comp/c_zlib.o			\
-	\
-	conf/conf_err.o	conf/conf_lib.o	conf/conf_api.o	conf/conf_sap.o	\
-	conf/conf_def.o	conf/conf_mod.o	conf/conf_mall.o		\
-	\
-	des/set_key.o	des/ecb_enc.o	des/cbc_enc.o	des/ecb3_enc.o	\
-	des/cfb64enc.o	des/cfb64ede.o	des/cfb_enc.o	des/ofb64ede.o	\
-	des/enc_read.o	des/enc_writ.o	des/ofb64enc.o	des/ofb_enc.o	\
-	des/str2key.o	des/pcbc_enc.o	des/qud_cksm.o	des/rand_key.o	\
-	des/fcrypt.o	des/xcbc_enc.o	des/rpc_enc.o	des/cbc_cksm.o	\
-	des/des_old.o	des/des_old2.o	des/read2pwd.o	des/des_enc.o	\
-	des/fcrypt_b.o	des/ede_cbcm_enc.o				\
-	\
-	dh/dh_asn1.o	dh/dh_gen.o	dh/dh_key.o	dh/dh_lib.o	\
-	dh/dh_check.o	dh/dh_err.o	dh/dh_depr.o			\
-	\
-	dsa/dsa_gen.o	dsa/dsa_key.o	dsa/dsa_lib.o	dsa/dsa_asn1.o	\
-	dsa/dsa_vrf.o	dsa/dsa_sign.o	dsa/dsa_err.o	dsa/dsa_ossl.o	\
-	dsa/dsa_depr.o							\
-	\
-	dso/dso_dl.o	dso/dso_dlfcn.o	dso/dso_err.o	dso/dso_lib.o	\
-	dso/dso_null.o	dso/dso_openssl.o				\
-	\
-	err/err.o	err/err_all.o	err/err_prn.o			\
-	\
-	evp/bio_b64.o	evp/bio_enc.o	evp/bio_md.o	evp/bio_ok.o	\
-	evp/c_all.o	evp/c_allc.o	evp/c_alld.o	evp/digest.o	\
-	evp/e_aes.o	evp/e_bf.o	evp/e_cast.o	evp/e_des.o	\
-	evp/e_des3.o	evp/e_idea.o	evp/e_null.o	evp/e_rc2.o	\
-	evp/e_rc4.o	evp/e_rc5.o	evp/e_xcbc_d.o	evp/encode.o	\
-	evp/evp_acnf.o	evp/evp_enc.o	evp/evp_err.o	evp/evp_key.o	\
-	evp/evp_lib.o	evp/evp_pbe.o	evp/evp_pkey.o	evp/m_dss.o	\
-	evp/m_dss1.o	evp/m_md2.o	evp/m_md4.o	evp/m_md5.o	\
-	evp/m_mdc2.o	evp/m_null.o	evp/m_ripemd.o	evp/m_sha.o	\
-	evp/m_sha1.o	evp/names.o	evp/p5_crpt.o	evp/p5_crpt2.o	\
-	evp/p_dec.o	evp/p_enc.o	evp/p_lib.o	evp/p_open.o	\
-	evp/p_seal.o	evp/p_sign.o	evp/p_verify.o	evp/e_old.o	\
-	evp/m_ecdsa.o							\
-	\
-	engine/eng_all.o		engine/eng_list.o		\
-	engine/eng_cnf.o		engine/eng_pkey.o		\
-	engine/eng_ctrl.o		engine/eng_table.o		\
-	engine/eng_dyn.o		engine/tb_cipher.o		\
-	engine/eng_err.o		engine/tb_dh.o			\
-	engine/eng_fat.o		engine/tb_digest.o		\
-	engine/eng_init.o		engine/tb_dsa.o			\
-	engine/eng_lib.o		engine/tb_rand.o		\
-	engine/tb_rsa.o			engine/tb_store.o		\
-	engine/tb_ecdh.o		engine/tb_ecdsa.o		\
-	engine/eng_cryptodev.o						\
-	\
-	engine/hw_pk11.o		engine/hw_pk11_pub.o		\
-	\
-	hmac/hmac.o							\
-	\
-	lhash/lhash.o	lhash/lh_stats.o				\
-	\
-	md2/md2_dgst.o	md2/md2_one.o					\
-	\
-	md4/md4_dgst.o	md4/md4_one.o					\
-	\
-	md5/md5_dgst.o	md5/md5_one.o					\
-	\
-	objects/o_names.o		objects/obj_dat.o		\
-	objects/obj_err.o		objects/obj_lib.o		\
-	\
-	ocsp/ocsp_asn.o	ocsp/ocsp_err.o	ocsp/ocsp_prn.o			\
-	ocsp/ocsp_vfy.o	ocsp/ocsp_cl.o	ocsp/ocsp_ext.o	ocsp/ocsp_lib.o	\
-	ocsp/ocsp_srv.o	ocsp/ocsp_ht.o					\
-	\
-	pem/pem_sign.o	pem/pem_seal.o	pem/pem_info.o	pem/pem_lib.o	\
-	pem/pem_all.o	pem/pem_err.o	pem/pem_x509.o	pem/pem_xaux.o	\
-	pem/pem_oth.o	pem/pem_pk8.o	pem/pem_pkey.o			\
-	\
-	pkcs12/p12_add.o		pkcs12/p12_asn.o		\
-	pkcs12/p12_crpt.o		pkcs12/p12_crt.o		\
-	pkcs12/p12_init.o		pkcs12/p12_key.o		\
-	pkcs12/p12_mutl.o		pkcs12/p12_utl.o		\
-	pkcs12/pk12err.o		pkcs12/p12_p8d.o		\
-	pkcs12/p12_attr.o		pkcs12/p12_decr.o		\
-	pkcs12/p12_kiss.o		pkcs12/p12_npas.o		\
-	pkcs12/p12_p8e.o						\
-	\
-	pkcs7/pk7_asn1.o		pkcs7/pk7_lib.o			\
-	pkcs7/pkcs7err.o		pkcs7/pk7_doit.o		\
-	pkcs7/pk7_smime.o		pkcs7/pk7_attr.o		\
-	pkcs7/pk7_mime.o						\
-	\
-	pqueue/pqueue.o							\
-	\
-	rand/md_rand.o	rand/randfile.o	rand/rand_lib.o	rand/rand_err.o	\
-	rand/rand_unix.o		rand/rand_egd.o	rand/rand_nw.o	\
-	\
-	rc2/rc2_cbc.o	rc2/rc2_ecb.o	rc2/rc2_skey.o	rc2/rc2cfb64.o	\
-	rc2/rc2ofb64.o							\
-	\
-	rc4/rc4_enc.o	rc4/rc4_skey.o					\
-	\
-	ripemd/rmd_dgst.o		ripemd/rmd_one.o		\
-	\
-	rsa/rsa_eay.o	rsa/rsa_gen.o	rsa/rsa_lib.o	rsa/rsa_sign.o	\
-	rsa/rsa_saos.o	rsa/rsa_err.o	rsa/rsa_pk1.o	rsa/rsa_ssl.o	\
-	rsa/rsa_none.o	rsa/rsa_oaep.o	rsa/rsa_chk.o	rsa/rsa_null.o	\
-	rsa/rsa_asn1.o	rsa/rsa_depr.o	rsa/rsa_pss.o	rsa/rsa_x931.o	\
-	\
-	sha/sha_dgst.o	sha/sha1dgst.o	sha/sha_one.o	sha/sha1_one.o	\
-	sha/sha256.o	sha/sha512.o					\
-	\
-	stack/stack.o							\
-	\
-	store/str_err.o	store/str_lib.o	store/str_mem.o			\
-	store/str_meth.o						\
-	\
-	txt_db/txt_db.o							\
-	\
-	ui/ui_err.o	ui/ui_compat.o	ui/ui_lib.o	ui/ui_openssl.o	\
-	ui/ui_util.o							\
-	\
-	x509/x509_def.o	x509/x509_d2.o	x509/x509_r2x.o x509/x509_cmp.o	\
-	x509/x509_obj.o	x509/x509_req.o x509/x509spki.o	x509/x509_vfy.o	\
-	x509/x509_set.o x509/x509cset.o	x509/x509rset.o	x509/x509_err.o	\
-	x509/x509name.o	x509/x509_v3.o	x509/x509_ext.o x509/x509_att.o	\
-	x509/x509type.o	x509/x509_lu.o	x509/x_all.o	x509/x509_txt.o	\
-	x509/x509_trs.o x509/by_file.o	x509/by_dir.o	x509/x509_vpm.o	\
-	\
-	x509v3/v3_ia5.o	x509v3/v3_lib.o	x509v3/v3_prn.o x509v3/v3_utl.o	\
-	x509v3/v3_pku.o	x509v3/v3_int.o	x509v3/v3_enum.o		\
-	x509v3/v3err.o	x509v3/v3_alt.o x509v3/v3_genn.o		\
-	x509v3/v3_pci.o			x509v3/v3_pcia.o		\
-	x509v3/v3_purp.o		x509v3/v3_info.o		\
-	x509v3/v3_ocsp.o		x509v3/v3_bitst.o		\
-	x509v3/v3_conf.o		x509v3/v3_extku.o		\
-	x509v3/v3_cpols.o		x509v3/v3_crld.o		\
-	x509v3/v3_akey.o		x509v3/v3_akeya.o		\
-	x509v3/v3_skey.o		x509v3/v3_sxnet.o		\
-	x509v3/v3_ncons.o		x509v3/v3_bcons.o		\
-	x509v3/v3_pcons.o		x509v3/v3_pmaps.o		\
-	\
-	x509v3/pcy_cache.o		x509v3/pcy_tree.o		\
-	x509v3/pcy_data.o		x509v3/pcy_lib.o		\
-	x509v3/pcy_map.o		x509v3/pcy_node.o		\
-	\
-	$(MD5_OBJ_ASM)							\
-	$(BN_ASM)
-
-# MD5_OBJ_ASM and BN_ASM may be overriden by <arch>/Makefile.
-MD5_OBJ_ASM =
-BN_ASM = 	bn/bn_asm.o
-
-include ../../Makefile.com
-
-CFLAGS +=	-K PIC
-CFLAGS64 +=	-K PIC
-LDLIBS +=	-lc -lsocket -lnsl
-
-MAPFILES =
-
-LIBS =		$(DYNLIB) $(LINTLIB)
-OPENSSL_SRC =	../../../../common/openssl
-SRCDIR =	$(OPENSSL_SRC)/crypto
-
-$(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
-
-# We do not want to give the CFLAGS and build date information
-# so we define the magic NO_WINDOWS_BRAINDEATH to suppress this
-pics/cversion.o :=	CPPFLAGS += -DNO_WINDOWS_BRAINDEATH
-lint :=			CPPFLAGS += -DNO_WINDOWS_BRAINDEATH
-
-.KEEP_STATE:
-
-all:		subdirs $(LIBS)
-
-lint:		lintcheck
-
-lintcheck := SRCS = $(SRCDIR)/engine/hw_pk11.c $(SRCDIR)/engine/hw_pk11_pub.c
-
-subdirs:	FRC
-	@mkdir -p \
-		pics/aes \
-		pics/asn1  \
-		pics/bf \
-		pics/bio \
-		pics/bn \
-		pics/bn/asm \
-		pics/buffer \
-		pics/cast \
-		pics/comp \
-		pics/conf \
-		pics/des \
-		pics/dh \
-		pics/dsa \
-		pics/dso \
-		pics/ec \
-		pics/engine \
-		pics/err \
-		pics/evp \
-		pics/hmac \
-		pics/lhash \
-		pics/md2 \
-		pics/md4 \
-		pics/md5 \
-		pics/md5/asm \
-		pics/mdc2 \
-		pics/objects \
-		pics/ocsp \
-		pics/pem \
-		pics/pkcs12 \
-		pics/pkcs7 \
-		pics/pqueue \
-		pics/store \
-		pics/rand \
-		pics/rc2 \
-		pics/rc4 \
-		pics/ripemd \
-		pics/rsa \
-		pics/sha \
-		pics/stack \
-		pics/txt_db \
-		pics/ui \
-		pics/x509 \
-		pics/x509v3
-
-FRC:
-
-pics/%.o: $(SRCDIR)/%.S
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/openssl/libcrypto/amd64/Makefile b/usr/src/lib/openssl/libcrypto/amd64/Makefile
deleted file mode 100644
index 2850655696..0000000000
--- a/usr/src/lib/openssl/libcrypto/amd64/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-include $(SRC)/lib/Makefile.lib.64
-
-
-CFLAGS64 += -DOPENSSL_NO_INLINE_ASM
-
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/openssl/libcrypto/i386/Makefile b/usr/src/lib/openssl/libcrypto/i386/Makefile
deleted file mode 100644
index af76f5ab90..0000000000
--- a/usr/src/lib/openssl/libcrypto/i386/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/openssl/libcrypto/inc.flg b/usr/src/lib/openssl/libcrypto/inc.flg
deleted file mode 100644
index 14369459af..0000000000
--- a/usr/src/lib/openssl/libcrypto/inc.flg
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-find_files "s.*" usr/src/common/openssl/crypto
-echo_file usr/src/common/openssl/e_os.h
diff --git a/usr/src/lib/openssl/libcrypto/sparc/Makefile b/usr/src/lib/openssl/libcrypto/sparc/Makefile
deleted file mode 100644
index 506c55bef6..0000000000
--- a/usr/src/lib/openssl/libcrypto/sparc/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-
-# Override the default specified in Makefile.com
-BN_ASM = bn/asm/sparcv8.o
-
-# lint doesn't like asm files
-lint :=	MD5_OBJ_ASM =
-lint :=	BN_ASM =
-
-CFLAGS += -DBN_DIV2W
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile b/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
deleted file mode 100644
index d001469588..0000000000
--- a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-include ../../../Makefile.lib.64
-
-# Override the default specified in ../Makefile.com
-MD5_OBJ_ASM=	md5/asm/md5-sparcv9.o
-
-# suppress this specific warning triggered by SS12 compiler. We do it here so
-# that we don't have to change the source code using pragma directives. The
-# issue is that acomp is not equipped to perform control flow checks on demand
-# so warning can be issued on an invalid construct even when the construct is
-# not reachable, like this:
-#
-#	char c, buf[10];
-#	if (0 != 0)
-#		c = buf[-1];
-#
-CFLAGS64 += -erroff=E_BAD_VAR_ADDRESS_ARITH
-
-# lint doesn't like asm files
-lint :=	MD5_OBJ_ASM =
-lint :=	BN_ASM =
-
-CFLAGS64 += -DMD5_ASM \
-	-erroff=E_TYP_STORAGE_CLASS_OBSOLESCENT \
-	-erroff=E_CONST_PROMOTED_UNSIGNED_LONG
-
-pics/md5/asm/md5-sparcv9.o := CFLAGS64 += -DMD5_BLOCK_DATA_ORDER
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/lib/openssl/libssl/Makefile b/usr/src/lib/openssl/libssl/Makefile
deleted file mode 100644
index 7e91d92ca1..0000000000
--- a/usr/src/lib/openssl/libssl/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include	../../../lib/Makefile.lib
-include ../Makefile.com
-
-HDRS = \
-	kssl.h \
-	ssl.h \
-	ssl2.h \
-	ssl3.h \
-	ssl23.h \
-	tls1.h \
-	dtls1.h
-
-OPENSSL_SRC=	../../../common/openssl
-HDRDIR=		$(OPENSSL_SRC)/ssl
-ROOTHDRDIR=	$(ROOT)/usr/include/openssl
-
-SUBDIRS=	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-install :=	TARGET= install
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-
-all clean clobber install lint: $(SUBDIRS)
-
-install_h:	$(ROOTHDRS)
-
-_msg:
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-
-include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/openssl/libssl/Makefile.com b/usr/src/lib/openssl/libssl/Makefile.com
deleted file mode 100644
index 474c84eb2d..0000000000
--- a/usr/src/lib/openssl/libssl/Makefile.com
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-LIBRARY = libssl.a
-
-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
-
-# There should be a mapfile here
-MAPFILES =
-
-LIBS =		$(DYNLIB) $(LINTLIB)
-OPENSSL_SRC =	../../../../common/openssl
-SRCDIR =	$(OPENSSL_SRC)/ssl
-
-$(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
-
-LDLIBS +=	-lcrypto -lc 
-
-.KEEP_STATE:
-
-all:		$(LIBS)
-
-lint:		lintcheck
-
-include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/openssl/libssl/amd64/Makefile b/usr/src/lib/openssl/libssl/amd64/Makefile
deleted file mode 100644
index e24f7ea080..0000000000
--- a/usr/src/lib/openssl/libssl/amd64/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-include $(SRC)/lib/Makefile.lib.64
-
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64)
diff --git a/usr/src/lib/openssl/libssl/i386/Makefile b/usr/src/lib/openssl/libssl/i386/Makefile
deleted file mode 100644
index 42dbfd686d..0000000000
--- a/usr/src/lib/openssl/libssl/i386/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-i386_OBJECTS= 
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC)
diff --git a/usr/src/lib/openssl/libssl/inc.flg b/usr/src/lib/openssl/libssl/inc.flg
deleted file mode 100644
index 9bd27a122d..0000000000
--- a/usr/src/lib/openssl/libssl/inc.flg
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-find_files "s.*" usr/src/common/openssl/ssl
-echo_file usr/src/common/openssl/crypto/cryptlib.h
-echo_file usr/src/common/openssl/e_os.h
diff --git a/usr/src/lib/openssl/libssl/sparc/Makefile b/usr/src/lib/openssl/libssl/sparc/Makefile
deleted file mode 100644
index b1b9ce828b..0000000000
--- a/usr/src/lib/openssl/libssl/sparc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-sparc_OBJECTS= 
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC)
diff --git a/usr/src/lib/openssl/libssl/sparcv9/Makefile b/usr/src/lib/openssl/libssl/sparcv9/Makefile
deleted file mode 100644
index 9bc61b7520..0000000000
--- a/usr/src/lib/openssl/libssl/sparcv9/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-include ../../../Makefile.lib.64
-
-CFLAGS64 += $(C_BIGPICFLAGS64)
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLIBPC64)
diff --git a/usr/src/lib/openssl/openssl.pc.tmpl b/usr/src/lib/openssl/openssl.pc.tmpl
deleted file mode 100644
index d7248dc43f..0000000000
--- a/usr/src/lib/openssl/openssl.pc.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-prefix=__PREFIX__
-exec_prefix=${prefix}
-libdir=__LIBDIR__
-includedir=${prefix}/include
-
-Name: OpenSSL
-Description: Secure Sockets Layer and cryptography libraries and tools
-Version: __VERSION__
-Requires: 
-Libs: -L${libdir} -R${libdir} -lssl -lcrypto -lsocket -lnsl -ldl
-Cflags: -I${includedir} 
diff --git a/usr/src/lib/openssl/req.flg b/usr/src/lib/openssl/req.flg
deleted file mode 100644
index f7b10420ed..0000000000
--- a/usr/src/lib/openssl/req.flg
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-echo_file usr/src/lib/openssl/Makefile.com