diff options
| author | neil.williams%sun.com <devnull@localhost> | 2007-02-12 23:15:32 +0000 |
|---|---|---|
| committer | neil.williams%sun.com <devnull@localhost> | 2007-02-12 23:15:32 +0000 |
| commit | 1a37442f36ca9c591b24e560a7c664d89c142fa3 (patch) | |
| tree | 483d549e3271debabad31c196e01f7bb547293dc | |
| parent | aa147259a779777dacdf2e9846e288b85246038f (diff) | |
| download | nss-hg-1a37442f36ca9c591b24e560a7c664d89c142fa3.tar.gz | |
Bug 337519 certutil mentions unimplemented curves, r=nelson,alexei
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 0367ab32f..4faa1b809 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -1046,6 +1046,7 @@ static void LongUsage(char *progName) FPS "%-15s Add a certificate to the database (create if needed)\n", "-A"); + FPS "%-20s\n", " All options under -E apply"); FPS "%-15s Run a series of certutil commands from a batch file\n", "-B"); FPS "%-20s Specify the batch file\n", " -i batch-file"); FPS "%-15s Add an Email certificate to the database (create if needed)\n", @@ -1140,23 +1141,26 @@ static void LongUsage(char *progName) #ifdef NSS_ENABLE_ECC FPS "%-20s Elliptic curve name (ec only)\n", " -q curve-name"); - FPS "%-20s One of sect163k1, nistk163, sect163r1, sect163r2,\n", ""); + FPS "%-20s One of nistp256, nistp384, nistp521\n", ""); +#ifdef NSS_ECC_MORE_THAN_SUITE_B + FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", ""); FPS "%-20s nistb163, sect193r1, sect193r2, sect233k1, nistk233,\n", ""); FPS "%-20s sect233r1, nistb233, sect239k1, sect283k1, nistk283,\n", ""); FPS "%-20s sect283r1, nistb283, sect409k1, nistk409, sect409r1,\n", ""); FPS "%-20s nistb409, sect571k1, nistk571, sect571r1, nistb571,\n", ""); FPS "%-20s secp160k1, secp160r1, secp160r2, secp192k1, secp192r1,\n", ""); FPS "%-20s nistp192, secp224k1, secp224r1, nistp224, secp256k1,\n", ""); - FPS "%-20s secp256r1, nistp256, secp384r1, nistp384, secp521r1,\n", ""); - FPS "%-20s nistp521, prime192v1, prime192v2, prime192v3, \n", ""); + FPS "%-20s secp256r1, secp384r1, secp521r1,\n", ""); + FPS "%-20s prime192v1, prime192v2, prime192v3, \n", ""); FPS "%-20s prime239v1, prime239v2, prime239v3, c2pnb163v1, \n", ""); FPS "%-20s c2pnb163v2, c2pnb163v3, c2pnb176v1, c2tnb191v1, \n", ""); - FPS "%-20s c2tnb191v2, c2tnb191v3, c2onb191v4, c2onb191v5, \n", ""); + FPS "%-20s c2tnb191v2, c2tnb191v3, \n", ""); FPS "%-20s c2pnb208w1, c2tnb239v1, c2tnb239v2, c2tnb239v3, \n", ""); - FPS "%-20s c2onb239v4, c2onb239v5, c2pnb272w1, c2pnb304w1, \n", ""); + FPS "%-20s c2pnb272w1, c2pnb304w1, \n", ""); FPS "%-20s c2tnb359w1, c2pnb368w1, c2tnb431r1, secp112r1, \n", ""); FPS "%-20s secp112r2, secp128r1, secp128r2, sect113r1, sect113r2\n", ""); FPS "%-20s sect131r1, sect131r2\n", ""); +#endif /* NSS_ECC_MORE_THAN_SUITE_B */ #endif FPS "%-20s Key database directory (default is ~/.netscape)\n", " -d keydir"); @@ -1299,6 +1303,8 @@ static void LongUsage(char *progName) " -p phone"); FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n", " -a"); + FPS "%-20s \n", + " See -S for available extension options"); FPS "\n"); FPS "%-15s Validate a certificate\n", |