summaryrefslogtreecommitdiff
path: root/usr/src/lib/crypt_modules
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/crypt_modules')
-rw-r--r--usr/src/lib/crypt_modules/Makefile.crypt_modules14
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/Makefile16
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/mapfile-vers (renamed from usr/src/lib/crypt_modules/sunmd5/spec/versions)31
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/Makefile28
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ33
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile37
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec41
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile35
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/Makefile16
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/mapfile-vers (renamed from usr/src/lib/crypt_modules/bsdmd5/spec/versions)31
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/Makefile28
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ33
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile37
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec41
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile35
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/Makefile16
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/mapfile-vers (renamed from usr/src/lib/crypt_modules/bsdbf/spec/versions)31
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/Makefile28
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ33
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile37
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile34
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile35
-rw-r--r--usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec41
28 files changed, 65 insertions, 816 deletions
diff --git a/usr/src/lib/crypt_modules/Makefile.crypt_modules b/usr/src/lib/crypt_modules/Makefile.crypt_modules
index abc97b8d52..56fea36cc1 100644
--- a/usr/src/lib/crypt_modules/Makefile.crypt_modules
+++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules
@@ -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,18 +19,18 @@
# 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"
#
+
+#
# Common build macros used by (most every) crypt module.
#
include $(SRC)/lib/Makefile.lib
-SRCDIR= ..
-
LIBS= $(DYNLIB)
CFLAGS += $(CCVERBOSE)
@@ -39,9 +38,6 @@ CPPFLAGS += -D_REENTRANT
LINTFLAGS += -y
LINTFLAGS64 += -y
-MAPDIR= ../spec/$(TRANSMACH)
-SPECMAPFILE= $(MAPDIR)/mapfile
-
ROOTLIBDIR= $(ROOT)/usr/lib/security
ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64)
diff --git a/usr/src/lib/crypt_modules/bsdbf/Makefile b/usr/src/lib/crypt_modules/bsdbf/Makefile
index a8ec19b7dd..6eb0c845ec 100644
--- a/usr/src/lib/crypt_modules/bsdbf/Makefile
+++ b/usr/src/lib/crypt_modules/bsdbf/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,10 +19,11 @@
# CDDL HEADER END
#
#
-# Copyright 2002 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"
+# ident "%Z%%M% %I% %E% SMI"
+#
include $(SRC)/lib/Makefile.lib
@@ -40,15 +40,13 @@ package := TARGET= package
.KEEP_STATE:
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
_msg:
catalog:
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
FRC:
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/versions b/usr/src/lib/crypt_modules/bsdbf/mapfile-vers
index 26282a6b11..0ed1e6c0c5 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/versions
+++ b/usr/src/lib/crypt_modules/bsdbf/mapfile-vers
@@ -1,13 +1,9 @@
#
-# 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,18 +18,17 @@
#
# CDDL HEADER END
#
+#
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
# ident "%Z%%M% %I% %E% SMI"
#
-sparc {
- SUNW_1.0;
-}
-sparcv9 {
- SUNW_1.0;
-}
-i386 {
- SUNW_1.0;
-}
-amd64 {
- SUNW_1.0;
-}
+SUNW_1.0 {
+ global:
+ crypt_genhash_impl;
+ crypt_gensalt_impl;
+ local:
+ *;
+};
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile b/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
deleted file mode 100644
index 3adc9dfc19..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
+++ /dev/null
@@ -1,28 +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 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-include $(SRC)/lib/Makefile.spec.arch
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ b/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
deleted file mode 100644
index 9b212125b8..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-LIBRARY = bsdbf.a
-VERS = .1
-
-OBJECTS = bsdbf.o
-
-SPECCPP =
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile b/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
deleted file mode 100644
index 25ccbbbd01..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec b/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
deleted file mode 100644
index 46e30228ae..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-function crypt_genhash_impl
-include <crypt.h>
-declaration char * crypt_genhash_impl(char *ctbuffer, size_t ctbufflen, \
- const char *plaintext, const char *switchsalt,\
- const char **params)
-version SUNW_1.0
-end
-
-function crypt_gensalt_impl
-include <crypt.h>
-declaration char *crypt_gensalt_impl(char *gsbuffer, size_t gsbufflen, \
- const char *oldsalt, const struct passwd *userinfo, \
- const char **params)
-version SUNW_1.0
-end
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile b/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile b/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile b/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
deleted file mode 100644
index 77087cd2af..0000000000
--- a/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
+++ /dev/null
@@ -1,35 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdmd5/Makefile b/usr/src/lib/crypt_modules/bsdmd5/Makefile
index d7bd54983e..56ab3b9de1 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/Makefile
+++ b/usr/src/lib/crypt_modules/bsdmd5/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,10 +19,11 @@
# CDDL HEADER END
#
#
-# Copyright 2002 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"
+# ident "%Z%%M% %I% %E% SMI"
+#
include $(SRC)/lib/Makefile.lib
@@ -40,15 +40,13 @@ package := TARGET= package
.KEEP_STATE:
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
_msg:
catalog:
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
FRC:
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/versions b/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers
index 26282a6b11..0ed1e6c0c5 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/versions
+++ b/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers
@@ -1,13 +1,9 @@
#
-# 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,18 +18,17 @@
#
# CDDL HEADER END
#
+#
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
# ident "%Z%%M% %I% %E% SMI"
#
-sparc {
- SUNW_1.0;
-}
-sparcv9 {
- SUNW_1.0;
-}
-i386 {
- SUNW_1.0;
-}
-amd64 {
- SUNW_1.0;
-}
+SUNW_1.0 {
+ global:
+ crypt_genhash_impl;
+ crypt_gensalt_impl;
+ local:
+ *;
+};
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile b/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
deleted file mode 100644
index 3adc9dfc19..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
+++ /dev/null
@@ -1,28 +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 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-include $(SRC)/lib/Makefile.spec.arch
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ b/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
deleted file mode 100644
index 36ffc54005..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-LIBRARY = bsdmd5.a
-VERS = .1
-
-OBJECTS = bsdmd5.o
-
-SPECCPP =
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile b/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
deleted file mode 100644
index 25ccbbbd01..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec b/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
deleted file mode 100644
index 46e30228ae..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-function crypt_genhash_impl
-include <crypt.h>
-declaration char * crypt_genhash_impl(char *ctbuffer, size_t ctbufflen, \
- const char *plaintext, const char *switchsalt,\
- const char **params)
-version SUNW_1.0
-end
-
-function crypt_gensalt_impl
-include <crypt.h>
-declaration char *crypt_gensalt_impl(char *gsbuffer, size_t gsbufflen, \
- const char *oldsalt, const struct passwd *userinfo, \
- const char **params)
-version SUNW_1.0
-end
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile b/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile b/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile b/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
deleted file mode 100644
index 77087cd2af..0000000000
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
+++ /dev/null
@@ -1,35 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/sunmd5/Makefile b/usr/src/lib/crypt_modules/sunmd5/Makefile
index d7bd54983e..56ab3b9de1 100644
--- a/usr/src/lib/crypt_modules/sunmd5/Makefile
+++ b/usr/src/lib/crypt_modules/sunmd5/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,10 +19,11 @@
# CDDL HEADER END
#
#
-# Copyright 2002 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"
+# ident "%Z%%M% %I% %E% SMI"
+#
include $(SRC)/lib/Makefile.lib
@@ -40,15 +40,13 @@ package := TARGET= package
.KEEP_STATE:
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
_msg:
catalog:
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
FRC:
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/versions b/usr/src/lib/crypt_modules/sunmd5/mapfile-vers
index 26282a6b11..0ed1e6c0c5 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/versions
+++ b/usr/src/lib/crypt_modules/sunmd5/mapfile-vers
@@ -1,13 +1,9 @@
#
-# 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,18 +18,17 @@
#
# CDDL HEADER END
#
+#
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
# ident "%Z%%M% %I% %E% SMI"
#
-sparc {
- SUNW_1.0;
-}
-sparcv9 {
- SUNW_1.0;
-}
-i386 {
- SUNW_1.0;
-}
-amd64 {
- SUNW_1.0;
-}
+SUNW_1.0 {
+ global:
+ crypt_genhash_impl;
+ crypt_gensalt_impl;
+ local:
+ *;
+};
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile b/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
deleted file mode 100644
index 3adc9dfc19..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
+++ /dev/null
@@ -1,28 +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 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-include $(SRC)/lib/Makefile.spec.arch
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ b/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
deleted file mode 100644
index 6963190527..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-LIBRARY = sunmd5.a
-VERS = .1
-
-OBJECTS = sunmd5.o
-
-SPECCPP =
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile b/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
deleted file mode 100644
index 25ccbbbd01..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile b/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile b/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
deleted file mode 100644
index ebf8d7f907..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
+++ /dev/null
@@ -1,34 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile b/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
deleted file mode 100644
index 77087cd2af..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
+++ /dev/null
@@ -1,35 +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 2003 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-# To enable apptrace, comment out the next line
-DISABLE_APPTRACE= $(POUND_SIGN)
-
-include ../Makefile.targ
-include $(SRC)/lib/Makefile.lib
-include $(SRC)/lib/Makefile.lib.64
-include $(SRC)/lib/Makefile.spec
-
-$(DISABLE_APPTRACE)install: $(ROOTABILIB)
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec b/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
deleted file mode 100644
index 46e30228ae..0000000000
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "%Z%%M% %I% %E% SMI"
-
-function crypt_genhash_impl
-include <crypt.h>
-declaration char * crypt_genhash_impl(char *ctbuffer, size_t ctbufflen, \
- const char *plaintext, const char *switchsalt,\
- const char **params)
-version SUNW_1.0
-end
-
-function crypt_gensalt_impl
-include <crypt.h>
-declaration char *crypt_gensalt_impl(char *gsbuffer, size_t gsbufflen, \
- const char *oldsalt, const struct passwd *userinfo, \
- const char **params)
-version SUNW_1.0
-end