summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremaldona%redhat.com <devnull@localhost>2008-09-26 17:45:16 +0000
committeremaldona%redhat.com <devnull@localhost>2008-09-26 17:45:16 +0000
commitf089545ca5708014b6f78ad370bfafa200393963 (patch)
treec919afc6d98880e8b5dee5095c2de867cf838682
parentaa9d128f80cfe208c588d9be938e1c1d2a9c322c (diff)
downloadnss-hg-f089545ca5708014b6f78ad370bfafa200393963.tar.gz
Fix Bug 449334 - pk12util has duplicate letters, r=nelson
-rw-r--r--security/nss/cmd/pk12util/pk12util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index e001dbfbb..a4d0e6b93 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -67,8 +67,8 @@ Usage(char *progName)
FPS "Usage: %s -o exportfile -n certname [-d certdir] [-P dbprefix] [-v]\n",
progName);
- FPS "\t\t [-c key_cipher] [-C cert_cipher] [-k key_leng]\n");
- FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]\n");
+ FPS "\t\t [-c key_cipher] [-C cert_cipher] [-m | --key_len keyLen] [-n | --cert_key_len certKeyLen]\n");
+ FPS "\t\t [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filefilepw]\n");
exit(PK12UERR_USAGE);
}
@@ -953,8 +953,8 @@ static secuCommandFlag pk12util_options[] =
{ /* opt_Debug */ 'v', PR_FALSE, 0, PR_FALSE },
{ /* opt_Cipher */ 'c', PR_TRUE, 0, PR_FALSE },
{ /* opt_CertCipher */ 'C', PR_TRUE, 0, PR_FALSE },
- { /* opt_KeyLength */ 'k', PR_TRUE, 0, PR_FALSE },
- { /* opt_CertKeyLength */ 'K', PR_TRUE, 0, PR_FALSE }
+ { /* opt_KeyLength */ 'm', PR_TRUE, 0, PR_FALSE, "key_len" },
+ { /* opt_CertKeyLength */ 'n', PR_TRUE, 0, PR_FALSE, "cert_key_len" }
};
int