diff options
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/dsaparam.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/dsaparam.c b/src/usr.bin/openssl/dsaparam.c index 66cacbb3a9..0cdd5c1d51 100644 --- a/src/usr.bin/openssl/dsaparam.c +++ b/src/usr.bin/openssl/dsaparam.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsaparam.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: dsaparam.c,v 1.5 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 | * |
@@ -81,9 +81,6 @@ | |||
81 | 81 | ||
82 | static struct { | 82 | static struct { |
83 | int C; | 83 | int C; |
84 | #ifndef OPENSSL_NO_ENGINE | ||
85 | char *engine; | ||
86 | #endif | ||
87 | int genkey; | 84 | int genkey; |
88 | char *infile; | 85 | char *infile; |
89 | int informat; | 86 | int informat; |
@@ -100,15 +97,6 @@ static struct option dsaparam_options[] = { | |||
100 | .type = OPTION_FLAG, | 97 | .type = OPTION_FLAG, |
101 | .opt.flag = &dsaparam_config.C, | 98 | .opt.flag = &dsaparam_config.C, |
102 | }, | 99 | }, |
103 | #ifndef OPENSSL_NO_ENGINE | ||
104 | { | ||
105 | .name = "engine", | ||
106 | .argname = "id", | ||
107 | .desc = "Use the engine specified by the given identifier", | ||
108 | .type = OPTION_ARG, | ||
109 | .opt.arg = &dsaparam_config.engine, | ||
110 | }, | ||
111 | #endif | ||
112 | { | 100 | { |
113 | .name = "genkey", | 101 | .name = "genkey", |
114 | .desc = "Generate a DSA key", | 102 | .desc = "Generate a DSA key", |
@@ -162,7 +150,7 @@ static void | |||
162 | dsaparam_usage(void) | 150 | dsaparam_usage(void) |
163 | { | 151 | { |
164 | fprintf(stderr, | 152 | fprintf(stderr, |
165 | "usage: dsaparam [-C] [-engine id] [-genkey] [-in file]\n" | 153 | "usage: dsaparam [-C] [-genkey] [-in file]\n" |
166 | " [-inform format] [-noout] [-out file] [-outform format]\n" | 154 | " [-inform format] [-noout] [-out file] [-outform format]\n" |
167 | " [-text] [numbits]\n\n"); | 155 | " [-text] [numbits]\n\n"); |
168 | options_usage(dsaparam_options); | 156 | options_usage(dsaparam_options); |
@@ -222,10 +210,6 @@ dsaparam_main(int argc, char **argv) | |||
222 | } | 210 | } |
223 | } | 211 | } |
224 | 212 | ||
225 | #ifndef OPENSSL_NO_ENGINE | ||
226 | setup_engine(bio_err, dsaparam_config.engine, 0); | ||
227 | #endif | ||
228 | |||
229 | if (numbits > 0) { | 213 | if (numbits > 0) { |
230 | BN_GENCB cb; | 214 | BN_GENCB cb; |
231 | BN_GENCB_set(&cb, dsa_cb, bio_err); | 215 | BN_GENCB_set(&cb, dsa_cb, bio_err); |