summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/ec.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/usr.bin/openssl/ec.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index b593e2b4a1..d5fe68f0d8 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */ 1/* $OpenBSD: ec.c,v 1.5 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 */
@@ -75,9 +75,6 @@
75static struct { 75static struct {
76 int asn1_flag; 76 int asn1_flag;
77 const EVP_CIPHER *enc; 77 const EVP_CIPHER *enc;
78#ifndef OPENSSL_NO_ENGINE
79 char *engine;
80#endif
81 point_conversion_form_t form; 78 point_conversion_form_t form;
82 char *infile; 79 char *infile;
83 int informat; 80 int informat;
@@ -153,15 +150,6 @@ static struct option ec_options[] = {
153 .type = OPTION_ARG_FUNC, 150 .type = OPTION_ARG_FUNC,
154 .opt.argfunc = ec_opt_form, 151 .opt.argfunc = ec_opt_form,
155 }, 152 },
156#ifndef OPENSSL_NO_ENGINE
157 {
158 .name = "engine",
159 .argname = "id",
160 .desc = "Use the engine specified by the given identifier",
161 .type = OPTION_ARG,
162 .opt.arg = &ec_config.engine,
163 },
164#endif
165 { 153 {
166 .name = "in", 154 .name = "in",
167 .argname = "file", 155 .argname = "file",
@@ -266,7 +254,7 @@ static void
266ec_usage(void) 254ec_usage(void)
267{ 255{
268 fprintf(stderr, 256 fprintf(stderr,
269 "usage: ec [-conv_form form] [-engine id] [-in file]\n" 257 "usage: ec [-conv_form form] [-in file]\n"
270 " [-inform format] [-noout] [-out file] [-outform format]\n" 258 " [-inform format] [-noout] [-out file] [-outform format]\n"
271 " [-param_enc type] [-param_out] [-passin file]\n" 259 " [-param_enc type] [-param_out] [-passin file]\n"
272 " [-passout file] [-pubin] [-pubout] [-text] [-ciphername]\n\n"); 260 " [-passout file] [-pubin] [-pubout] [-text] [-ciphername]\n\n");
@@ -301,10 +289,6 @@ ec_main(int argc, char **argv)
301 goto end; 289 goto end;
302 } 290 }
303 291
304#ifndef OPENSSL_NO_ENGINE
305 setup_engine(bio_err, ec_config.engine, 0);
306#endif
307
308 if (!app_passwd(bio_err, ec_config.passargin, ec_config.passargout, 292 if (!app_passwd(bio_err, ec_config.passargin, ec_config.passargout,
309 &passin, &passout)) { 293 &passin, &passout)) {
310 BIO_printf(bio_err, "Error getting passwords\n"); 294 BIO_printf(bio_err, "Error getting passwords\n");