From e2fad4e6bdd4e404b3f4c186de52078738af2271 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Fri, 11 Sep 2015 14:30:23 +0000
Subject: 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@
---
 src/usr.bin/openssl/dh.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/usr.bin/openssl/dh.c')

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 @@
-/* $OpenBSD: dh.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: dh.c,v 1.6 2015/09/11 14:30:23 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -77,9 +77,6 @@
 static struct {
 	int C;
 	int check;
-#ifndef OPENSSL_NO_ENGINE
-	char *engine;
-#endif
 	char *infile;
 	int informat;
 	int noout;
@@ -101,15 +98,6 @@ static struct option dh_options[] = {
 		.type = OPTION_FLAG,
 		.opt.flag = &dh_config.check,
 	},
-#ifndef OPENSSL_NO_ENGINE
-	{
-		.name = "engine",
-		.argname = "id",
-		.desc = "Use the engine specified by the given identifier",
-		.type = OPTION_ARG,
-		.opt.arg = &dh_config.engine,
-	},
-#endif
 	{
 		.name = "in",
 		.argname = "file",
@@ -157,7 +145,7 @@ static void
 dh_usage(void)
 {
 	fprintf(stderr,
-	    "usage: dh [-C] [-check] [-engine id] [-in file] [-inform format]\n"
+	    "usage: dh [-C] [-check] [-in file] [-inform format]\n"
 	    "    [-noout] [-out file] [-outform format] [-text]\n\n");
 	options_usage(dh_options);
 }
@@ -180,10 +168,6 @@ dh_main(int argc, char **argv)
 		goto end;
 	}
 
-#ifndef OPENSSL_NO_ENGINE
-	setup_engine(bio_err, dh_config.engine, 0);
-#endif
-
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
 	if (in == NULL || out == NULL) {
-- 
cgit v1.2.3-55-g6feb