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

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

diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c
index b0b46a145d..6adac863d5 100644
--- a/src/usr.bin/openssl/ecparam.c
+++ b/src/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecparam.c,v 1.12 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: ecparam.c,v 1.13 2015/09/11 14:30:23 bcook Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -95,7 +95,6 @@ static struct {
 	int asn1_flag;
 	int check;
 	char *curve_name;
-	char *engine;
 	point_conversion_form_t form;
 	int genkey;
 	char *infile;
@@ -161,15 +160,6 @@ struct option ecparam_options[] = {
 		.type = OPTION_ARG_FUNC,
 		.opt.argfunc = ecparam_opt_form,
 	},
-#ifndef OPENSSL_NO_ENGINE
-	{
-		.name = "engine",
-		.argname = "id",
-		.desc = "Use the engine specified by the given identifier",
-		.type = OPTION_ARG,
-		.opt.arg = &ecparam_config.engine,
-	},
-#endif
 	{
 		.name = "genkey",
 		.desc = "Generate an EC private key using the specified "
@@ -252,7 +242,7 @@ static void
 ecparam_usage(void)
 {
 	fprintf(stderr, "usage: ecparam [-C] [-check] [-conv_form arg] "
-	    "[-engine id] [-genkey]\n"
+	    " [-genkey]\n"
 	    "    [-in file] [-inform DER | PEM] [-list_curves] [-name arg]\n"
 	    "    [-no_seed] [-noout] [-out file] [-outform DER | PEM]\n"
 	    "    [-param_enc arg] [-text]\n\n");
@@ -303,10 +293,6 @@ ecparam_main(int argc, char **argv)
 		}
 	}
 
-#ifndef OPENSSL_NO_ENGINE
-	setup_engine(bio_err, ecparam_config.engine, 0);
-#endif
-
 	if (ecparam_config.list_curves) {
 		EC_builtin_curve *curves = NULL;
 		size_t crv_len = 0;
-- 
cgit v1.2.3-55-g6feb