Mercurial > illumos > illumos-gate

changeset 5069:a114332ed71c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6546405 KMF Interfaces need to be extensible (fix lint)
author wyllys
date Mon, 17 Sep 2007 12:56:55 -0700
parents 06d88145c7f7
children f1c8fa0cbaca
files usr/src/cmd/cmd-crypto/pktool/export.c usr/src/cmd/cmd-crypto/pktool/import.c usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/cmd-crypto/pktool/export.c	Mon Sep 17 12:24:38 2007 -0700
+++ b/usr/src/cmd/cmd-crypto/pktool/export.c	Mon Sep 17 12:56:55 2007 -0700
@@ -461,7 +461,6 @@
 	uint32_t numkeys = 1;
 	KMF_ATTRIBUTE attrlist[16];
 	KMF_KEY_HANDLE key;
-	KMF_KEY_CLASS keyclass = KMF_SYMMETRIC;
 	boolean_t is_token = B_TRUE;
 
 	if (EMPTYSTRING(label)) {
@@ -525,21 +524,21 @@
 				if (n < 0) {
 					if (errno == EINTR)
 						continue;
-					close(fd);
+					(void) close(fd);
 					rv = KMF_ERR_WRITE_FILE;
 					goto done;
 				}
 				total += n;
 
 			} while (total < rkey.keydata.len);
-			close(fd);
+			(void) close(fd);
 		}
 done:
 		kmf_free_bigint(&rkey.keydata);
 		kmf_free_kmf_key(kmfhandle, &key);
 	} else if (rv == KMF_OK) {
 		KMF_KEYSTORE_TYPE sslks = KMF_KEYSTORE_OPENSSL;
-		printf(gettext("Found %d asymmetric keys\n"), numkeys);
+		(void) printf(gettext("Found %d asymmetric keys\n"), numkeys);
 
 		numattr = 0;
 		kmf_set_attr_at_index(attrlist, numattr, KMF_KEYSTORE_TYPE_ATTR,
--- a/usr/src/cmd/cmd-crypto/pktool/import.c	Mon Sep 17 12:24:38 2007 -0700
+++ b/usr/src/cmd/cmd-crypto/pktool/import.c	Mon Sep 17 12:56:55 2007 -0700
@@ -556,6 +556,7 @@
 	return (rv);
 }
 
+/*ARGSUSED*/
 static KMF_RETURN
 pk_import_keys(KMF_HANDLE_T kmfhandle,
 	KMF_KEYSTORE_TYPE kstype, char *token_spec,
@@ -630,7 +631,7 @@
 
 		rv = kmf_store_key(kmfhandle, numattr, attrlist);
 		if (rv == KMF_OK) {
-			printf(gettext("Importing %d keys\n"), numkeys);
+			(void) printf(gettext("Importing %d keys\n"), numkeys);
 		}
 
 		kmf_free_kmf_key(kmfhandle, &key);
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Mon Sep 17 12:24:38 2007 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Mon Sep 17 12:56:55 2007 -0700
@@ -53,6 +53,7 @@
 
 CFLAGS		+=	$(CCVERBOSE)
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) -I$(INCDIR)  -I/usr/include/libxml2 -I$(BIGNUMDIR)
+LINTFLAGS64	+=	-errchk=longptr64
 
 PICS=	$(OBJECTS:%=pics/%)
 SONAME=	$(PLUGIN)