diff options
Diffstat (limited to 'src/usr.bin/openssl/ecparam.c')
| -rw-r--r-- | src/usr.bin/openssl/ecparam.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c index b0b46a145d..6adac863d5 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.12 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: ecparam.c,v 1.13 2015/09/11 14:30:23 bcook Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -95,7 +95,6 @@ static struct { | |||
| 95 | int asn1_flag; | 95 | int asn1_flag; |
| 96 | int check; | 96 | int check; |
| 97 | char *curve_name; | 97 | char *curve_name; |
| 98 | char *engine; | ||
| 99 | point_conversion_form_t form; | 98 | point_conversion_form_t form; |
| 100 | int genkey; | 99 | int genkey; |
| 101 | char *infile; | 100 | char *infile; |
| @@ -161,15 +160,6 @@ struct option ecparam_options[] = { | |||
| 161 | .type = OPTION_ARG_FUNC, | 160 | .type = OPTION_ARG_FUNC, |
| 162 | .opt.argfunc = ecparam_opt_form, | 161 | .opt.argfunc = ecparam_opt_form, |
| 163 | }, | 162 | }, |
| 164 | #ifndef OPENSSL_NO_ENGINE | ||
| 165 | { | ||
| 166 | .name = "engine", | ||
| 167 | .argname = "id", | ||
| 168 | .desc = "Use the engine specified by the given identifier", | ||
| 169 | .type = OPTION_ARG, | ||
| 170 | .opt.arg = &ecparam_config.engine, | ||
| 171 | }, | ||
| 172 | #endif | ||
| 173 | { | 163 | { |
| 174 | .name = "genkey", | 164 | .name = "genkey", |
| 175 | .desc = "Generate an EC private key using the specified " | 165 | .desc = "Generate an EC private key using the specified " |
| @@ -252,7 +242,7 @@ static void | |||
| 252 | ecparam_usage(void) | 242 | ecparam_usage(void) |
| 253 | { | 243 | { |
| 254 | fprintf(stderr, "usage: ecparam [-C] [-check] [-conv_form arg] " | 244 | fprintf(stderr, "usage: ecparam [-C] [-check] [-conv_form arg] " |
| 255 | "[-engine id] [-genkey]\n" | 245 | " [-genkey]\n" |
| 256 | " [-in file] [-inform DER | PEM] [-list_curves] [-name arg]\n" | 246 | " [-in file] [-inform DER | PEM] [-list_curves] [-name arg]\n" |
| 257 | " [-no_seed] [-noout] [-out file] [-outform DER | PEM]\n" | 247 | " [-no_seed] [-noout] [-out file] [-outform DER | PEM]\n" |
| 258 | " [-param_enc arg] [-text]\n\n"); | 248 | " [-param_enc arg] [-text]\n\n"); |
| @@ -303,10 +293,6 @@ ecparam_main(int argc, char **argv) | |||
| 303 | } | 293 | } |
| 304 | } | 294 | } |
| 305 | 295 | ||
| 306 | #ifndef OPENSSL_NO_ENGINE | ||
| 307 | setup_engine(bio_err, ecparam_config.engine, 0); | ||
| 308 | #endif | ||
| 309 | |||
| 310 | if (ecparam_config.list_curves) { | 296 | if (ecparam_config.list_curves) { |
| 311 | EC_builtin_curve *curves = NULL; | 297 | EC_builtin_curve *curves = NULL; |
| 312 | size_t crv_len = 0; | 298 | size_t crv_len = 0; |
