summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/gendsa.c
diff options
context:
space:
mode:
authorbcook <>2015-09-11 14:30:23 +0000
committerbcook <>2015-09-11 14:30:23 +0000
commite2fad4e6bdd4e404b3f4c186de52078738af2271 (patch)
treecc1109842924cab95a77b6863b32de51b6d4f960 /src/usr.bin/openssl/gendsa.c
parent7cea1ef22b79637be449efa70b99c6deaf74ef10 (diff)
downloadopenbsd-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/gendsa.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/usr.bin/openssl/gendsa.c b/src/usr.bin/openssl/gendsa.c
index 4fbd0dce31..ee2d6ba1b6 100644
--- a/src/usr.bin/openssl/gendsa.c
+++ b/src/usr.bin/openssl/gendsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gendsa.c,v 1.3 2015/09/10 02:17:17 lteo Exp $ */ 1/* $OpenBSD: gendsa.c,v 1.4 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 *
@@ -84,9 +84,6 @@ gendsa_main(int argc, char **argv)
84 char *passargout = NULL, *passout = NULL; 84 char *passargout = NULL, *passout = NULL;
85 BIO *out = NULL, *in = NULL; 85 BIO *out = NULL, *in = NULL;
86 const EVP_CIPHER *enc = NULL; 86 const EVP_CIPHER *enc = NULL;
87#ifndef OPENSSL_NO_ENGINE
88 char *engine = NULL;
89#endif
90 87
91 argv++; 88 argv++;
92 argc--; 89 argc--;
@@ -102,13 +99,6 @@ gendsa_main(int argc, char **argv)
102 goto bad; 99 goto bad;
103 passargout = *(++argv); 100 passargout = *(++argv);
104 } 101 }
105#ifndef OPENSSL_NO_ENGINE
106 else if (strcmp(*argv, "-engine") == 0) {
107 if (--argc < 1)
108 goto bad;
109 engine = *(++argv);
110 }
111#endif
112 else if (strcmp(*argv, "-") == 0) 102 else if (strcmp(*argv, "-") == 0)
113 goto bad; 103 goto bad;
114#ifndef OPENSSL_NO_DES 104#ifndef OPENSSL_NO_DES
@@ -164,17 +154,10 @@ bad:
164 BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n"); 154 BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
165 BIO_printf(bio_err, " encrypt PEM output with cbc camellia\n"); 155 BIO_printf(bio_err, " encrypt PEM output with cbc camellia\n");
166#endif 156#endif
167#ifndef OPENSSL_NO_ENGINE
168 BIO_printf(bio_err, " -engine e - use engine e, possibly a hardware device.\n");
169#endif
170 BIO_printf(bio_err, " dsaparam-file\n"); 157 BIO_printf(bio_err, " dsaparam-file\n");
171 BIO_printf(bio_err, " - a DSA parameter file as generated by the dsaparam command\n"); 158 BIO_printf(bio_err, " - a DSA parameter file as generated by the dsaparam command\n");
172 goto end; 159 goto end;
173 } 160 }
174#ifndef OPENSSL_NO_ENGINE
175 setup_engine(bio_err, engine, 0);
176#endif
177
178 if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) { 161 if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
179 BIO_printf(bio_err, "Error getting password\n"); 162 BIO_printf(bio_err, "Error getting password\n");
180 goto end; 163 goto end;