diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-03 11:13:18 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-03 11:13:18 +0200 |
| commit | 393c8fd2ac0e7e19fe401992c338439a4ef08c70 (patch) | |
| tree | 06292d0a962a983d4f16ce1f726a03305a365dbc /cmd/certutil | |
| parent | f3f1f612db7a07522905e00ea5f17dfd277c34e0 (diff) | |
| download | nss-hg-393c8fd2ac0e7e19fe401992c338439a4ef08c70.tar.gz | |
Bug 1253912 - drop more than suite b support, r=mt,rrelyea
Diffstat (limited to 'cmd/certutil')
| -rw-r--r-- | cmd/certutil/certutil.c | 5 | ||||
| -rw-r--r-- | cmd/certutil/keystuff.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmd/certutil/certutil.c b/cmd/certutil/certutil.c index 60bcc0b82..ea18692af 100644 --- a/cmd/certutil/certutil.c +++ b/cmd/certutil/certutil.c @@ -1262,8 +1262,8 @@ luG(enum usage_level ul, const char *command) #ifndef NSS_DISABLE_ECC FPS "%-20s Elliptic curve name (ec only)\n", " -q curve-name"); - FPS "%-20s One of nistp256, nistp384, nistp521, curve25519\n", ""); -#ifdef NSS_ECC_MORE_THAN_SUITE_B + FPS "%-20s One of nistp256, nistp384, nistp521, curve25519.\n", ""); + FPS "%-20s If a custom token is present, the following curves are also supported:\n", ""); FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", ""); FPS "%-20s nistb163, sect193r1, sect193r2, sect233k1, nistk233,\n", ""); FPS "%-20s sect233r1, nistb233, sect239k1, sect283k1, nistk283,\n", ""); @@ -1281,7 +1281,6 @@ luG(enum usage_level ul, const char *command) 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"); diff --git a/cmd/certutil/keystuff.c b/cmd/certutil/keystuff.c index 4c25e4e57..268ad471a 100644 --- a/cmd/certutil/keystuff.c +++ b/cmd/certutil/keystuff.c @@ -393,9 +393,6 @@ typedef struct curveNameTagPairStr { SECOidTag curveOidTag; } CurveNameTagPair; -#define DEFAULT_CURVE_OID_TAG SEC_OID_SECG_EC_SECP192R1 -/* #define DEFAULT_CURVE_OID_TAG SEC_OID_SECG_EC_SECP160R1 */ - static CurveNameTagPair nameTagPair[] = { { "sect163k1", SEC_OID_SECG_EC_SECT163K1 }, |