diff options
Diffstat (limited to 'usr/src/lib/libcryptoutil')
| -rw-r--r-- | usr/src/lib/libcryptoutil/Makefile | 16 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/common/mapfile-vers (renamed from usr/src/lib/libcryptoutil/spec/sparc/Makefile) | 41 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/Makefile | 28 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/Makefile.targ | 31 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/amd64/Makefile | 43 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/cryptoutil.spec | 104 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/i386/Makefile | 42 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/sparcv9/Makefile | 43 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/spec/versions | 38 |
10 files changed, 33 insertions, 361 deletions
diff --git a/usr/src/lib/libcryptoutil/Makefile b/usr/src/lib/libcryptoutil/Makefile index 687e767a20..3f17cf53ab 100644 --- a/usr/src/lib/libcryptoutil/Makefile +++ b/usr/src/lib/libcryptoutil/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,13 @@ # 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" +# ident "%Z%%M% %I% %E% SMI" +# -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib HDRS= cryptoutil.h HDRDIR= common @@ -40,13 +40,13 @@ lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: spec .WAIT $(SUBDIRS) +all clean clobber install lint: $(SUBDIRS) install_h: $(ROOTHDRS) check: $(CHECKHDRS) -spec $(SUBDIRS): FRC +$(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com index 716bd94b1e..2beda723bb 100644 --- a/usr/src/lib/libcryptoutil/Makefile.com +++ b/usr/src/lib/libcryptoutil/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" @@ -42,7 +41,6 @@ include $(SRC)/lib/Makefile.lib SRCDIR= ../common LIBS = $(DYNLIB) $(LINTLIB) -SRCS= $(OBJECTS:%.o=../common/%.c) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lc diff --git a/usr/src/lib/libcryptoutil/spec/sparc/Makefile b/usr/src/lib/libcryptoutil/common/mapfile-vers index 76d47aab26..92e53197af 100644 --- a/usr/src/lib/libcryptoutil/spec/sparc/Makefile +++ b/usr/src/lib/libcryptoutil/common/mapfile-vers @@ -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,27 @@ # 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" +# -.KEEP_STATE: - -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 - -install: $(ROOTABILIB) +SUNWprivate_1.1 { + global: + create_umech; + cryptodebug; + cryptodebug_init; + cryptoerror; + free_uentry; + free_uentrylist; + free_umechlist; + get_pkcs11conf_info; + pkcs11_mech2keytype; + pkcs11_mech2str; + pkcs11_str2mech; + pkcs11_strerror; + tohexstr; + local: + *; +}; diff --git a/usr/src/lib/libcryptoutil/spec/Makefile b/usr/src/lib/libcryptoutil/spec/Makefile deleted file mode 100644 index 7fc3c15e34..0000000000 --- a/usr/src/lib/libcryptoutil/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 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI"U - -include $(SRC)/lib/Makefile.spec.arch diff --git a/usr/src/lib/libcryptoutil/spec/Makefile.targ b/usr/src/lib/libcryptoutil/spec/Makefile.targ deleted file mode 100644 index fb1d5ef898..0000000000 --- a/usr/src/lib/libcryptoutil/spec/Makefile.targ +++ /dev/null @@ -1,31 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI"U - -LIBRARY = libcryptoutil.a -VERS = .1 - -OBJECTS = cryptoutil.o diff --git a/usr/src/lib/libcryptoutil/spec/amd64/Makefile b/usr/src/lib/libcryptoutil/spec/amd64/Makefile deleted file mode 100644 index 40a72c892d..0000000000 --- a/usr/src/lib/libcryptoutil/spec/amd64/Makefile +++ /dev/null @@ -1,43 +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"I - -.KEEP_STATE: - -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 = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/libcryptoutil/spec/cryptoutil.spec b/usr/src/lib/libcryptoutil/spec/cryptoutil.spec deleted file mode 100644 index 947cce551a..0000000000 --- a/usr/src/lib/libcryptoutil/spec/cryptoutil.spec +++ /dev/null @@ -1,104 +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/libcryptoutil/spec/cryptoutil.spec - -function cryptodebug -include <cryptoutil.h> -declaration void cryptodebug(const char *fmt, ...) -version SUNWprivate_1.1 -end - -function cryptoerror -include <cryptoutil.h> -declaration void cryptoerror(int priority, const char *fmt, ...) -version SUNWprivate_1.1 -end - -function cryptodebug_init -include <cryptoutil.h> -declaration void cryptodebug_init(const char *prefix) -version SUNWprivate_1.1 -end - -function pkcs11_mech2str -include <cryptoutil.h> -declaration char *pkcs11_mech2str(CK_MECHANISM_TYPE mech) -version SUNWprivate_1.1 -end - -function pkcs11_str2mech -include <cryptoutil.h> -declaration CK_RV pkcs11_str2mech(char *mech_str, CK_MECHANISM_TYPE_PTR mech) -version SUNWprivate_1.1 -end - -function pkcs11_mech2keytype -include <cryptoutil.h> -declaration CK_RV pkcs11_mech2keytype(CK_MECHANISM_TYPE mech_type, CK_KEY_TYPE *ktype) -version SUNWprivate_1.1 -end - -function pkcs11_strerror -include <cryptoutil.h> -declaration char *pkcs11_strerror(CK_RV rv) -version SUNWprivate_1.1 -end -function get_pkcs11conf_info -include <cryptoutil.h> -declaration int get_pkcs11conf_info(uentrylist_t **) -version SUNWprivate_1.1 -end - -function tohexstr -include <cryptoutil.h> -declaration void tohexstr(uchar_t *bytes, size_t blen, char *hexstr, size_t hexlen) -version SUNWprivate_1.1 -end - -function create_umech -include <cryptoutil.h> -declaration umechlist_t *create_umech(char *) -version SUNWprivate_1.1 -end - -function free_umechlist -include <cryptoutil.h> -declaration void free_umechlist(umechlist_t *) -version SUNWprivate_1.1 -end - -function free_uentrylist -include <cryptoutil.h> -declaration void free_uentrylist(uentrylist_t *) -version SUNWprivate_1.1 -end - -function free_uentry -include <cryptoutil.h> -declaration void free_uentry(uentry_t *) -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/libcryptoutil/spec/i386/Makefile b/usr/src/lib/libcryptoutil/spec/i386/Makefile deleted file mode 100644 index bb5123e331..0000000000 --- a/usr/src/lib/libcryptoutil/spec/i386/Makefile +++ /dev/null @@ -1,42 +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"I - -.KEEP_STATE: - -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 - -install: $(ROOTABILIB) diff --git a/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile b/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile deleted file mode 100644 index 1cfa32dc3c..0000000000 --- a/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile +++ /dev/null @@ -1,43 +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" - -.KEEP_STATE: - -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 - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/libcryptoutil/spec/versions b/usr/src/lib/libcryptoutil/spec/versions deleted file mode 100644 index a990772196..0000000000 --- a/usr/src/lib/libcryptoutil/spec/versions +++ /dev/null @@ -1,38 +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" - -sparc { - SUNWprivate_1.1; -} -sparcv9 { - SUNWprivate_1.1; -} -i386 { - SUNWprivate_1.1; -} -amd64 { - SUNWprivate_1.1; -} |