diff options
| author | wyllys <none@none> | 2008-04-03 14:25:19 -0700 |
|---|---|---|
| committer | wyllys <none@none> | 2008-04-03 14:25:19 -0700 |
| commit | fa60c371cd00bdca17de2ff18fe3e64d051ae61b (patch) | |
| tree | 2ebb5dfcf1b5725debd600e618ca49c8149df684 /usr/src/cmd/cmd-crypto/pktool/genkey.c | |
| parent | c08e5e1a6b0518eb8f644673c26e1d3f22a773b0 (diff) | |
| download | illumos-joyent-fa60c371cd00bdca17de2ff18fe3e64d051ae61b.tar.gz | |
6669251 KMF needs to support empty PINs
6669357 KMF pkcs11 incorrectly sets some attributes when creating certificates and keys
6679525 [CLI] Subcommands in pktool's help are overtranslated
6680520 pktool needs to prompt for PIN more often
Diffstat (limited to 'usr/src/cmd/cmd-crypto/pktool/genkey.c')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/pktool/genkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/cmd-crypto/pktool/genkey.c b/usr/src/cmd/cmd-crypto/pktool/genkey.c index de9e9c858e..5c9b2616ae 100644 --- a/usr/src/cmd/cmd-crypto/pktool/genkey.c +++ b/usr/src/cmd/cmd-crypto/pktool/genkey.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -87,7 +87,7 @@ genkey_nss(KMF_HANDLE_T kmfhandle, char *token, char *dir, char *prefix, i++; } - if (tokencred != NULL && tokencred->credlen > 0) { + if (tokencred != NULL && tokencred->cred != NULL) { kmf_set_attr_at_index(attlist, i, KMF_CREDENTIAL_ATTR, tokencred, sizeof (KMF_CREDENTIAL)); @@ -191,7 +191,7 @@ genkey_pkcs11(KMF_HANDLE_T kmfhandle, char *token, i++; } - if (tokencred != NULL && tokencred->credlen > 0) { + if (tokencred != NULL && tokencred->cred != NULL) { kmf_set_attr_at_index(attlist, i, KMF_CREDENTIAL_ATTR, tokencred, sizeof (KMF_CREDENTIAL)); |