From f8749b129444d560b9e645a68ec7b045800243ed Mon Sep 17 00:00:00 2001
From: joshua <>
Date: Fri, 11 Nov 2022 17:07:39 +0000
Subject: Remove the legacy interactive mode from openssl(1).

This removes the legacy interactive mode from openssl(1) since it is
rarely used, complicates the code, and has also been removed from
OpenSSL in version 3.x.x.

ok tb@ jsing@
---
 src/usr.bin/openssl/certhash.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/src/usr.bin/openssl/certhash.c b/src/usr.bin/openssl/certhash.c
index a4417a2b26..785f1216ad 100644
--- a/src/usr.bin/openssl/certhash.c
+++ b/src/usr.bin/openssl/certhash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: certhash.c,v 1.19 2021/10/23 08:13:48 tb Exp $ */
+/*	$OpenBSD: certhash.c,v 1.20 2022/11/11 17:07:38 joshua Exp $ */
 /*
  * Copyright (c) 2014, 2015 Joel Sing <jsing@openbsd.org>
  *
@@ -653,11 +653,9 @@ certhash_main(int argc, char **argv)
 	int argsused;
 	int i, cwdfd, ret = 0;
 
-	if (single_execution) {
-		if (pledge("stdio cpath wpath rpath", NULL) == -1) {
-			perror("pledge");
-			exit(1);
-		}
+	if (pledge("stdio cpath wpath rpath", NULL) == -1) {
+		perror("pledge");
+		exit(1);
 	}
 
 	memset(&certhash_config, 0, sizeof(certhash_config));
-- 
cgit v1.2.3-55-g6feb