diff options
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/dh.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/dh.c b/src/usr.bin/openssl/dh.c index ed86428258..f4112e87c2 100644 --- a/src/usr.bin/openssl/dh.c +++ b/src/usr.bin/openssl/dh.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dh.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: dh.c,v 1.6 2015/09/11 14:30:23 bcook Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -77,9 +77,6 @@ | |||
77 | static struct { | 77 | static struct { |
78 | int C; | 78 | int C; |
79 | int check; | 79 | int check; |
80 | #ifndef OPENSSL_NO_ENGINE | ||
81 | char *engine; | ||
82 | #endif | ||
83 | char *infile; | 80 | char *infile; |
84 | int informat; | 81 | int informat; |
85 | int noout; | 82 | int noout; |
@@ -101,15 +98,6 @@ static struct option dh_options[] = { | |||
101 | .type = OPTION_FLAG, | 98 | .type = OPTION_FLAG, |
102 | .opt.flag = &dh_config.check, | 99 | .opt.flag = &dh_config.check, |
103 | }, | 100 | }, |
104 | #ifndef OPENSSL_NO_ENGINE | ||
105 | { | ||
106 | .name = "engine", | ||
107 | .argname = "id", | ||
108 | .desc = "Use the engine specified by the given identifier", | ||
109 | .type = OPTION_ARG, | ||
110 | .opt.arg = &dh_config.engine, | ||
111 | }, | ||
112 | #endif | ||
113 | { | 101 | { |
114 | .name = "in", | 102 | .name = "in", |
115 | .argname = "file", | 103 | .argname = "file", |
@@ -157,7 +145,7 @@ static void | |||
157 | dh_usage(void) | 145 | dh_usage(void) |
158 | { | 146 | { |
159 | fprintf(stderr, | 147 | fprintf(stderr, |
160 | "usage: dh [-C] [-check] [-engine id] [-in file] [-inform format]\n" | 148 | "usage: dh [-C] [-check] [-in file] [-inform format]\n" |
161 | " [-noout] [-out file] [-outform format] [-text]\n\n"); | 149 | " [-noout] [-out file] [-outform format] [-text]\n\n"); |
162 | options_usage(dh_options); | 150 | options_usage(dh_options); |
163 | } | 151 | } |
@@ -180,10 +168,6 @@ dh_main(int argc, char **argv) | |||
180 | goto end; | 168 | goto end; |
181 | } | 169 | } |
182 | 170 | ||
183 | #ifndef OPENSSL_NO_ENGINE | ||
184 | setup_engine(bio_err, dh_config.engine, 0); | ||
185 | #endif | ||
186 | |||
187 | in = BIO_new(BIO_s_file()); | 171 | in = BIO_new(BIO_s_file()); |
188 | out = BIO_new(BIO_s_file()); | 172 | out = BIO_new(BIO_s_file()); |
189 | if (in == NULL || out == NULL) { | 173 | if (in == NULL || out == NULL) { |