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

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

diff --git a/src/usr.bin/openssl/rand.c b/src/usr.bin/openssl/rand.c
index b021b4ec7c..b0df4eb1b5 100644
--- a/src/usr.bin/openssl/rand.c
+++ b/src/usr.bin/openssl/rand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rand.c,v 1.7 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: rand.c,v 1.8 2015/09/11 14:30:23 bcook Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -64,7 +64,6 @@
 
 struct {
 	int base64;
-	char *engine;
 	int hex;
 	char *outfile;
 } rand_config;
@@ -76,15 +75,6 @@ struct option rand_options[] = {
 		.type = OPTION_FLAG,
 		.opt.flag = &rand_config.base64,
 	},
-#ifndef OPENSSL_NO_ENGINE
-	{
-		.name = "engine",
-		.argname = "id",
-		.desc = "Use the engine specified by the given identifier",
-		.type = OPTION_ARG,
-		.opt.arg = &rand_config.engine,
-	},
-#endif
 	{
 		.name = "hex",
 		.desc = "Hexadecimal output",
@@ -105,7 +95,7 @@ static void
 rand_usage()
 {
 	fprintf(stderr,
-	    "usage: rand [-base64 | -hex] [-engine id] [-out file] num\n");
+	    "usage: rand [-base64 | -hex] [-out file] num\n");
 	options_usage(rand_options);
 }
 
@@ -141,10 +131,6 @@ rand_main(int argc, char **argv)
 		goto err;
 	}
 
-#ifndef OPENSSL_NO_ENGINE
-	setup_engine(bio_err, rand_config.engine, 0);
-#endif
-
 	out = BIO_new(BIO_s_file());
 	if (out == NULL)
 		goto err;
-- 
cgit v1.2.3-55-g6feb