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/ec.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

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

diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index b593e2b4a1..d5fe68f0d8 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: ec.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -75,9 +75,6 @@
 static struct {
 	int asn1_flag;
 	const EVP_CIPHER *enc;
-#ifndef OPENSSL_NO_ENGINE
-	char *engine;
-#endif
 	point_conversion_form_t form;
 	char *infile;
 	int informat;
@@ -153,15 +150,6 @@ static struct option ec_options[] = {
 		.type = OPTION_ARG_FUNC,
 		.opt.argfunc = ec_opt_form,
 	},
-#ifndef OPENSSL_NO_ENGINE
-	{
-		.name = "engine",
-		.argname = "id",
-		.desc = "Use the engine specified by the given identifier",
-		.type = OPTION_ARG,
-		.opt.arg = &ec_config.engine,
-	},
-#endif
 	{
 		.name = "in",
 		.argname = "file",
@@ -266,7 +254,7 @@ static void
 ec_usage(void)
 {
 	fprintf(stderr,
-	    "usage: ec [-conv_form form] [-engine id] [-in file]\n"
+	    "usage: ec [-conv_form form] [-in file]\n"
 	    "    [-inform format] [-noout] [-out file] [-outform format]\n"
 	    "    [-param_enc type] [-param_out] [-passin file]\n"
 	    "    [-passout file] [-pubin] [-pubout] [-text] [-ciphername]\n\n");
@@ -301,10 +289,6 @@ ec_main(int argc, char **argv)
 		goto end;
 	}
 
-#ifndef OPENSSL_NO_ENGINE
-	setup_engine(bio_err, ec_config.engine, 0);
-#endif
-
 	if (!app_passwd(bio_err, ec_config.passargin, ec_config.passargout,
 	    &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
-- 
cgit v1.2.3-55-g6feb