PSARC 2005/426 libmd - message digest library

4795652 /usr/include/security should be listed in Targetdirs 4937832 x86 optimization of SHA-1 6188861 provide libmd - message digest library --HG-- rename : usr/src/cmd/cmd-inet/usr.bin/pppd/md4.c => deleted_files/usr/src/cmd/cmd-inet/usr.bin/pppd/md4.c rename : usr/src/cmd/cmd-inet/usr.bin/pppd/md4.h => deleted_files/usr/src/cmd/cmd-inet/usr.bin/pppd/md4.h rename : usr/src/cmd/cmd-inet/usr.bin/pppd/sha1.c => deleted_files/usr/src/cmd/cmd-inet/usr.bin/pppd/sha1.c rename : usr/src/cmd/cmd-inet/usr.bin/pppd/sha1.h => deleted_files/usr/src/cmd/cmd-inet/usr.bin/pppd/sha1.h rename : usr/src/cmd/cmd-inet/usr.bin/pppd/sha1_consts.h => deleted_files/usr/src/cmd/cmd-inet/usr.bin/pppd/sha1_consts.h rename : usr/src/common/net/wanboot/crypt/sha1.c => deleted_files/usr/src/common/net/wanboot/crypt/sha1.c rename : usr/src/lib/libmd5/spec/Makefile => deleted_files/usr/src/lib/libmd5/spec/Makefile rename : usr/src/lib/libmd5/spec/Makefile.targ => deleted_files/usr/src/lib/libmd5/spec/Makefile.targ rename : usr/src/lib/libmd5/spec/amd64/Makefile => deleted_files/usr/src/lib/libmd5/spec/amd64/Makefile rename : usr/src/lib/libmd5/spec/i386/Makefile => deleted_files/usr/src/lib/libmd5/spec/i386/Makefile rename : usr/src/lib/libmd5/spec/md5.spec => deleted_files/usr/src/lib/libmd5/spec/md5.spec rename : usr/src/lib/libmd5/spec/sparc/Makefile => deleted_files/usr/src/lib/libmd5/spec/sparc/Makefile rename : usr/src/lib/libmd5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmd5/spec/sparcv9/Makefile rename : usr/src/lib/libmd5/spec/versions => deleted_files/usr/src/lib/libmd5/spec/versions rename : usr/src/lib/libmd5_psr/Makefile => deleted_files/usr/src/lib/libmd5_psr/Makefile rename : usr/src/lib/libmd5_psr/Makefile.com => deleted_files/usr/src/lib/libmd5_psr/Makefile.com rename : usr/src/lib/libmd5_psr/Makefile.targ => deleted_files/usr/src/lib/libmd5_psr/Makefile.targ rename : usr/src/lib/libmd5_psr/inc.flg => deleted_files/usr/src/lib/libmd5_psr/inc.flg rename : usr/src/lib/libmd5_psr/sparc/Makefile => deleted_files/usr/src/lib/libmd5_psr/sparc/Makefile rename : usr/src/lib/libmd5_psr/sparc/sun4u/Makefile => deleted_files/usr/src/lib/libmd5_psr/sparc/sun4u/Makefile rename : usr/src/lib/libmd5_psr/sparcv9/Makefile => deleted_files/usr/src/lib/libmd5_psr/sparcv9/Makefile rename : usr/src/lib/libmd5_psr/sparcv9/sun4u/Makefile => deleted_files/usr/src/lib/libmd5_psr/sparcv9/sun4u/Makefile rename : usr/src/lib/libmd5_psr/spec/Makefile => deleted_files/usr/src/lib/libmd5_psr/spec/Makefile rename : usr/src/lib/libmd5_psr/spec/Makefile.com => deleted_files/usr/src/lib/libmd5_psr/spec/Makefile.com rename : usr/src/lib/libmd5_psr/spec/sparc/Makefile => deleted_files/usr/src/lib/libmd5_psr/spec/sparc/Makefile rename : usr/src/lib/libmd5_psr/spec/sparc/sun4u/Makefile => deleted_files/usr/src/lib/libmd5_psr/spec/sparc/sun4u/Makefile rename : usr/src/lib/libmd5_psr/spec/sparc/versions-sun4u => deleted_files/usr/src/lib/libmd5_psr/spec/sparc/versions-sun4u rename : usr/src/lib/libmd5_psr/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmd5_psr/spec/sparcv9/Makefile rename : usr/src/lib/libmd5_psr/spec/sparcv9/md5_psr-sun4u.spec => deleted_files/usr/src/lib/libmd5_psr/spec/sparcv9/md_psr-sun4u.spec rename : usr/src/lib/libmd5_psr/spec/sparcv9/sun4u/Makefile => deleted_files/usr/src/lib/libmd5_psr/spec/sparcv9/sun4u/Makefile rename : usr/src/lib/libmd5_psr/spec/sparcv9/versions-sun4u => deleted_files/usr/src/lib/libmd5_psr/spec/sparcv9/versions-sun4u rename : usr/src/lib/libmd5_psr/spec/sparc/md5_psr-sun4u.spec => deleted_files/usr/src/lib/libmd_psr/spec/sparc/md_psr-sun4u.spec rename : usr/src/cmd/volmgt/vold/vold_md4.c => usr/src/common/crypto/md4/md4.c rename : usr/src/cmd/volmgt/vold/md4.h => usr/src/lib/libmd/common/md4.h rename : usr/src/head/md5.h => usr/src/lib/libmd/common/md5.h rename : usr/src/lib/libmd5/llib-lmd5 => usr/src/lib/libmd5/common/llib-lmd5
author: darrenm <none@none> 2006-03-28 08:45:30 -0800
committer: darrenm <none@none> 2006-03-28 08:45:30 -0800
commit: 734b6a94890be549309b21156f8ed6d4561cac51 (patch)
tree: 2933f611f79a13239acd3bd859b39c4bf5ad04e6 /usr/src/lib
parent: 35fe197b91640f2efc8c0b3849eee882e373c729 (diff)
download: illumos-joyent-734b6a94890be549309b21156f8ed6d4561cac51.tar.gz
70 files changed, 1360 insertions, 1020 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index c7d90d71de..cfcba443d5 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -65,6 +65,7 @@ SUBDIRS += \
 	libc			.WAIT	\
 	libmapmalloc		.WAIT	\
 	../cmd/sgs/libelf	.WAIT	\
+	libmd				\
 	libmd5				\
 	librsm				\
 	libmp			.WAIT	\
@@ -217,8 +218,7 @@ SUBDIRS += \
 
 sparc_SUBDIRS= .WAIT	\
 	efcode		\
-	libc_psr	.WAIT	\
-	libmd5_psr	.WAIT
+	libc_psr	.WAIT
 $(CLOSED_BUILD)sparc_SUBDIRS += \
 	$(CLOSED)/lib/libprtdiag	.WAIT	\
 	$(CLOSED)/lib/libprtdiag_psr	\
@@ -328,6 +328,7 @@ HDRSUBDIRS= libaio	\
         liblaadm        \
 	libmacadm	\
 	libmail		\
+	libmd		\
 	libmtmalloc	\
 	libnvpair	\
 	libnsl		\
@@ -451,12 +452,12 @@ libmacadm:	libdevinfo
 libuuid:	libsocket
 libinetutil:	libsocket
 libsecdb:	libcmd libnsl
-librt:		libaio libmd5
-libsasl:	libgss libsocket pkcs11 libmd5
+librt:		libaio libmd
+libsasl:	libgss libsocket pkcs11 libmd
 sasl_plugins:	pkcs11 libgss libsocket libsasl
 libsctp:	libsocket
 libsocket:	libnsl
-libldap5:	libsasl libsocket libnsl libmd5
+libldap5:	libsasl libsocket libnsl libmd
 libsldap:	libldap5 libtsol
 libpool:	libnvpair libexacct
 libproject:	libpool libproc libsecdb
@@ -466,7 +467,7 @@ libwanboot:	libnvpair libresolv libnsl libsocket libdevinfo libinetutil \
 		libdhcputil openssl
 libwanbootutil:	libnsl
 pam_modules:	libproject passwdutil $(SMARTCARD)
-libscf:		libuutil
+libscf:		libuutil libmd
 libinetsvc:	libscf
 librestart:	libuutil libscf
 ../cmd/sgs/libdl:	../cmd/sgs/libconv
diff --git a/usr/src/lib/crypt_modules/bsdmd5/Makefile.com b/usr/src/lib/crypt_modules/bsdmd5/Makefile.com
index f2e6fa9136..c9e7fa3ad6 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/Makefile.com
+++ b/usr/src/lib/crypt_modules/bsdmd5/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"
@@ -31,7 +30,7 @@ OBJECTS=	bsdmd5.o
 
 include		../../Makefile.crypt_modules
 
-LDLIBS 		+= -lc -lmd5
+LDLIBS 		+= -lc -lmd
 
 all: $(LIBS)
 
diff --git a/usr/src/lib/crypt_modules/sunmd5/Makefile.com b/usr/src/lib/crypt_modules/sunmd5/Makefile.com
index f9f335896e..6982c0ce63 100644
--- a/usr/src/lib/crypt_modules/sunmd5/Makefile.com
+++ b/usr/src/lib/crypt_modules/sunmd5/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"
@@ -31,7 +30,7 @@ OBJECTS=	sunmd5.o
 
 include		../../Makefile.crypt_modules
 
-LDLIBS 		+= -lc -lmd5
+LDLIBS 		+= -lc -lmd
 
 all: $(LIBS)
 
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 52871561fc..399ed7a3dd 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -99,7 +99,7 @@ CFLAGS	+=	$(CCVERBOSE)
 DYNFLAGS +=	-M$(MAPFILE)
 
 LAZYLIBS =	$(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD)
-LDLIBS +=	-lsocket -lnsl -lmd5 -lc -lsecdb $(LAZYLIBS)
+LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb $(LAZYLIBS)
 lint :=		LAZYLIBS = -ltsol
 
 COMDIR=		../common
diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com
index 2bb617480d..6ea2c906c6 100644
--- a/usr/src/lib/libinetsvc/Makefile.com
+++ b/usr/src/lib/libinetsvc/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"
@@ -34,7 +33,7 @@ include ../../Makefile.lib
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-LDLIBS +=	-lscf -lc -lsocket -lnsl -lmd5 -luutil
+LDLIBS +=	-lscf -lc -lsocket -lnsl -lmd -luutil
 
 SRCDIR =	../common
 MAPDIR =	../spec/$(TRANSMACH)
diff --git a/usr/src/lib/libldap4/Makefile.com b/usr/src/lib/libldap4/Makefile.com
index d663656758..f1ba53072f 100644
--- a/usr/src/lib/libldap4/Makefile.com
+++ b/usr/src/lib/libldap4/Makefile.com
@@ -1,5 +1,5 @@
 #
-# 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"
@@ -72,7 +72,7 @@ LOCFLAGS +=	-D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \
 CPPFLAGS =	$(LOCFLAGS) $(CPPFLAGS.master)
 CFLAGS +=	$(CCVERBOSE)
 DYNFLAGS +=	-M $(MAPFILE)
-LDLIBS +=	-lsocket -lnsl -lresolv -lc -lmd5
+LDLIBS +=	-lsocket -lnsl -lresolv -lc -lmd
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com
index a90c72761d..1874b19a76 100644
--- a/usr/src/lib/libldap5/Makefile.com
+++ b/usr/src/lib/libldap5/Makefile.com
@@ -120,7 +120,7 @@ SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE) $(LOCFLAGS)
 CFLAGS64 +=	$(LOCFLAGS)
-LDLIBS +=	-lsasl -lsocket -lnsl -lmd5 -lc
+LDLIBS +=	-lsasl -lsocket -lnsl -lmd -lc
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libmd5_psr/Makefile b/usr/src/lib/libmd/Makefile
index 0cda9bbeb8..8d883853e6 100644
--- a/usr/src/lib/libmd5_psr/Makefile
+++ b/usr/src/lib/libmd/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.
@@ -22,36 +21,44 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libmd5_psr/Makefile
+# lib/libmd/Makefile
 #
 
-include $(SRC)/Makefile.master
+include ../Makefile.lib
 
-SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+$(SPARC_BLD)PLATFORMS= sun4u sun4v
+
+SUBDIRS=	$(MACH) $(PLATFORMS)
+$(BUILD64)SUBDIRS += $(MACH64)
+
+HDRS =		md4.h md5.h sha1.h sha2.h
+HDRDIR =	common
 
 all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
+lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-.PARALLEL: $(MACH) $(MACH64)
+.PARALLEL: $(MACH) $(MACH64) $(PLATFORMS)
 
-all clean clobber install: $(SUBDIRS)
+all install: spec .WAIT $(SUBDIRS)
 
-spec $(MACH) $(MACH64): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
+clean clobber: $(SUBDIRS)
 
-#
-# Empty targets.
-# lint is an empty target since md5.c is already linted
-# up and down in the kernel and a lint library is already
-# created in lib/libmd5.
-#
-_msg install_h check lint:
+lint:		$(SUBDIRS)
 
+install_h:	$(ROOTHDRS)
+
+check:		$(CHECKHDRS)
+
+spec $(MACH) $(MACH64) $(PLATFORMS): FRC
+	@cd $@; pwd; $(MAKE) $(TARGET)
 FRC:
+
+include ../Makefile.targ
diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com
new file mode 100644
index 0000000000..d872a0c83e
--- /dev/null
+++ b/usr/src/lib/libmd/Makefile.com
@@ -0,0 +1,124 @@
+#
+# 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"
+#
+# lib/libmd/Makefile.com
+#
+
+# $LIBRARY is set in lower makefiles so we can have platform and
+# processor optimised versions of this library via libmd_psr and libmd_hwcapN
+
+#LIBRARY= libmd.a
+VERS= .1
+
+OBJECTS= md4.o md5.o sha1.o sha2.o
+
+# Use $(SRC) to include makefiles rather than ../../ because the 
+# platform subdirs are one level deeper so it would be ../../../ for them
+include $(SRC)/lib/Makefile.lib
+include $(SRC)/lib/Makefile.rootfs
+
+LIBS =		$(DYNLIB) $(LINTLIB)
+SRCS = \
+	$(COMDIR)/md4/md4.c \
+	$(COMDIR)/md5/md5.c \
+	$(COMDIR)/sha1/sha1.c \
+	$(COMDIR)/sha2/sha2.c
+
+COMDIR= $(SRC)/common/crypto
+
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
+LDLIBS +=	-lc
+
+SRCDIR =	../common
+COMDIR =	$(SRC)/common/crypto
+MAPDIR =	../spec/$(TRANSMACH)
+SPECMAPFILE =	$(MAPDIR)/mapfile
+
+CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
+CFLAGS64 += $(C_BIGPICFLAGS)
+CPPFLAGS += -I$(SRCDIR)
+
+# The md5 and sha1 code is very careful about data alignment
+# but lint doesn't know that, so just shut lint up.
+LINTFLAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
+LINTFLAGS64 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
+
+
+ROOTLINT= $(LINTSRC:%=$(ROOTLIBDIR)/%)
+
+.KEEP_STATE:
+
+all: $(LIBS) fnamecheck
+
+lint: lintcheck
+
+pics/%.o: $(COMDIR)/md4/%.c
+	$(COMPILE.c) -I$(COMDIR)/md4 -o $@ $<
+	$(POST_PROCESS_O)
+
+pics/%.o: $(COMDIR)/md5/%.c
+	$(COMPILE.c) -I$(COMDIR)/md5 $(INLINES) -o $@ $<
+	$(POST_PROCESS_O)
+
+pics/%.o: $(COMDIR)/sha1/%.c
+	$(COMPILE.c) -I$(COMDIR)/sha1 -o $@ $<
+	$(POST_PROCESS_O)
+
+pics/%.o: $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s
+	$(COMPILE.s) -P -DPIC -D_ASM -o $@ $<
+	$(POST_PROCESS_O)
+
+pics/%.o: $(COMDIR)/sha2/%.c
+	$(COMPILE.c) -I$(COMDIR)/sha2 -o $@ $<
+	$(POST_PROCESS_O)
+
+#
+# Used when building links in /platform/$(PLATFORM)/lib for libmd_psr.so.1
+#
+
+LIBMD_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
+LIBMD_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
+
+LIBMD_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
+LIBMD_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
+
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+
+INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+
+$(LIBMD_PSR_DIRS):
+	-$(INS.dir.root.bin)
+
+$(LIBMD_PSR_LINKS): $(LIBMD_PSR_DIRS)
+	-$(INS.slink6)
+
+$(LIBMD_PSR64_DIRS):
+	-$(INS.dir.root.bin)
+
+$(LIBMD_PSR64_LINKS): $(LIBMD_PSR64_DIRS)
+	-$(INS.slink64)
+
+include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libmd/amd64/Makefile b/usr/src/lib/libmd/amd64/Makefile
new file mode 100644
index 0000000000..217f07b1d8
--- /dev/null
+++ b/usr/src/lib/libmd/amd64/Makefile
@@ -0,0 +1,33 @@
+#
+# 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"
+#
+
+LIBRARY= libmd.a
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/lib/libmd/common/llib-lmd b/usr/src/lib/libmd/common/llib-lmd
new file mode 100644
index 0000000000..1d61afcff5
--- /dev/null
+++ b/usr/src/lib/libmd/common/llib-lmd
@@ -0,0 +1,34 @@
+/*
+ * 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
+ */
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <md5.h>
+#include <sha1.h>
+#include <sha2.h>
+#include <md4.h>
diff --git a/usr/src/lib/libmd/common/md4.h b/usr/src/lib/libmd/common/md4.h
new file mode 100644
index 0000000000..4772880634
--- /dev/null
+++ b/usr/src/lib/libmd/common/md4.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	__MD4_H
+#define	__MD4_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+
+/*
+ * MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm
+ */
+
+/*
+ * Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* MD4 context. */
+typedef struct {
+	ulong_t state[4];	/* state (ABCD) */
+	ulong_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
+	unsigned char buffer[64];	/* input buffer */
+} MD4_CTX;
+
+void MD4Init(MD4_CTX *);
+void MD4Update(MD4_CTX *, const void *_RESTRICT_KYWD, size_t);
+void MD4Final(void *, MD4_CTX *);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* __MD4_H */
diff --git a/usr/src/lib/libmd/common/md5.h b/usr/src/lib/libmd/common/md5.h
new file mode 100644
index 0000000000..39525cf355
--- /dev/null
+++ b/usr/src/lib/libmd/common/md5.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MD5_H
+#define	_MD5_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * MD5.H - header file for MD5C.C
+ */
+
+/*
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD5 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+#include <sys/md5.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void md5_calc(void *, const void*, unsigned int);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _MD5_H */
diff --git a/usr/src/lib/libmd/common/sha1.h b/usr/src/lib/libmd/common/sha1.h
new file mode 100644
index 0000000000..241f1008d3
--- /dev/null
+++ b/usr/src/lib/libmd/common/sha1.h
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+#ifndef _SHA1_H
+#define	_SHA1_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/sha1.h>
+
+#endif	/* _SHA1_H */
diff --git a/usr/src/lib/libmd/common/sha2.h b/usr/src/lib/libmd/common/sha2.h
new file mode 100644
index 0000000000..d19e2253b0
--- /dev/null
+++ b/usr/src/lib/libmd/common/sha2.h
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+#ifndef _SHA2_H
+#define	_SHA2_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/sha2.h>
+
+#endif	/* _SHA2_H */
diff --git a/usr/src/lib/libmd5_psr/spec/sparc/versions-sun4u b/usr/src/lib/libmd/i386/Makefile
index 7f8676bc03..2b05624aa1 100644
--- a/usr/src/lib/libmd5_psr/spec/sparc/versions-sun4u
+++ b/usr/src/lib/libmd/i386/Makefile
@@ -1,15 +1,9 @@
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
+# 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.
@@ -24,9 +18,14 @@
 #
 # CDDL HEADER END
 #
-# lib/libmd5_psr/spec/sparc/versions-sun4u
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+LIBRARY= libmd.a
+
+include ../Makefile.com
 
-sparc {
-	SUNWprivate_1.1;
-}
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libmd5_psr/inc.flg b/usr/src/lib/libmd/inc.flg
index bee518812f..2652430b84 100644
--- a/usr/src/lib/libmd5_psr/inc.flg
+++ b/usr/src/lib/libmd/inc.flg
@@ -3,9 +3,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.
@@ -21,9 +20,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 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"
 
+find_files "s.*" usr/src/common/crypto/md4
 find_files "s.*" usr/src/common/crypto/md5
+find_files "s.*" usr/src/common/crypto/sha1
+find_files "s.*" usr/src/common/crypto/sha2
diff --git a/usr/src/lib/libmd/sparc/Makefile b/usr/src/lib/libmd/sparc/Makefile
new file mode 100644
index 0000000000..ccce8c78b2
--- /dev/null
+++ b/usr/src/lib/libmd/sparc/Makefile
@@ -0,0 +1,32 @@
+#
+# 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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+LIBRARY= libmd.a
+
+include ../Makefile.com
+
+DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
+
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libmd/sparcv9/Makefile b/usr/src/lib/libmd/sparcv9/Makefile
new file mode 100644
index 0000000000..6b3d51b1ea
--- /dev/null
+++ b/usr/src/lib/libmd/sparcv9/Makefile
@@ -0,0 +1,33 @@
+#
+# 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
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+LIBRARY= libmd.a
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(MACH64)/$(DYNLIBPSR)
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/lib/libmd5/spec/Makefile b/usr/src/lib/libmd/spec/Makefile
index 777f118831..98e4eb2a33 100644
--- a/usr/src/lib/libmd5/spec/Makefile
+++ b/usr/src/lib/libmd/spec/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,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5/spec/Makefile
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
 
 include $(SRC)/lib/Makefile.spec.arch
+
+$(SPARC_BLD)SUBDIRS += sun4u sun4v
diff --git a/usr/src/lib/libmd5_psr/spec/sparcv9/versions-sun4u b/usr/src/lib/libmd/spec/Makefile.targ
index 463cbb78ac..6f966d7486 100644
--- a/usr/src/lib/libmd5_psr/spec/sparcv9/versions-sun4u
+++ b/usr/src/lib/libmd/spec/Makefile.targ
@@ -1,15 +1,9 @@
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
+# 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.
@@ -24,9 +18,15 @@
 #
 # CDDL HEADER END
 #
-# lib/libmd5_psr/spec/sparcv9/versions-sun4u
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+LIBRARY= libmd.a
+VERS= .1
+
+OBJECTS= md.o
 
-sparcv9 {
-	SUNWprivate_1.1;
-}
+SPECCPP += -I../../
diff --git a/usr/src/lib/libmd5/spec/amd64/Makefile b/usr/src/lib/libmd/spec/amd64/Makefile
index b2e036a827..a474b4b09b 100644
--- a/usr/src/lib/libmd5/spec/amd64/Makefile
+++ b/usr/src/lib/libmd/spec/amd64/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,23 +19,15 @@
 # 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"
 #
 
 include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/lib/Makefile.lib.64
-
-# Uncomment the following if the linker complains
-#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS)
-
 include $(SRC)/lib/Makefile.spec
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libmd5/spec/i386/Makefile b/usr/src/lib/libmd/spec/i386/Makefile
index 69ffa17e22..4dd0d6208e 100644
--- a/usr/src/lib/libmd5/spec/i386/Makefile
+++ b/usr/src/lib/libmd/spec/i386/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.
@@ -22,24 +21,14 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # lib/libmd5/spec/i386/Makefile
 #
 
 include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
 include $(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#i386_C_PICFLAGS  = -K PIC
-
 include $(SRC)/lib/Makefile.spec
 
-.KEEP_STATE:
-
 install: $(ROOTABILIB)
diff --git a/usr/src/lib/libmd/spec/md.spec b/usr/src/lib/libmd/spec/md.spec
new file mode 100644
index 0000000000..7fc227873e
--- /dev/null
+++ b/usr/src/lib/libmd/spec/md.spec
@@ -0,0 +1,192 @@
+# 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"
+
+function	MD5Init
+include		<md5.h>
+declaration	void MD5Init(MD5_CTX *context)
+version		SUNW_1.1
+end
+
+function	MD5Update
+include		<md5.h>
+declaration	void MD5Update(MD5_CTX *context, \
+				const void *input, \
+				unsigned int inputLen)
+version		SUNW_1.1
+end
+
+function	MD5Final
+include		<md5.h>
+declaration	void MD5Final(void *digest, MD5_CTX *context)
+version		SUNW_1.1
+end
+
+function	md5_calc
+declaration	void md5_calc(void *output, \
+				const void *input, \
+				unsigned int inlen)
+version		SUNW_1.1
+end
+
+function	SHA1Init
+include		<sha1.h>
+declaration	void SHA1Init(SHA1_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA1Update
+include		<sha1.h>
+declaration	void SHA1Update(SHA1_CTX *context, \
+				const void *input, \
+				unsigned int inputLen)
+version		SUNW_1.1
+end
+
+function	SHA1Final
+include		<sha1.h>
+declaration	void SHA1Final(void *, SHA1_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA1Init
+include		<sha1.h>
+declaration	void SHA1Init(SHA1_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA1Update
+include		<sha1.h>
+declaration	void SHA1Update(SHA1_CTX *context, \
+				const void *input, \
+				unsigned int inputLen)
+version		SUNW_1.1
+end
+
+function	SHA1Final
+include		<sha1.h>
+declaration	void SHA1Final(void *digest, SHA1_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA2Init
+include		<sha2.h>
+declaration	void SHA2Init(uint64_t mech, SHA2_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA2Update
+include		<sha2.h>
+declaration	void SHA2Update(SHA2_CTX *context, \
+				const void *input, \
+				size_t inputLen)
+version		SUNW_1.1
+end
+
+function	SHA2Final
+include		<sha2.h>
+declaration	void SHA2Final(void *digest, SHA2_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA256Init
+include		<sha2.h>
+declaration	void SHA2Init(uint64_t mech, SHA2_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA256Update
+include		<sha2.h>
+declaration	void SHA2Update(SHA2_CTX *context, \
+				const void *input, \
+				size_t inputLen)
+version		SUNW_1.1
+end
+
+function	SHA256Final
+include		<sha2.h>
+declaration	void SHA256Final(void *digest, SHA256_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA384Init
+include		<sha2.h>
+declaration	void SHA384Init(uint64_t mech, SHA384_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA384Update
+include		<sha2.h>
+declaration	void SHA384Update(SHA384_CTX *context, \
+				const void *input, \
+				size_t inputLen)
+version		SUNW_1.1
+end
+
+function	SHA384Final
+include		<sha2.h>
+declaration	void SHA384Final(void *digest, SHA384_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA512Init
+include		<sha2.h>
+declaration	void SHA512Init(uint64_t mech, SHA512_CTX *context)
+version		SUNW_1.1
+end
+
+function	SHA512Update
+include		<sha2.h>
+declaration	void SHA512Update(SHA512_CTX *context, \
+				const void *input, \
+				size_t inputLen)
+version		SUNW_1.1
+end
+
+function	SHA512Final
+include		<sha2.h>
+declaration	void SHA512Final(void *digest, SHA512_CTX *context)
+version		SUNW_1.1
+end
+
+function	MD4Init
+include		<md4.h>
+declaration	void MD4Init(MD4_CTX *context)
+version		SUNW_1.1
+end
+
+function	MD4Update
+include		<md4.h>
+declaration	void MD4Update(MD4_CTX *context, \
+				const void *input, \
+				unsigned int inputLen)
+version		SUNW_1.1
+end
+
+function	MD4Final
+include		<md4.h>
+declaration	void MD4Final(void *digest, MD4_CTX *context)
+version		SUNW_1.1
+end
diff --git a/usr/src/lib/libmd/spec/sparc/Makefile b/usr/src/lib/libmd/spec/sparc/Makefile
new file mode 100644
index 0000000000..b03a759294
--- /dev/null
+++ b/usr/src/lib/libmd/spec/sparc/Makefile
@@ -0,0 +1,32 @@
+#
+# 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.targ
+include $(SRC)/lib/Makefile.lib
+include $(SRC)/lib/Makefile.spec
+
+install: $(ROOTABILIB)
diff --git a/usr/src/lib/libmd5/spec/sparcv9/Makefile b/usr/src/lib/libmd/spec/sparcv9/Makefile
index 1227c98be0..b8c5ba76bb 100644
--- a/usr/src/lib/libmd5/spec/sparcv9/Makefile
+++ b/usr/src/lib/libmd/spec/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.
@@ -22,25 +21,15 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libmd5/spec/sparcv9/Makefile
+# lib/libmd/spec/sparcv9/Makefile
 #
 
 include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/lib/Makefile.lib.64
-
-# Uncomment the following if the linker complains
-#sparcv9_C_PICFLAGS  = -K PIC
-
 include $(SRC)/lib/Makefile.spec
 
-.KEEP_STATE:
-
 install: $(ROOTABILIB64)
diff --git a/usr/src/lib/libmd5/spec/versions b/usr/src/lib/libmd/spec/versions
index f7955484e7..5bfbaae1ed 100644
--- a/usr/src/lib/libmd5/spec/versions
+++ b/usr/src/lib/libmd/spec/versions
@@ -1,13 +1,8 @@
-#
-# 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.
+# 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.
@@ -22,8 +17,11 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 
 sparc {
 	SUNW_1.1;
diff --git a/usr/src/lib/libmd5_psr/sparc/Makefile b/usr/src/lib/libmd/sun4u/Makefile
index 7d463c28db..b65f30de75 100644
--- a/usr/src/lib/libmd5_psr/sparc/Makefile
+++ b/usr/src/lib/libmd/sun4u/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.
@@ -19,27 +18,29 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5_psr/sparc/Makefile
-#
 
-SUBDIRS= sun4u
+include $(SRC)/Makefile.master
+
+SUBDIRS= $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
-install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
+lint :=		TARGET= lint
+install :=	TARGET= install
 
 .KEEP_STATE:
 
-all install clean clobber : $(SUBDIRS)
+.PARALLEL: $(MACH) $(MACH64)
+
+all clean clobber lint install: $(SUBDIRS)
 
-$(SUBDIRS): FRC
+$(MACH) $(MACH64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libmd/sun4u/Makefile.com b/usr/src/lib/libmd/sun4u/Makefile.com
new file mode 100644
index 0000000000..c483e9b540
--- /dev/null
+++ b/usr/src/lib/libmd/sun4u/Makefile.com
@@ -0,0 +1,42 @@
+#
+# 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"
+
+LIBRARY= libmd_psr.a
+
+include $(SRC)/Makefile.psm
+include ../Makefile.links
+include ../../Makefile.com
+
+LIBS= $(DYNLIB)
+
+CFLAGS += -xarch=v8plusa
+CPPFLAGS += -D$(PLATFORM) -DVIS_SHA1
+ASFLAGS	= -P $(ASDEFS)
+
+INLINES= $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il
+
+# XXX This seems wrong since we explicitly set LIBS to be DYNLIB only
+$(LINTLIB):= SRCS= ../../common/llib-lmd
diff --git a/usr/src/lib/libmd5_psr/Makefile.com b/usr/src/lib/libmd/sun4u/Makefile.links
index d3a483fea3..d1ff848458 100644
--- a/usr/src/lib/libmd5_psr/Makefile.com
+++ b/usr/src/lib/libmd/sun4u/Makefile.links
@@ -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,46 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmd5_psr/Makefile.com
-#
-
-#
-# Create default so empty rules don't confuse make
-#
-CLASS= 32
-
-LIBRARY= libmd5_psr.a
-VERS= .1
-
-OBJECTS= md5.o
-COMMON= $(SRC)/common/crypto/md5
-
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/Makefile.psm
-
-#
-# Macros to help build the shared object
-#
-LIBS= $(DYNLIB)
-DYNFLAGS += $(BDIRECT)
-LDLIBS += -lc
-CPPFLAGS += -D__RESTRICT
-
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Macros for the mapfile. Other makefiles need to include this file
-# after setting MAPDIR
+# lib/libmd/Makefile.sun4u.links
 #
-MAPFILE=	$(MAPDIR)/mapfile-$(PLATFORM)
-DYNFLAGS +=	-M$(MAPFILE)
-CLOBBERFILES +=	$(MAPFILE)
-
 #
-# Used when building links in /platform/$(PLATFORM)/lib 
+# Used when building links in /platform/sun4u/lib 
 #
 LINKED_PLATFORMS	= SUNW,Ultra-2
 LINKED_PLATFORMS	+= SUNW,Ultra-4
@@ -79,12 +47,12 @@ LINKED_PLATFORMS	+= SUNW,Sun-Blade-1000
 LINKED_PLATFORMS	+= SUNW,Sun-Blade-1500
 LINKED_PLATFORMS	+= SUNW,Sun-Blade-2500
 LINKED_PLATFORMS	+= SUNW,A70
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V445
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V215
 LINKED_PLATFORMS	+= SUNW,Sun-Fire
+LINKED_PLATFORMS	+= SUNW,Sun-Fire-V215
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-V240
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-V250
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-V440
+LINKED_PLATFORMS	+= SUNW,Sun-Fire-V445
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-280R
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-15000
 LINKED_PLATFORMS	+= SUNW,Sun-Fire-880
@@ -96,5 +64,3 @@ LINKED_PLATFORMS	+= SUNW,Netra-T12
 LINKED_PLATFORMS	+= SUNW,Netra-T4
 LINKED_PLATFORMS	+= SUNW,Netra-CP2300
 LINKED_PLATFORMS	+= SUNW,Netra-CP3010
-
-.KEEP_STATE:
diff --git a/usr/src/lib/libmd/sun4u/sparc/Makefile b/usr/src/lib/libmd/sun4u/sparc/Makefile
new file mode 100644
index 0000000000..cac5b1d58d
--- /dev/null
+++ b/usr/src/lib/libmd/sun4u/sparc/Makefile
@@ -0,0 +1,58 @@
+#
+# 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"
+
+CLASS		= 32
+PLATFORM	= sun4u
+MODULE		= libmd_psr.so.1
+
+include	../Makefile.com
+
+# Override OBJECTS here because each $MACH/$PLATFORM can have a different
+# set of algortithm optimisations and thus different source and object files.
+OBJECTS		= md5.o sha1.o sha1_asm.o
+
+SPECMAPFILE=
+MAPFILE=	mapfile
+DYNFLAGS +=	-M$(MAPFILE)
+
+ASFLAGS	+=	-xarch=v8plusa -warn
+
+# Redefine shared object build rule to use $(LD) directly (this avoids .init
+# and .fini sections being added).
+ 
+BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
+
+$(DYNLIB):	$(MAPFILE)
+
+.KEEP_STATE:
+
+all:		$(LIBS)
+
+$(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755
+
+install:	all $(LIBMD_PSR_LINKS) $(ROOT_PSM_LIBS)
+
+include $(SRC)/Makefile.psm.targ
diff --git a/usr/src/lib/libmd5/spec/Makefile.targ b/usr/src/lib/libmd/sun4u/sparc/mapfile
index 50c69d947c..509adf5315 100644
--- a/usr/src/lib/libmd5/spec/Makefile.targ
+++ b/usr/src/lib/libmd/sun4u/sparc/mapfile
@@ -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,17 +19,19 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5/spec/Makefile.targ
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
 
-LIBRARY= libmd5.a
-VERS= .1
-
-OBJECTS= md5.o
-
-SPECCPP += -I../../
+SUNW_1.1 {
+	global:
+		MD5Init;
+		MD5Update;
+		MD5Final;
+		SHA1Init;
+		SHA1Update;
+		SHA1Final;
+	local:
+		*;
+};
diff --git a/usr/src/lib/libmd/sun4u/sparcv9/Makefile b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
new file mode 100644
index 0000000000..aca34d4c3c
--- /dev/null
+++ b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
@@ -0,0 +1,60 @@
+#
+# 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"
+
+CLASS		= 64
+PLATFORM	= sun4u
+MODULE		= libmd_psr.so.1
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+# Override OBJECTS here because each $MACH/$PLATFORM can have a different
+# set of algortithm optimisations and thus different source and object files.
+OBJECTS		= md5.o sha1.o sha1_asm.o
+
+SPECMAPFILE=
+MAPFILE=	mapfile
+DYNFLAGS +=	-M$(MAPFILE)
+
+ASDEFS +=	-D__sparcv9
+ASFLAGS	+=	-xarch=v9a $(AS_BIGPICFLAGS)
+
+# Redefine shared object build rule to use $(LD) directly (this avoids .init
+# and .fini sections being added).
+ 
+BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
+
+$(DYNLIB):	$(MAPFILE)
+
+.KEEP_STATE:
+
+all:		$(LIBS)
+
+$(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755
+
+install:	all $(LIBMD_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS)
+
+include $(SRC)/Makefile.psm.targ
diff --git a/usr/src/lib/libmd5_psr/spec/Makefile b/usr/src/lib/libmd/sun4u/sparcv9/mapfile
index cec6b0047f..7687cc349f 100644
--- a/usr/src/lib/libmd5_psr/spec/Makefile
+++ b/usr/src/lib/libmd/sun4u/sparcv9/mapfile
@@ -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,11 +19,19 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libmd5_psr/spec/Makefile
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-include	$(SRC)/lib/Makefile.spec.arch
+SUNW_1.1 {
+	global:
+		MD5Init;
+		MD5Update;
+		MD5Final;
+		SHA1Init;
+		SHA1Update;
+		SHA1Final;
+	local:
+		*;
+};
diff --git a/usr/src/lib/libmd5_psr/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/Makefile
index a6a6614cb2..b65f30de75 100644
--- a/usr/src/lib/libmd5_psr/sparcv9/Makefile
+++ b/usr/src/lib/libmd/sun4v/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.
@@ -19,26 +18,29 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5_psr/sparcv9/Makefile
-#
-SUBDIRS= sun4u
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+include $(SRC)/Makefile.master
+
+SUBDIRS= $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
-install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
+lint :=		TARGET= lint
+install :=	TARGET= install
 
 .KEEP_STATE:
 
-all install clean clobber : $(SUBDIRS)
+.PARALLEL: $(MACH) $(MACH64)
+
+all clean clobber lint install: $(SUBDIRS)
 
-$(SUBDIRS): FRC
+$(MACH) $(MACH64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libmd/sun4v/Makefile.com b/usr/src/lib/libmd/sun4v/Makefile.com
new file mode 100644
index 0000000000..bef660abbc
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/Makefile.com
@@ -0,0 +1,42 @@
+#
+# 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"
+
+LIBRARY= libmd_psr.a
+
+include $(SRC)/Makefile.psm
+include ../Makefile.links
+include ../../Makefile.com
+
+LIBS= $(DYNLIB)
+
+CFLAGS += -xarch=v8plusa
+CPPFLAGS += -D$(PLATFORM)
+ASFLAGS	= -P $(ASDEFS)
+
+INLINES= $(COMDIR)/md5/$(MACH)/$(PLATFORM)/byteswap.il
+
+# XXX This seems wrong since we explicitly set LIBS to be DYNLIB only
+$(LINTLIB):= SRCS= ../../common/llib-lmd
diff --git a/usr/src/lib/libmd/sun4v/Makefile.links b/usr/src/lib/libmd/sun4v/Makefile.links
new file mode 100644
index 0000000000..e03b1e1b15
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/Makefile.links
@@ -0,0 +1,32 @@
+#
+# 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
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# lib/libmd/Makefile.sun4v.links
+#
+#
+# Used when building links in /platform/sun4v/lib 
+#
+LINKED_PLATFORMS	= SUNW,Sun-Fire-T200
diff --git a/usr/src/lib/libmd/sun4v/sparc/Makefile b/usr/src/lib/libmd/sun4v/sparc/Makefile
new file mode 100644
index 0000000000..2633839ee3
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/sparc/Makefile
@@ -0,0 +1,58 @@
+#
+# 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"
+
+CLASS		= 32
+PLATFORM	= sun4v
+MODULE		= libmd_psr.so.1
+
+include ../Makefile.com
+
+# Override OBJECTS here because each $MACH/$PLATFORM can have a different
+# set of algortithm optimisations and thus different source and object files.
+OBJECTS		= md5.o
+
+SPECMAPFILE=
+MAPFILE=	mapfile
+DYNFLAGS +=	-M$(MAPFILE)
+
+ASFLAGS	+=	-xarch=v8plusa -warn
+
+# Redefine shared object build rule to use $(LD) directly (this avoids .init
+# and .fini sections being added).
+ 
+BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
+
+$(DYNLIB):	$(MAPFILE)
+
+.KEEP_STATE:
+
+all:		$(LIBS)
+
+$(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755
+
+install:	all $(LIBMD_PSR_LINKS) $(ROOT_PSM_LIBS)
+
+include $(SRC)/Makefile.psm.targ
diff --git a/usr/src/lib/libmd/sun4v/sparc/mapfile b/usr/src/lib/libmd/sun4v/sparc/mapfile
new file mode 100644
index 0000000000..e6d7fddc28
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/sparc/mapfile
@@ -0,0 +1,33 @@
+#
+# 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"
+
+SUNW_1.1 {
+	global:
+		MD5Init;
+		MD5Update;
+		MD5Final;
+	local:
+		*;
+};
diff --git a/usr/src/lib/libmd/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
new file mode 100644
index 0000000000..ac4ff682d3
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
@@ -0,0 +1,60 @@
+#
+# 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"
+
+CLASS		= 64
+PLATFORM	= sun4v
+MODULE		= libmd_psr.so.1
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+# Override OBJECTS here because each $MACH/$PLATFORM can have a different
+# set of algortithm optimisations and thus different source and object files.
+OBJECTS		= md5.o
+
+SPECMAPFILE=
+MAPFILE=	mapfile
+DYNFLAGS +=	-M$(MAPFILE)
+
+ASDEFS +=	-D__sparcv9
+ASFLAGS	+=	-xarch=v9a $(AS_PICFLAGS)
+
+# Redefine shared object build rule to use $(LD) directly (this avoids .init
+# and .fini sections being added).
+ 
+BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
+
+$(DYNLIB):	$(MAPFILE)
+
+.KEEP_STATE:
+
+all:		$(LIBS)
+
+$(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755
+
+install:	all $(LIBMD_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS)
+
+include $(SRC)/Makefile.psm.targ
diff --git a/usr/src/lib/libmd/sun4v/sparcv9/mapfile b/usr/src/lib/libmd/sun4v/sparcv9/mapfile
new file mode 100644
index 0000000000..e6d7fddc28
--- /dev/null
+++ b/usr/src/lib/libmd/sun4v/sparcv9/mapfile
@@ -0,0 +1,33 @@
+#
+# 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"
+
+SUNW_1.1 {
+	global:
+		MD5Init;
+		MD5Update;
+		MD5Final;
+	local:
+		*;
+};
diff --git a/usr/src/lib/libmd5/Makefile b/usr/src/lib/libmd5/Makefile
index 11f3939e73..973a0bc83b 100644
--- a/usr/src/lib/libmd5/Makefile
+++ b/usr/src/lib/libmd5/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.
@@ -19,34 +18,31 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # lib/libmd5/Makefile
-#
 
 include $(SRC)/Makefile.master
 
-SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS= $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 install :=	TARGET= install
 
 .KEEP_STATE:
 
 .PARALLEL: $(MACH) $(MACH64)
 
-all clean clobber lint install: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
-spec $(MACH) $(MACH64): FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-_msg install_h check:
-
 FRC:
diff --git a/usr/src/lib/libmd5/Makefile.com b/usr/src/lib/libmd5/Makefile.com
index dc87dce0b6..1ef3db8a31 100644
--- a/usr/src/lib/libmd5/Makefile.com
+++ b/usr/src/lib/libmd5/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.
@@ -31,51 +30,31 @@
 LIBRARY= libmd5.a
 VERS= .1
 
-OBJECTS= md5.o
-COMMON= $(SRC)/common/crypto/md5
-
 include ../../Makefile.lib
-
-# install this library in the root filesystem
 include ../../Makefile.rootfs
 
-LIBS= $(DYNLIB) $(LINTLIB)
+MAPFILES=       $(SRCDIR)/mapfile-vers $(MAPFILE-FLTR)
+MAPOPTS=        $(MAPFILES:%=-M %)
 
-# Macros to help build the shared object
-MAPFILE= $(MAPDIR)/mapfile
-DYNFLAGS += -M$(MAPFILE)
-CPPFLAGS += -D__RESTRICT
-CFLAGS += $(CCVERBOSE)
+DYNFLAGS +=     -F libmd.so.1 $(MAPOPTS)
 
-DYNFLAGS +=	$(BDIRECT)
-LDLIBS +=	-lc
+LIBS =          $(DYNLIB) $(LINTLIB)
 
-# Macros to help build the lint library
-LINTSRC= $(LINTLIB:%.ln=%)
-$(LINTLIB) := SRCS= ../$(LINTSRC)
-SRCS= $(OBJECTS:%.o=$(COMMON)/%.c)
-ROOTLINT= $(LINTSRC:%=$(ROOTLIBDIR)/%)
-$(ROOTLIBDIR)/%: ../%
-	$(INS.file)
+SRCDIR =        ../common
+$(LINTLIB) :=   SRCS = $(SRCDIR)/llib-lmd5
 
-# The md5 code is very careful about data alignment
-# but lint doesn't know that, so just shut lint up.
-lint := LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-lint := LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
 
-.KEEP_STATE:
+# Redefine shared object build rule to use $(LD) directly (this avoids .init
+# and .fini sections being added).  Also, since there are no OBJECTS, turn
+# off CTF.
 
-$(DYNLIB): $(MAPFILE)
+BUILD.SO=       $(LD) -o $@ -G $(DYNFLAGS)
+CTFMERGE_LIB=   :
 
-$(MAPFILE):
-	@cd $(MAPDIR); pwd; $(MAKE) mapfile
-
-all: $(LIBS) fnamecheck
+.KEEP_STATE:
 
-lint: lintcheck
+all: $(LIBS)
 
-include $(SRC)/lib/Makefile.targ
+include ../../Makefile.targ
 
-pics/%.o: $(COMMON)/%.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
+$(DYNLIB):      $(MAPFILES)
diff --git a/usr/src/lib/libmd5/amd64/Makefile b/usr/src/lib/libmd5/amd64/Makefile
index b294fed674..bb52c69dfe 100644
--- a/usr/src/lib/libmd5/amd64/Makefile
+++ b/usr/src/lib/libmd5/amd64/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.
@@ -25,9 +24,12 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+# lib/libmd5/amd64/Makefile
+#
 
-MAPDIR= ../spec/amd64
 include ../Makefile.com
-include $(SRC)/lib/Makefile.lib.64
+include ../../Makefile.lib.64
+
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libmd5/llib-lmd5 b/usr/src/lib/libmd5/common/llib-lmd5
index ebbf9a44a4..0235ae5c81 100644
--- a/usr/src/lib/libmd5/llib-lmd5
+++ b/usr/src/lib/libmd5/common/llib-lmd5
@@ -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.
@@ -23,16 +22,10 @@
 /* PROTOLIB1 */
 
 /*
- * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include <sys/types.h>
 #include <md5.h>
-
-void MD5Init(MD5_CTX *);
-void MD5Update(MD5_CTX *, const void *, unsigned int);
-void MD5Final(unsigned char [16], MD5_CTX *);
-void md5_calc(unsigned char *, unsigned char *, unsigned int);
diff --git a/usr/src/lib/libmd5/common/mapfile-vers b/usr/src/lib/libmd5/common/mapfile-vers
new file mode 100644
index 0000000000..00a62556a4
--- /dev/null
+++ b/usr/src/lib/libmd5/common/mapfile-vers
@@ -0,0 +1,42 @@
+#
+# 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"
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# The real interface is now libmd, libmd5 is just a filter library
+# for legacy reasons.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+
+SUNW_1.1 {
+	global:
+		MD5Init = FUNCTION;
+		MD5Update = FUNCTION;
+		MD5Final = FUNCTION;
+		md5_calc = FUNCTION;
+};
diff --git a/usr/src/lib/libmd5/sparc/Makefile b/usr/src/lib/libmd5/sparc/Makefile
index 689c36c4f8..16ccc40281 100644
--- a/usr/src/lib/libmd5/sparc/Makefile
+++ b/usr/src/lib/libmd5/sparc/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.
@@ -28,9 +27,6 @@
 # lib/libmd5/sparc/Makefile
 #
 
-MAPDIR= ../spec/sparc
 include ../Makefile.com
 
-DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
-
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libmd5/sparcv9/Makefile b/usr/src/lib/libmd5/sparcv9/Makefile
index 86e137098a..5e5b3dc6ab 100644
--- a/usr/src/lib/libmd5/sparcv9/Makefile
+++ b/usr/src/lib/libmd5/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.
@@ -28,10 +27,9 @@
 # lib/libmd5/sparcv9/Makefile
 #
 
-MAPDIR= ../spec/sparcv9
 include ../Makefile.com
-include $(SRC)/lib/Makefile.lib.64
+include ../../Makefile.lib.64
 
-DYNFLAGS += -Wl,-f/platform/\$$PLATFORM/lib/sparcv9/$(DYNLIBPSR)
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libmd5/spec/md5.spec b/usr/src/lib/libmd5/spec/md5.spec
deleted file mode 100644
index ee07dcc33a..0000000000
--- a/usr/src/lib/libmd5/spec/md5.spec
+++ /dev/null
@@ -1,55 +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
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libmd5/spec/md5.spec
-#
-
-function	MD5Init
-include		<md5.h>
-declaration	void MD5Init(MD5_CTX *context)
-version		SUNW_1.1
-end
-
-function	MD5Update
-include		<md5.h>
-declaration	void MD5Update(MD5_CTX *context, \
-				const void *input, \
-				unsigned int inputLen)
-version		SUNW_1.1
-end
-
-function	MD5Final
-include		<md5.h>
-declaration	void MD5Final(unsigned char digest[16], MD5_CTX *context)
-version		SUNW_1.1
-end
-
-function	md5_calc
-declaration	void md5_calc(unsigned char *output, \
-				unsigned char *input, \
-				unsigned int inlen)
-version		SUNW_1.1
-end
diff --git a/usr/src/lib/libmd5/spec/sparc/Makefile b/usr/src/lib/libmd5/spec/sparc/Makefile
deleted file mode 100644
index a88d8c12fe..0000000000
--- a/usr/src/lib/libmd5/spec/sparc/Makefile
+++ /dev/null
@@ -1,45 +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
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5/spec/sparc/Makefile
-#
-
-include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
-include $(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#sparc_C_PICFLAGS  = -K PIC
-
-include $(SRC)/lib/Makefile.spec
-
-.KEEP_STATE:
-
-install: $(ROOTABILIB)
diff --git a/usr/src/lib/libmd5_psr/Makefile.targ b/usr/src/lib/libmd5_psr/Makefile.targ
deleted file mode 100644
index f5a9f0b101..0000000000
--- a/usr/src/lib/libmd5_psr/Makefile.targ
+++ /dev/null
@@ -1,48 +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
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5_psr/Makefile.targ
-#
-
-#
-# This makefile defines common targets. Other makefiles should
-# include this after defining default targets.
-#
-
-include $(SRC)/lib/Makefile.targ
-include $(SRC)/Makefile.psm.targ
-
-INLINES= $(COMMON)/$(MACH)/$(PLATFORM)/byteswap.il
-
-$(MAPFILE):
-	@cd $(MAPDIR); pwd; $(MAKE) $(TARGET)
-
-pics/%.o: $(COMMON)/%.c $(INLINES)
-	$(COMPILE.c) $(INLINES) -o $@ $<
-	$(POST_PROCESS_O)
-
-$(DYNLIB):	$(MAPFILE)
diff --git a/usr/src/lib/libmd5_psr/sparc/sun4u/Makefile b/usr/src/lib/libmd5_psr/sparc/sun4u/Makefile
deleted file mode 100644
index 49548d743c..0000000000
--- a/usr/src/lib/libmd5_psr/sparc/sun4u/Makefile
+++ /dev/null
@@ -1,65 +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 1999-2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Platform specific Makefile for libmd5_psr.
-#
-# PLATFORM is the target for the binary installation.
-#
-PLATFORM = sun4u
-
-MAPDIR = ../../spec/$(MACH)/$(PLATFORM)
-
-include ../../Makefile.com
-
-#
-# Defining sun4u turns on sun4u-specific optimization
-#
-CPPFLAGS += -Dsun4u
-CFLAGS += -xarch=v8plusa
-
-.KEEP_STATE:
-
-#
-# Used when building links in /platform/$(PLATFORM)/lib for libmd5_psr.so.1
-#
-MODULE	= libmd5_psr.so.1
-
-LIBMD5_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
-LIBMD5_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
-
-$(LIBMD5_PSR_DIRS):
-	-$(INS.dir.root.bin)
-
-$(LIBMD5_PSR_LINKS): $(LIBMD5_PSR_DIRS)
-	-$(INS.slink6)
-
-all:		$(LIBS)
-
-install:	all $(LIBMD5_PSR_LINKS) $(ROOT_PSM_LIBS)
-
-include	../../Makefile.targ
diff --git a/usr/src/lib/libmd5_psr/sparcv9/sun4u/Makefile b/usr/src/lib/libmd5_psr/sparcv9/sun4u/Makefile
deleted file mode 100644
index c0745d5e11..0000000000
--- a/usr/src/lib/libmd5_psr/sparcv9/sun4u/Makefile
+++ /dev/null
@@ -1,62 +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 1999-2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Platform specific Makefile for libmd5_psr.
-#
-# PLATFORM is the target for the binary installation.
-#
-PLATFORM = sun4u
-
-MAPDIR = ../../spec/$(MACH64)/$(PLATFORM)
-
-include ../../Makefile.com
-include $(SRC)/Makefile.master.64
-
-#
-# Defining sun4u turns on sun4u-specific optimization
-#
-CPPFLAGS += -Dsun4u
-
-.KEEP_STATE:
-
-MODULE  = libmd5_psr.so.1
-
-LIBMD5_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
-LIBMD5_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
-INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
-
-$(LIBMD5_PSR64_DIRS):
-	-$(INS.dir.root.bin)
-
-$(LIBMD5_PSR64_LINKS): $(LIBMD5_PSR64_DIRS)
-	-$(INS.slink7)
-
-all:		$(LIBS)
-
-install:	all $(LIBMD5_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS) 
-
-include ../../Makefile.targ
diff --git a/usr/src/lib/libmd5_psr/spec/Makefile.com b/usr/src/lib/libmd5_psr/spec/Makefile.com
deleted file mode 100644
index 1c1d9a915b..0000000000
--- a/usr/src/lib/libmd5_psr/spec/Makefile.com
+++ /dev/null
@@ -1,78 +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
-#
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# lib/libmd5_psr/spec/Makefile.com
-
-include $(SRC)/Makefile.psm
-
-MODULE=		abi
-
-#
-# links in /usr/platform
-#
-LINKED_PLATFORMS	= SUNW,Ultra-2
-LINKED_PLATFORMS	+= SUNW,Ultra-4
-LINKED_PLATFORMS	+= SUNW,Ultra-250
-LINKED_PLATFORMS	+= SUNW,Ultra-Enterprise
-LINKED_PLATFORMS	+= SUNW,Ultra-Enterprise-10000
-LINKED_PLATFORMS	+= SUNW,UltraSPARC-IIi-Netract
-LINKED_PLATFORMS	+= SUNW,UltraSPARC-IIe-NetraCT-40
-LINKED_PLATFORMS	+= SUNW,UltraSPARC-IIe-NetraCT-60
-LINKED_PLATFORMS	+= SUNW,Sun-Blade-100
-LINKED_PLATFORMS	+= SUNW,Sun-Blade-1000
-LINKED_PLATFORMS	+= SUNW,Sun-Blade-1500
-LINKED_PLATFORMS	+= SUNW,Sun-Blade-2500
-LINKED_PLATFORMS	+= SUNW,A70
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V445
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V215
-LINKED_PLATFORMS	+= SUNW,Sun-Fire
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V240
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V250
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V440
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-280R
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-15000
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-880
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-480R
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V890
-LINKED_PLATFORMS	+= SUNW,Sun-Fire-V490
-LINKED_PLATFORMS	+= SUNW,Serverblade1
-LINKED_PLATFORMS	+= SUNW,Netra-T12
-LINKED_PLATFORMS	+= SUNW,Netra-T4
-LINKED_PLATFORMS	+= SUNW,Netra-CP2300
-LINKED_PLATFORMS	+= SUNW,Netra-CP3010
-
-LINKED_DIRS	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%)
-LINKED_LIB_DIRS	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib)
-LINKED_ABI_DIRS	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/abi)
-LINKED_ABI_DIRS64 = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/abi/$(MACH64))
-ABI_LINKS32	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/abi/abi_$(DYNLIB))
-ABI_LINKS64	= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/abi/$(MACH64)/abi_$(DYNLIB))
-ABI_LINKS	= $(ABI_LINKS$(CLASS))
-
-links:
-
-FRC:
diff --git a/usr/src/lib/libmd5_psr/spec/sparc/Makefile b/usr/src/lib/libmd5_psr/spec/sparc/Makefile
deleted file mode 100644
index 71c74ea5a9..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparc/Makefile
+++ /dev/null
@@ -1,48 +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
-#
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5_psr/spec/sparc/Makefile
-
-SUBDIRS=	sun4u
-
-all		:=	TARGET= all
-install		:=	TARGET= install
-clean		:=	TARGET= clean
-clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
-
-.KEEP_STATE:
-
-all install clean clobber lint: $(SUBDIRS)
-
-# spec files do not have msgs or catalogs
-_msg catalog:
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
diff --git a/usr/src/lib/libmd5_psr/spec/sparc/md5_psr-sun4u.spec b/usr/src/lib/libmd5_psr/spec/sparc/md5_psr-sun4u.spec
deleted file mode 100644
index aa169d0404..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparc/md5_psr-sun4u.spec
+++ /dev/null
@@ -1,48 +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
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libmd5_psr/spec/sparc/md5_psr-sun4u.spec
-#
-
-function	MD5Init extends libmd5/spec/md5.spec
-arch		sparc
-version		SUNWprivate_1.1
-end
-
-function	MD5Update extends libmd5/spec/md5.spec
-arch		sparc
-version		SUNWprivate_1.1
-end
-
-function	MD5Final extends libmd5/spec/md5.spec
-arch		sparc
-version		SUNWprivate_1.1
-end
-
-function	md5_calc extends libmd5/spec/md5.spec
-arch		sparc
-version		SUNWprivate_1.1
-end
diff --git a/usr/src/lib/libmd5_psr/spec/sparc/sun4u/Makefile b/usr/src/lib/libmd5_psr/spec/sparc/sun4u/Makefile
deleted file mode 100644
index d2f2c3bf15..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparc/sun4u/Makefile
+++ /dev/null
@@ -1,51 +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
-#
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# lib/libmd5_psr/sparc/spec/sun4u/Makefile
-
-.KEEP_STATE:
-
-LIBRARY	=	libmd5_psr.a
-VERS	=	.1
-
-PLATFORM=	sun4u
-CLASS=		32
-
-OBJECTS	=	md5_psr-$(PLATFORM).o
-
-SPECVERS =	-$(PLATFORM)
-
-include	$(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#sparc_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-include $(SRC)/lib/Makefile.spec.psm
-include $(SRC)/lib/libmd5_psr/spec/Makefile.com
-
-install:
diff --git a/usr/src/lib/libmd5_psr/spec/sparcv9/Makefile b/usr/src/lib/libmd5_psr/spec/sparcv9/Makefile
deleted file mode 100644
index ca621bd3dd..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparcv9/Makefile
+++ /dev/null
@@ -1,48 +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
-#
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmd5_psr/spec/sparcv9/Makefile
-
-SUBDIRS=	sun4u
-
-all		:=	TARGET= all
-install		:=	TARGET= install
-clean		:=	TARGET= clean
-clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
-
-.KEEP_STATE:
-
-all install clean clobber lint: $(SUBDIRS)
-
-# spec files do not have msgs or catalogs
-_msg catalog:
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
diff --git a/usr/src/lib/libmd5_psr/spec/sparcv9/md5_psr-sun4u.spec b/usr/src/lib/libmd5_psr/spec/sparcv9/md5_psr-sun4u.spec
deleted file mode 100644
index 1f0c22c8bf..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparcv9/md5_psr-sun4u.spec
+++ /dev/null
@@ -1,48 +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
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libmd5_psr/spec/sparcv9/md5_psr-sun4u.spec
-#
-
-function	MD5Init extends libmd5/spec/md5.spec
-arch		sparcv9
-version		SUNWprivate_1.1
-end
-
-function	MD5Update extends libmd5/spec/md5.spec
-arch		sparcv9
-version		SUNWprivate_1.1
-end
-
-function	MD5Final extends libmd5/spec/md5.spec
-arch		sparcv9
-version		SUNWprivate_1.1
-end
-
-function	md5_calc extends libmd5/spec/md5.spec
-arch		sparcv9
-version		SUNWprivate_1.1
-end
diff --git a/usr/src/lib/libmd5_psr/spec/sparcv9/sun4u/Makefile b/usr/src/lib/libmd5_psr/spec/sparcv9/sun4u/Makefile
deleted file mode 100644
index e2010777b2..0000000000
--- a/usr/src/lib/libmd5_psr/spec/sparcv9/sun4u/Makefile
+++ /dev/null
@@ -1,52 +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
-#
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# lib/libmd5_psr/sparcv9/spec/sun4u/Makefile
-
-.KEEP_STATE:
-
-LIBRARY	=	libmd5_psr.a
-VERS	=	.1
-
-PLATFORM=	sun4u
-CLASS=		64
-
-OBJECTS	=	md5_psr-$(PLATFORM).o
-
-SPECVERS=	-$(PLATFORM)
-
-include	$(SRC)/lib/Makefile.lib
-include	$(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/libmd5_psr/spec/Makefile.com
-
-# Uncomment the following if the linker complains
-#sparcv9_C_PICFLAGS  = -K PIC
-
-include	$(SRC)/lib/Makefile.spec
-include $(SRC)/lib/Makefile.spec.psm
-
-install:
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index 0159a59cba..9b845c9daf 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -207,8 +207,8 @@ CPPFLAGS +=	-I$(SRC)/lib/libnsl/dial
 
 CFLAGS +=	-v
 
-LAZYLIBS = $(ZLAZYLOAD) -lmp -lmd5 -lscf $(ZNOLAZYLOAD)
-lint := LAZYLIBS = -lmd5
+LAZYLIBS = $(ZLAZYLOAD) -lmp -lmd -lscf $(ZNOLAZYLOAD)
+lint := LAZYLIBS = -lmd
 LDLIBS +=	$(LAZYLIBS) -lc
 DYNFLAGS +=	$(MAPOPTS)
 
diff --git a/usr/src/lib/libresolv2/dnssafe/Makefile.com b/usr/src/lib/libresolv2/dnssafe/Makefile.com
index ff6c66201a..c3c12e49bd 100644
--- a/usr/src/lib/libresolv2/dnssafe/Makefile.com
+++ b/usr/src/lib/libresolv2/dnssafe/Makefile.com
@@ -41,7 +41,7 @@ include ../../../Makefile.lib
 
 LIBNAME=	$(LIBRARY:%.a=%)
 LIBS=		$(DYNLIB)
-LDLIBS +=	-lmd5 -lresolv -lc
+LDLIBS +=	-lmd -lresolv -lc
 
 MAPDIR =	../spec/$(TRANSMACH)
 SPECMAPFILE =	$(MAPDIR)/mapfile
diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com
index 2612ecdbff..1e93ff0b47 100644
--- a/usr/src/lib/librt/Makefile.com
+++ b/usr/src/lib/librt/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.
@@ -47,7 +46,7 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-LDLIBS += 	-laio -lmd5 -lc
+LDLIBS += 	-laio -lmd -lc
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR=		../common
diff --git a/usr/src/lib/librt/common/pos4obj.c b/usr/src/lib/librt/common/pos4obj.c
index 2d6917ed33..f54a850907 100644
--- a/usr/src/lib/librt/common/pos4obj.c
+++ b/usr/src/lib/librt/common/pos4obj.c
@@ -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.
@@ -44,7 +43,6 @@
 #include "pos4.h"
 #include "pos4obj.h"
 
-#define	MD5LEN		16
 #define	HASHSTRLEN	32
 
 static	char	*__pos4obj_name(const char *, const char *);
@@ -99,7 +97,7 @@ __pos4obj_name(const char *path, const char *type)
 	size_t	len;
 	char	*dfile;
 	unsigned char	hashbuf[HASHSTRLEN + 1];
-	unsigned char	md5_digest[MD5LEN];
+	unsigned char	md5_digest[MD5_DIGEST_LENGTH];
 
 	/*
 	 * If the path is path_max - strlen(type) characters or less,
@@ -235,7 +233,7 @@ __pos4obj_md5toa(unsigned char *dest, unsigned char *src)
 	/* LINTED pointer cast may result in improper alignment */
 	p = (uint32_t *)src;
 
-	for (i = 0; i < (MD5LEN / 4); i++)
+	for (i = 0; i < (MD5_DIGEST_LENGTH / 4); i++)
 		(void) snprintf((char *)dest + (i * 8), 9, "%.8x", *p++);
 
 	dest[HASHSTRLEN] = '\0';
diff --git a/usr/src/lib/libsasl/Makefile.com b/usr/src/lib/libsasl/Makefile.com
index cea9bf8530..a28a4f4c84 100644
--- a/usr/src/lib/libsasl/Makefile.com
+++ b/usr/src/lib/libsasl/Makefile.com
@@ -1,5 +1,5 @@
 #
-# 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"
@@ -23,7 +23,7 @@ include ../../Makefile.lib
 LIBS=		$(DYNLIB) $(LINTLIB)
 SRCS=		$(SASLOBJS:%.o=../lib/%.c) $(COMMONOBJS:%.o=$(PLUGDIR)/%.c)
 $(LINTLIB):= 	SRCS = $(SRCDIR)/$(LINTSRC)
-LDLIBS +=	-lsocket -lc -lmd5
+LDLIBS +=	-lsocket -lc -lmd
 LINTFLAGS +=	-DPIC
 LINTFLAGS64 +=	-DPIC
 
diff --git a/usr/src/lib/libwanbootutil/Makefile.com b/usr/src/lib/libwanbootutil/Makefile.com
index 044aad0c4c..23463dad43 100644
--- a/usr/src/lib/libwanbootutil/Makefile.com
+++ b/usr/src/lib/libwanbootutil/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"
@@ -39,7 +38,6 @@ LOC_SRCS =	$(LOC_OBJS:%.o=$(LOC_DIR)/%.c)
 # The crypto modules are located under usr/src/common.
 CRYPTO_DIR =	$(SRC)/common/net/wanboot/crypt
 CRYPTO_OBJS =	hmac_sha1.o \
-		sha1.o \
 		aes.o \
 		des3.o \
 		des.o \
@@ -52,7 +50,7 @@ OBJECTS	=	$(LOC_OBJS) $(CRYPTO_OBJS)
 include $(SRC)/lib/Makefile.lib
 
 LIBS +=		$(LINTLIB)
-LDLIBS +=	-lc -lnsl
+LDLIBS +=	-lc -lnsl -lmd
 
 # Must override SRCS from Makefile.lib since sources have
 # multiple source directories.
diff --git a/usr/src/lib/libwanbootutil/spec/wanbootutil.spec b/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
index d80977b2a3..b2e756c857 100644
--- a/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
+++ b/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 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.
+# 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.
@@ -132,18 +131,6 @@ function	HMACFinal
 version		SUNWprivate_1.1
 end
 
-function	SHA1Init
-version		SUNWprivate_1.1
-end
-
-function	SHA1Update
-version		SUNWprivate_1.1
-end
-
-function	SHA1Final
-version		SUNWprivate_1.1
-end
-
 function	wbio_nwrite
 version		SUNWprivate_1.1
 end
diff --git a/usr/src/lib/pkcs11/Makefile.softtoken.com b/usr/src/lib/pkcs11/Makefile.softtoken.com
index 663d31d804..0a09b9523d 100644
--- a/usr/src/lib/pkcs11/Makefile.softtoken.com
+++ b/usr/src/lib/pkcs11/Makefile.softtoken.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 2005 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"
@@ -72,8 +71,6 @@ BLOWFISH_COBJECTS = blowfish_cbc_crypt.o blowfish_impl.o
 ARCFOUR_COBJECTS = arcfour_crypt.o
 DES_COBJECTS = des_cbc_crypt.o des_impl.o des_ks.o
 RSA_COBJECTS = rsa_impl.o
-SHA1_COBJECTS = sha1.o
-SHA2_COBJECTS = sha2.o
 BIGNUM_COBJECTS = bignumimpl.o
 
 AES_OBJECTS = $(AES_COBJECTS) $(AES_PSR_OBJECTS)
@@ -127,8 +124,6 @@ BLOWFISHDIR=	$(SRC)/common/crypto/blowfish
 ARCFOURDIR=	$(SRC)/common/crypto/arcfour
 DESDIR=		$(SRC)/common/crypto/des
 RSADIR=		$(SRC)/common/crypto/rsa
-SHA1DIR=	$(SRC)/common/crypto/sha1
-SHA2DIR=	$(SRC)/common/crypto/sha2
 BIGNUMDIR=	$(SRC)/common/bignum
 BERDIR=		../../../libldap5/sources/ldap/ber
 
@@ -152,7 +147,7 @@ SRCS =	\
 	$(BIGNUM_PSR_SRCS)
 
 LIBS    =       $(DYNLIB)
-LDLIBS  +=      -lc -lmd5
+LDLIBS  +=      -lc -lmd
 
 MAPDIR  = ../spec/$(TRANSMACH)
 SPECMAPFILE = $(MAPDIR)/mapfile
diff --git a/usr/src/lib/pkcs11/Makefile.softtoken.sparc b/usr/src/lib/pkcs11/Makefile.softtoken.sparc
index c0ba8abdc6..a8045257e2 100644
--- a/usr/src/lib/pkcs11/Makefile.softtoken.sparc
+++ b/usr/src/lib/pkcs11/Makefile.softtoken.sparc
@@ -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"
@@ -33,13 +32,11 @@ AES_PSR_OBJECTS = aes_crypt_sparc.o
 ARCFOUR_PSR_OBJECTS = arcfour_crypt_sparc.o
 DES_PSR_OBJECTS = des_crypt_sparc.o
 RSA_PSR_OBJECTS = 
-SHA1_PSR_OBJECTS = sha1_asm_sparc.o
 BIGNUM_PSR_OBJECTS = mont_mulf_sparc.o
 BIGNUM_CFG = -DUSE_FLOATING_POINT
 
 include ../Makefile.com
 CFLAGS	+=	-Dsun4u
-pics/sha1.o	:=	CFLAGS	+= -DVIS_SHA1
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
 
@@ -59,11 +56,6 @@ pics/des_crypt_sparc.o: $(DESDIR)/sun4u/des_crypt_asm.s
 		$(DESDIR)/sun4u/des_crypt_asm.s
 	$(POST_PROCESS_O)
 
-pics/sha1_asm_sparc.o: $(SHA1DIR)/sparc/sun4u/sha1_asm.s
-	$(COMPILE.s) -K PIC -P -DPIC -D_ASM -xarch=v8plusa -o $@ \
-		$(SHA1DIR)/sparc/sun4u/sha1_asm.s
-	$(POST_PROCESS_O)
-
 pics/mont_mulf_sparc.o: $(BIGNUMDIR)/sun4u/mont_mulf_v8plus.s
 	$(COMPILE.s) $(AS_BIGPICFLAGS) -xarch=v8plus -o $@ \
 		$(BIGNUMDIR)/sun4u/mont_mulf_v8plus.s
diff --git a/usr/src/lib/pkcs11/Makefile.softtoken.sparcv9 b/usr/src/lib/pkcs11/Makefile.softtoken.sparcv9
index 121e8919dc..d57a7c9163 100644
--- a/usr/src/lib/pkcs11/Makefile.softtoken.sparcv9
+++ b/usr/src/lib/pkcs11/Makefile.softtoken.sparcv9
@@ -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"
@@ -33,14 +32,12 @@ AES_PSR_OBJECTS = aes_crypt_sparcv9.o
 ARCFOUR_PSR_OBJECTS = arcfour_crypt_sparcv9.o
 DES_PSR_OBJECTS = des_crypt_sparcv9.o
 RSA_PSR_OBJECTS = 
-SHA1_PSR_OBJECTS = sha1_asm_sparcv9.o
 BIGNUM_PSR_OBJECTS = mont_mulf_sparcv9.o
 BIGNUM_CFG = -DUSE_FLOATING_POINT
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 CFLAGS64	+=	-Dsun4u
-pics/sha1.o	:=	CFLAGS64	+= -DVIS_SHA1
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
 
@@ -60,11 +57,6 @@ pics/des_crypt_sparcv9.o: $(DESDIR)/sun4u/des_crypt_asm.s
 		$(DESDIR)/sun4u/des_crypt_asm.s
 	$(POST_PROCESS_O)
 
-pics/sha1_asm_sparcv9.o: $(SHA1DIR)/sparc/sun4u/sha1_asm.s
-	$(COMPILE.s) -K PIC -P -DPIC -D_ASM -xarch=v9a -o $@ \
-		$(SHA1DIR)/sparc/sun4u/sha1_asm.s
-	$(POST_PROCESS_O)
-
 pics/mont_mulf_sparcv9.o: $(BIGNUMDIR)/sun4u/mont_mulf_v9.s
 	$(COMPILE.s) $(AS_BIGPICFLAGS) -xarch=v9 -o $@ $(BIGNUMDIR)/sun4u/mont_mulf_v9.s
 	$(POST_PROCESS_O)
author	darrenm <none@none>	2006-03-28 08:45:30 -0800
committer	darrenm <none@none>	2006-03-28 08:45:30 -0800
commit	734b6a94890be549309b21156f8ed6d4561cac51 (patch)
tree	2933f611f79a13239acd3bd859b39c4bf5ad04e6 /usr/src/lib
parent	35fe197b91640f2efc8c0b3849eee882e373c729 (diff)
download	illumos-joyent-734b6a94890be549309b21156f8ed6d4561cac51.tar.gz