===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ecparam.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/openssl/ecparam.c	2015/08/22 16:36:05	1.12
+++ src/usr.bin/openssl/ecparam.c	2015/09/11 14:30:23	1.13
@@ -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 @@
 	int asn1_flag;
 	int check;
 	char *curve_name;
-	char *engine;
 	point_conversion_form_t form;
 	int genkey;
 	char *infile;
@@ -161,16 +160,7 @@
 		.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 "
 		    "parameters",
@@ -252,7 +242,7 @@
 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");
@@ -302,10 +292,6 @@
 			goto end;
 		}
 	}
-
-#ifndef OPENSSL_NO_ENGINE
-	setup_engine(bio_err, ecparam_config.engine, 0);
-#endif
 
 	if (ecparam_config.list_curves) {
 		EC_builtin_curve *curves = NULL;