diff options
Diffstat (limited to 'src/usr.bin/openssl/dhparam.c')
| -rw-r--r-- | src/usr.bin/openssl/dhparam.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/dhparam.c b/src/usr.bin/openssl/dhparam.c index 5757b906b1..158a07a572 100644 --- a/src/usr.bin/openssl/dhparam.c +++ b/src/usr.bin/openssl/dhparam.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dhparam.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: dhparam.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 | * |
| @@ -135,9 +135,6 @@ struct { | |||
| 135 | int C; | 135 | int C; |
| 136 | int check; | 136 | int check; |
| 137 | int dsaparam; | 137 | int dsaparam; |
| 138 | #ifndef OPENSSL_NO_ENGINE | ||
| 139 | char *engine; | ||
| 140 | #endif | ||
| 141 | int g; | 138 | int g; |
| 142 | char *infile; | 139 | char *infile; |
| 143 | int informat; | 140 | int informat; |
| @@ -181,15 +178,6 @@ struct option dhparam_options[] = { | |||
| 181 | .type = OPTION_FLAG, | 178 | .type = OPTION_FLAG, |
| 182 | .opt.flag = &dhparam_config.dsaparam, | 179 | .opt.flag = &dhparam_config.dsaparam, |
| 183 | }, | 180 | }, |
| 184 | #ifndef OPENSSL_NO_ENGINE | ||
| 185 | { | ||
| 186 | .name = "engine", | ||
| 187 | .argname = "id", | ||
| 188 | .desc = "Use the engine specified by the given identifier", | ||
| 189 | .type = OPTION_ARG, | ||
| 190 | .opt.arg = &dhparam_config.engine, | ||
| 191 | }, | ||
| 192 | #endif | ||
| 193 | { | 181 | { |
| 194 | .name = "in", | 182 | .name = "in", |
| 195 | .argname = "file", | 183 | .argname = "file", |
| @@ -237,7 +225,7 @@ static void | |||
| 237 | dhparam_usage() | 225 | dhparam_usage() |
| 238 | { | 226 | { |
| 239 | fprintf(stderr, | 227 | fprintf(stderr, |
| 240 | "usage: dhparam [-2 | -5] [-C] [-check] [-dsaparam] [-engine id]\n" | 228 | "usage: dhparam [-2 | -5] [-C] [-check] [-dsaparam]\n" |
| 241 | " [-in file] [-inform DER | PEM] [-noout] [-out file]\n" | 229 | " [-in file] [-inform DER | PEM] [-noout] [-out file]\n" |
| 242 | " [-outform DER | PEM] [-text] [numbits]\n\n"); | 230 | " [-outform DER | PEM] [-text] [numbits]\n\n"); |
| 243 | options_usage(dhparam_options); | 231 | options_usage(dhparam_options); |
| @@ -273,10 +261,6 @@ dhparam_main(int argc, char **argv) | |||
| 273 | } | 261 | } |
| 274 | } | 262 | } |
| 275 | 263 | ||
| 276 | #ifndef OPENSSL_NO_ENGINE | ||
| 277 | setup_engine(bio_err, dhparam_config.engine, 0); | ||
| 278 | #endif | ||
| 279 | |||
| 280 | if (dhparam_config.g && !num) | 264 | if (dhparam_config.g && !num) |
| 281 | num = DEFBITS; | 265 | num = DEFBITS; |
| 282 | 266 | ||
