diff options
author | jsing <> | 2015-06-20 14:24:49 +0000 |
---|---|---|
committer | jsing <> | 2015-06-20 14:24:49 +0000 |
commit | ab552fd24b77fd8885d1954a891b7db3d23c2568 (patch) | |
tree | d3bc54ca2f7eded3a6f5fc0f7b485cfecc7d9238 /src/usr.bin/openssl/ecparam.c | |
parent | e7d127f236d90dac15f77aaf82102435d5789117 (diff) | |
download | openbsd-ab552fd24b77fd8885d1954a891b7db3d23c2568.tar.gz openbsd-ab552fd24b77fd8885d1954a891b7db3d23c2568.tar.bz2 openbsd-ab552fd24b77fd8885d1954a891b7db3d23c2568.zip |
Handle NIST curve names in openssl(1) ecparam.
From OpenSSL.
Diffstat (limited to 'src/usr.bin/openssl/ecparam.c')
-rw-r--r-- | src/usr.bin/openssl/ecparam.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c index c958c1f51b..5922c1803a 100644 --- a/src/usr.bin/openssl/ecparam.c +++ b/src/usr.bin/openssl/ecparam.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecparam.c,v 1.8 2014/12/28 15:48:52 jsing Exp $ */ | 1 | /* $OpenBSD: ecparam.c,v 1.9 2015/06/20 14:24:49 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -361,6 +361,9 @@ ecparam_main(int argc, char **argv) | |||
361 | } else | 361 | } else |
362 | nid = OBJ_sn2nid(ecparam_config.curve_name); | 362 | nid = OBJ_sn2nid(ecparam_config.curve_name); |
363 | 363 | ||
364 | if (nid == 0) | ||
365 | nid = EC_curve_nist2nid(ecparam_config.curve_name); | ||
366 | |||
364 | if (nid == 0) { | 367 | if (nid == 0) { |
365 | BIO_printf(bio_err, "unknown curve name (%s)\n", | 368 | BIO_printf(bio_err, "unknown curve name (%s)\n", |
366 | ecparam_config.curve_name); | 369 | ecparam_config.curve_name); |