summaryrefslogtreecommitdiff
path: root/usr/src/lib/pkcs11
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/pkcs11')
-rw-r--r--usr/src/lib/pkcs11/Makefile9
-rw-r--r--usr/src/lib/pkcs11/libkcfd/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libkcfd/Makefile.com2
-rw-r--r--usr/src/lib/pkcs11/libkcfd/i386/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libkcfd/sparc/Makefile2
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/Makefile5
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/Makefile.com59
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/i386/Makefile5
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/sparc/Makefile5
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/Makefile3
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/Makefile.com5
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile7
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile1
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile1
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile1
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile1
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile7
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile7
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile7
-rw-r--r--usr/src/lib/pkcs11/pkcs11_kernel/Makefile5
-rw-r--r--usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com27
-rw-r--r--usr/src/lib/pkcs11/pkcs11_softtoken/Makefile5
-rw-r--r--usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com8
-rw-r--r--usr/src/lib/pkcs11/pkcs11_tpm/Makefile3
-rw-r--r--usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com9
25 files changed, 59 insertions, 129 deletions
diff --git a/usr/src/lib/pkcs11/Makefile b/usr/src/lib/pkcs11/Makefile
index c552af6b57..f2db14f3d4 100644
--- a/usr/src/lib/pkcs11/Makefile
+++ b/usr/src/lib/pkcs11/Makefile
@@ -24,7 +24,7 @@
include ../Makefile.lib
-HDRS = cryptoki.h pkcs11.h pkcs11f.h pkcs11t.h
+HDRS = cryptoki.h pkcs11.h pkcs11f.h pkcs11t.h
HDRDIR = include
ROOTHDRDIR = $(ROOT)/usr/include/security
@@ -39,15 +39,14 @@ SUBDIRS = \
pkcs11_softtoken \
pkcs11_tpm
-all := TARGET= all
-clean := TARGET= clean
+all := TARGET= all
+clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
install_h: $(ROOTHDRS)
diff --git a/usr/src/lib/pkcs11/libkcfd/Makefile b/usr/src/lib/pkcs11/libkcfd/Makefile
index 1f4d996ae6..b801a9c0fb 100644
--- a/usr/src/lib/pkcs11/libkcfd/Makefile
+++ b/usr/src/lib/pkcs11/libkcfd/Makefile
@@ -39,7 +39,7 @@ install := TARGET= install
all clean clobber install: $(SUBDIRS)
-check lint install_h:
+check install_h:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libkcfd/Makefile.com b/usr/src/lib/pkcs11/libkcfd/Makefile.com
index b1715278a4..4fdeed21ea 100644
--- a/usr/src/lib/pkcs11/libkcfd/Makefile.com
+++ b/usr/src/lib/pkcs11/libkcfd/Makefile.com
@@ -29,8 +29,6 @@ VERS = .1
include $(SRC)/lib/Makefile.rootfs
-LIBS += $(LINTLIB)
-
#
# Identify that this library is an interposer. This identification
# ensures that runtime symbol lookup resolves to this library
diff --git a/usr/src/lib/pkcs11/libkcfd/i386/Makefile b/usr/src/lib/pkcs11/libkcfd/i386/Makefile
index 21e8ab504f..63486f492c 100644
--- a/usr/src/lib/pkcs11/libkcfd/i386/Makefile
+++ b/usr/src/lib/pkcs11/libkcfd/i386/Makefile
@@ -29,6 +29,6 @@
include $(SRC)/lib/Makefile.filter.com
include ../Makefile.com
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
include $(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/pkcs11/libkcfd/sparc/Makefile b/usr/src/lib/pkcs11/libkcfd/sparc/Makefile
index 05909fb581..348e26b441 100644
--- a/usr/src/lib/pkcs11/libkcfd/sparc/Makefile
+++ b/usr/src/lib/pkcs11/libkcfd/sparc/Makefile
@@ -29,6 +29,6 @@
include $(SRC)/lib/Makefile.filter.com
include ../Makefile.com
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
include $(SRC)/lib/Makefile.filter.targ
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile b/usr/src/lib/pkcs11/libpkcs11/Makefile
index cb3acc6143..de9110d68a 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile
@@ -22,8 +22,6 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../../../Makefile.master
include ../../Makefile.lib
@@ -36,11 +34,10 @@ check := TARGET= check
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
index cb9dcf89bd..bec143be52 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
@@ -29,33 +29,33 @@ VERS= .1
OBJECTS= \
- metaAttrManager.o \
- metaCrypt.o \
- metaDigest.o \
- metaDualCrypt.o \
- metaGeneral.o \
- metaKeys.o \
- metaMechManager.o \
- metaObject.o \
- metaObjectManager.o \
- metaRand.o \
- metaSession.o \
- metaSessionManager.o \
- metaSign.o \
- metaSlotManager.o \
- metaSlotToken.o \
- metaUtil.o \
- metaVerify.o \
- pkcs11General.o \
- pkcs11SlotToken.o \
- pkcs11Session.o \
- pkcs11Object.o \
- pkcs11Crypt.o \
- pkcs11Digest.o \
- pkcs11Sign.o \
- pkcs11Verify.o \
- pkcs11DualCrypt.o \
- pkcs11Keys.o \
+ metaAttrManager.o \
+ metaCrypt.o \
+ metaDigest.o \
+ metaDualCrypt.o \
+ metaGeneral.o \
+ metaKeys.o \
+ metaMechManager.o \
+ metaObject.o \
+ metaObjectManager.o \
+ metaRand.o \
+ metaSession.o \
+ metaSessionManager.o \
+ metaSign.o \
+ metaSlotManager.o \
+ metaSlotToken.o \
+ metaUtil.o \
+ metaVerify.o \
+ pkcs11General.o \
+ pkcs11SlotToken.o \
+ pkcs11Session.o \
+ pkcs11Object.o \
+ pkcs11Crypt.o \
+ pkcs11Digest.o \
+ pkcs11Sign.o \
+ pkcs11Verify.o \
+ pkcs11DualCrypt.o \
+ pkcs11Keys.o \
pkcs11Rand.o \
pkcs11Slottable.o \
pkcs11Conf.o \
@@ -67,14 +67,12 @@ include ../../../Makefile.lib
SRCDIR= ../common
INCDIR= ../../include
-LIBS = $(DYNLIB) $(LINTLIB)
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
+LIBS = $(DYNLIB)
LDLIBS += -lcryptoutil -lc
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(INCDIR) -I$(SRCDIR) -D_REENTRANT
-LINTFLAGS64 += -errchk=longptr64
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += $(CNOWARN_UNINIT)
@@ -86,6 +84,5 @@ SMATCH=off
all: $(LIBS)
-lint: lintcheck
include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pkcs11/libpkcs11/i386/Makefile b/usr/src/lib/pkcs11/libpkcs11/i386/Makefile
index dfafa04d2f..e129d9ceb8 100644
--- a/usr/src/lib/pkcs11/libpkcs11/i386/Makefile
+++ b/usr/src/lib/pkcs11/libpkcs11/i386/Makefile
@@ -23,10 +23,7 @@
# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# lib/libpkcs11/i386/Makefile
include ../Makefile.com
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile b/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile
index 9fb963b570..e129d9ceb8 100644
--- a/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile
+++ b/usr/src/lib/pkcs11/libpkcs11/sparc/Makefile
@@ -23,10 +23,7 @@
# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# lib/libpkcs11/sparc/Makefile
include ../Makefile.com
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/Makefile
index 96d8d8144d..57ac14a115 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile
@@ -32,13 +32,12 @@ all := TARGET= all
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
.PARALLEL: $(SUBDIRS)
-all clean clobber install lint: \
+all clean clobber install: \
$(CAPDIR) .WAIT $(SUBDIRS)
install_h: $(ROOTHDRS)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
index 3c01b7ad0c..baca0d4bde 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
+++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
@@ -116,8 +116,3 @@ PAD_SRC = $(PAD_COMMON_SRC) $(PAD_PSM_SRC)
# Header include directories
CRYPTODIR = $(SRC)/common/crypto
UTSDIR = $(SRC)/uts/common/
-
-# Lint
-EXTRA_LINT_FLAGS = $(AES_FLAGS) $(BLOWFISH_FLAGS) $(ARCFOUR_FLAGS) \
- $(DES_FLAGS) $(BIGNUM_FLAGS) $(MODES_FLAGS) \
- $(DH_FLAGS) $(DSA_FLAGS) $(RSA_FLAGS) $(PAD_FLAGS)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
index 848a6b55b2..46ae07f9ef 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
@@ -61,7 +61,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
MAPFILEDIR = ../common
CFLAGS += -xO4 -xcrossfile
@@ -70,15 +70,12 @@ ASFLAGS += $(AS_PICFLAGS) -P -D__STDC__ -D_ASM
BIGNUM_FLAGS += -DPSR_MUL
CLEANFILES += arcfour-x86_64.s
LDLIBS += -lcryptoutil -lc
-LINTFLAGS64 += $(EXTRA_LINT_FLAGS)
.KEEP_STATE:
all: $(LIBS)
-lint: $(SRCS)
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
pics/%.o: $(AES_DIR)/$(MACH64)/%.c
$(COMPILE.c) $(AES_FLAGS) -o $@ $<
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile
index bfd264345e..3b03cec003 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/Makefile
@@ -41,7 +41,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile
index aa11eb6fde..1191e6f7d4 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/intel/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4v/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
index 11c2507cee..60b934a8d7 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
@@ -45,13 +45,12 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
MAPFILEDIR = ../common
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
LDLIBS += -lcryptoutil -lc
-LINTFLAGS += $(EXTRA_LINT_FLAGS)
# Symbol capabilities objects are i386.
EXTPICS = ../capabilities/intel/i386/pics/symcap.o
@@ -60,8 +59,6 @@ EXTPICS = ../capabilities/intel/i386/pics/symcap.o
all: $(LIBS)
-lint: $(SRCS)
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
include ../Makefile.targ
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
index 398c8265dc..79a352895b 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sparc/Makefile
@@ -37,7 +37,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
MAPFILEDIR = ../common
CFLAGS += $(CCVERBOSE)
@@ -48,7 +48,6 @@ CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
LDLIBS += -lcryptoutil -lc
-LINTFLAGS += $(EXTRA_LINT_FLAGS)
# Symbol capabilities objects are added for sun4u and sun4v.
EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \
@@ -58,8 +57,6 @@ EXTPICS = ../capabilities/sun4u/sparc/pics/symcap.o \
all: $(LIBS)
-lint: $(SRCS)
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
include ../Makefile.targ
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
index d90a6125f0..eb85292eab 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sparcv9/Makefile
@@ -38,7 +38,7 @@ SRCS = $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
SRCDIR = $(SRC)/lib/pkcs11/libsoftcrypto/common
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
MAPFILEDIR = ../common
CFLAGS += $(CCVERBOSE)
@@ -49,7 +49,6 @@ CERRWARN += $(CNOWARN_UNINIT)
CPPFLAGS += -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
LDLIBS += -lcryptoutil -lc
-LINTFLAGS64 += $(EXTRA_LINT_FLAGS)
# Symbol capabilities objects are added for sun4u and sun4v.
EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \
@@ -59,8 +58,6 @@ EXTPICS = ../capabilities/sun4u/sparcv9/pics/symcap.o \
all: $(LIBS)
-lint: $(SRCS)
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
include ../Makefile.targ
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
index ead030d990..91baa42c2b 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
@@ -22,8 +22,6 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/Makefile.lib
@@ -35,11 +33,10 @@ check := TARGET= check
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
index 9cf7027144..5c55be29d5 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
@@ -28,15 +28,15 @@ LIBRARY= pkcs11_kernel.a
VERS= .1
CORE_OBJECTS= \
- kernelGeneral.o \
- kernelSlottable.o \
- kernelSlotToken.o \
- kernelObject.o \
- kernelDigest.o \
- kernelSign.o \
- kernelVerify.o \
- kernelDualCrypt.o \
- kernelKeys.o \
+ kernelGeneral.o \
+ kernelSlottable.o \
+ kernelSlotToken.o \
+ kernelObject.o \
+ kernelDigest.o \
+ kernelSign.o \
+ kernelVerify.o \
+ kernelDualCrypt.o \
+ kernelKeys.o \
kernelRand.o \
kernelSession.o \
kernelSessionUtil.o \
@@ -99,15 +99,6 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64)
all: $(LIBS)
-# we don't need to lint ST_OBJECTS since they are linted elsewhere.
-lintcheck := SRCS = $(CORESRCS)
-lintother := OSRCS = ../common/kernelSoftCommon.c
-lintother := CPPFLAGS = -I$(ST_DIR) $(CPPFLAGS.master)
-
-lintother: $$(OSRCS)
- $(LINT.c) $(LINTCHECKFLAGS) $(OSRCS) $(LDLIBS)
-
-lint: lintcheck lintother
pics/%.o: $(ST_DIR)/%.c
$(COMPILE.c) -o $@ $< -I$(ST_DIR)
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
index cdeea1697a..bd158b1cf2 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
@@ -22,8 +22,6 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/Makefile.lib
@@ -35,11 +33,10 @@ check := TARGET= check
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
-all check clean clobber install lint: $(SUBDIRS)
+all check clean clobber install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
index a837802e81..a3d76fd04e 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
@@ -124,7 +124,6 @@ LIBS = $(DYNLIB)
LDLIBS += -lc -lmd -lcryptoutil -lsoftcrypto -lgen
CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
CFLAGS += $(CCVERBOSE)
@@ -145,21 +144,14 @@ CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \
-I$(BIGNUMDIR) -I$(PADDIR) -D_POSIX_PTHREAD_SEMANTICS \
-DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B
-LINTFLAGS64 += -errchk=longptr64
ROOTLIBDIR= $(ROOT)/usr/lib/security
ROOTLIBDIR64= $(ROOT)/usr/lib/security/$(MACH64)
-LINTSRC = \
- $(LCL_OBJECTS:%.o=$(SRCDIR)/%.c) \
- $(RNG_COBJECTS:%.o=$(RNGDIR)/%.c)
-
.KEEP_STATE:
all: $(LIBS)
-lint: $$(LINTSRC)
- $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
pics/%.o: $(BERDIR)/%.c
$(COMPILE.c) -o $@ $< -D_SOLARIS_SDK -I$(BERDIR) \
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile
index 156414a3ef..8c085a8538 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile
@@ -31,11 +31,10 @@ all := TARGET= all
clean := TARGET= clean
clobber := TARGET= clobber
install := TARGET= install
-lint := TARGET= lint
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index 244d460f5e..3dd128871f 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -100,19 +100,10 @@ CERRWARN += $(CNOWARN_UNINIT)
# not linted
SMATCH=off
-LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
-
-$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
-LINTSRC= $(SRCS)
-
-CLOBBERFILES += C.ln
-
.KEEP_STATE:
all: $(LIBS)
-lint: $$(LINTSRC)
- $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
pics/%.o: $(SRCDIR)/%.c
$(COMPILE.c) -o $@ $<