diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/decrypt/decrypt.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libcryptoutil/common/passutils.c | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/cmd/cmd-crypto/decrypt/decrypt.c b/usr/src/cmd/cmd-crypto/decrypt/decrypt.c index 1fe5127fc2..aece7023ca 100644 --- a/usr/src/cmd/cmd-crypto/decrypt/decrypt.c +++ b/usr/src/cmd/cmd-crypto/decrypt/decrypt.c @@ -482,13 +482,14 @@ execute_cmd(struct CommandInfo *cmd, char *algo_str) } else { /* get the key from input */ status = pkcs11_get_pass(NULL, (char **)&pkeydata, - (size_t *)&keysize, 0, B_FALSE); + (size_t *)&keysize, 0, + (cmd->type == CKA_ENCRYPT) ? B_TRUE : B_FALSE); } if (status != 0 || keysize == 0L) { cryptoerror(LOG_STDERR, - Kflag ? gettext("invalid password.") : - gettext("invalid key.")); + kflag ? gettext("invalid key.") : + gettext("invalid passphrase.")); return (EXIT_FAILURE); } } diff --git a/usr/src/lib/libcryptoutil/common/passutils.c b/usr/src/lib/libcryptoutil/common/passutils.c index a65a908d19..88cb377a45 100644 --- a/usr/src/lib/libcryptoutil/common/passutils.c +++ b/usr/src/lib/libcryptoutil/common/passutils.c @@ -19,12 +19,10 @@ * 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. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <string.h> #include <fcntl.h> @@ -37,9 +35,10 @@ #define DEFAULT_TOKEN_REPROMPT gettext("Re-enter PIN for %s: ") #define DEFAULT_TOKEN_MINSIZE gettext("PIN must be at least %d characters.\n") -#define DEFAULT_USER_PROMPT gettext("Enter key: ") -#define DEFAULT_USER_REPROMPT gettext("Re-enter key: ") -#define DEFAULT_USER_MINSIZE gettext("Key must be at least %d characters.\n") +#define DEFAULT_USER_PROMPT gettext("Enter passphrase: ") +#define DEFAULT_USER_REPROMPT gettext("Re-enter passphrase: ") +#define DEFAULT_USER_MINSIZE \ + gettext("Passphrase must be at least %d characters.\n") #define DEFAULT_PK11TOKEN SOFT_TOKEN_LABEL |