diff options
author | bcook <> | 2015-09-11 14:30:23 +0000 |
---|---|---|
committer | bcook <> | 2015-09-11 14:30:23 +0000 |
commit | e2fad4e6bdd4e404b3f4c186de52078738af2271 (patch) | |
tree | cc1109842924cab95a77b6863b32de51b6d4f960 /src/usr.bin/openssl/gendh.c | |
parent | 7cea1ef22b79637be449efa70b99c6deaf74ef10 (diff) | |
download | openbsd-e2fad4e6bdd4e404b3f4c186de52078738af2271.tar.gz openbsd-e2fad4e6bdd4e404b3f4c186de52078738af2271.tar.bz2 openbsd-e2fad4e6bdd4e404b3f4c186de52078738af2271.zip |
Remove engine command and parameters from openssl(1).
We do not have any builtin or dynamic engines, meaning openssl(1) has
no way to use the engine command or parameters at all.
ok jsing@
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/gendh.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/gendh.c b/src/usr.bin/openssl/gendh.c index 38186f0307..208906e24c 100644 --- a/src/usr.bin/openssl/gendh.c +++ b/src/usr.bin/openssl/gendh.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gendh.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: gendh.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 | * |
@@ -87,9 +87,6 @@ | |||
87 | static int dh_cb(int p, int n, BN_GENCB * cb); | 87 | static int dh_cb(int p, int n, BN_GENCB * cb); |
88 | 88 | ||
89 | static struct { | 89 | static struct { |
90 | #ifndef OPENSSL_NO_ENGINE | ||
91 | char *engine; | ||
92 | #endif | ||
93 | int g; | 90 | int g; |
94 | char *outfile; | 91 | char *outfile; |
95 | } gendh_config; | 92 | } gendh_config; |
@@ -110,15 +107,6 @@ static struct option gendh_options[] = { | |||
110 | .value = 5, | 107 | .value = 5, |
111 | .opt.value = &gendh_config.g, | 108 | .opt.value = &gendh_config.g, |
112 | }, | 109 | }, |
113 | #ifndef OPENSSL_NO_ENGINE | ||
114 | { | ||
115 | .name = "engine", | ||
116 | .argname = "id", | ||
117 | .desc = "Use the engine specified by the given identifier", | ||
118 | .type = OPTION_ARG, | ||
119 | .opt.arg = &gendh_config.engine, | ||
120 | }, | ||
121 | #endif | ||
122 | { | 110 | { |
123 | .name = "out", | 111 | .name = "out", |
124 | .argname = "file", | 112 | .argname = "file", |
@@ -133,7 +121,7 @@ static void | |||
133 | gendh_usage(void) | 121 | gendh_usage(void) |
134 | { | 122 | { |
135 | fprintf(stderr, | 123 | fprintf(stderr, |
136 | "usage: gendh [-2 | -5] [-engine id] [-out file] [numbits]\n\n"); | 124 | "usage: gendh [-2 | -5] [-out file] [numbits]\n\n"); |
137 | options_usage(gendh_options); | 125 | options_usage(gendh_options); |
138 | } | 126 | } |
139 | 127 | ||
@@ -166,10 +154,6 @@ gendh_main(int argc, char **argv) | |||
166 | } | 154 | } |
167 | } | 155 | } |
168 | 156 | ||
169 | #ifndef OPENSSL_NO_ENGINE | ||
170 | setup_engine(bio_err, gendh_config.engine, 0); | ||
171 | #endif | ||
172 | |||
173 | out = BIO_new(BIO_s_file()); | 157 | out = BIO_new(BIO_s_file()); |
174 | if (out == NULL) { | 158 | if (out == NULL) { |
175 | ERR_print_errors(bio_err); | 159 | ERR_print_errors(bio_err); |