6541084 pktool list objtype=key displays incorrect information

6542216 pktool and mac/decrypt didn't use same 'enter pin' string.

2 files changed, 6 insertions, 29 deletions

diff --git a/usr/src/cmd/cmd-crypto/pktool/common.h b/usr/src/cmd/cmd-crypto/pktool/common.h
index e15cee3282..f584a94aa1 100644
--- a/usr/src/cmd/cmd-crypto/pktool/common.h
+++ b/usr/src/cmd/cmd-crypto/pktool/common.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -122,7 +122,7 @@ KMF_RETURN verify_file(char *);
 int get_token_password(KMF_KEYSTORE_TYPE, char *, KMF_CREDENTIAL *);
 void display_error(void *, KMF_RETURN, char *);
 #define	DEFAULT_NSS_TOKEN	"internal"
-#define	DEFAULT_TOKEN_PROMPT	"Enter pin for %s: "
+#define	DEFAULT_TOKEN_PROMPT	"Enter PIN for %s: "
 
 #define	EMPTYSTRING(s) (s == NULL || !strlen((char *)s))
 
diff --git a/usr/src/cmd/cmd-crypto/pktool/list.c b/usr/src/cmd/cmd-crypto/pktool/list.c
index 9898fd03ec..0317da28b7 100644
--- a/usr/src/cmd/cmd-crypto/pktool/list.c
+++ b/usr/src/cmd/cmd-crypto/pktool/list.c
@@ -132,28 +132,6 @@ describeKey(KMF_KEY_HANDLE *key)
 
 }
 
-static char *
-keybitstr(KMF_KEY_HANDLE *key)
-{
-	KMF_RAW_SYM_KEY *rkey;
-	char keystr[256];
-	char *p;
-
-	if (key == NULL || (key->keyclass != KMF_SYMMETRIC))
-		return ("");
-
-	rkey = (KMF_RAW_SYM_KEY *)key->keyp;
-	(void) memset(keystr, 0, sizeof (keystr));
-	if (rkey != NULL) {
-		(void) snprintf(keystr, sizeof (keystr),
-			" (%d bits)", rkey->keydata.len * 8);
-		p = keystr;
-	} else {
-		return ("");
-	}
-
-	return (p);
-}
 
 static void
 pk_show_keys(void *handle, KMF_KEY_HANDLE *keys, int numkeys)
@@ -161,20 +139,19 @@ pk_show_keys(void *handle, KMF_KEY_HANDLE *keys, int numkeys)
 	int i;
 
 	for (i = 0; i < numkeys; i++) {
-		(void) fprintf(stdout, gettext("Key #%d - %s:  %s%s"),
+		(void) fprintf(stdout, gettext("Key #%d - %s:  %s"),
 			i+1, describeKey(&keys[i]),
 			keys[i].keylabel ? keys[i].keylabel :
-			gettext("No label"),
-			(keys[i].keyclass == KMF_SYMMETRIC ?
-			keybitstr(&keys[i]) : ""));
+			gettext("No label"));
 
 		if (keys[i].keyclass == KMF_SYMMETRIC) {
 			KMF_RETURN rv;
 			KMF_RAW_SYM_KEY rkey;
+
 			rv = KMF_GetSymKeyValue(handle, &keys[i],
 				&rkey);
 			if (rv == KMF_OK) {
-				(void) fprintf(stdout, "\t %d bits",
+				(void) fprintf(stdout, " (%d bits)",
 					rkey.keydata.len * 8);
 				KMF_FreeRawSymKey(&rkey);
 			}