summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkey.c
diff options
context:
space:
mode:
authorjoshua <>2022-11-11 17:07:39 +0000
committerjoshua <>2022-11-11 17:07:39 +0000
commitf8749b129444d560b9e645a68ec7b045800243ed (patch)
tree34334d4d84a0e642e816557dc806adc84e7a2f27 /src/usr.bin/openssl/pkey.c
parentc3cccf93ef7724489b269171de95147b247b7799 (diff)
downloadopenbsd-f8749b129444d560b9e645a68ec7b045800243ed.tar.gz
openbsd-f8749b129444d560b9e645a68ec7b045800243ed.tar.bz2
openbsd-f8749b129444d560b9e645a68ec7b045800243ed.zip
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@
Diffstat (limited to 'src/usr.bin/openssl/pkey.c')
-rw-r--r--src/usr.bin/openssl/pkey.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
index dcddd976b4..2d9b69f5c3 100644
--- a/src/usr.bin/openssl/pkey.c
+++ b/src/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkey.c,v 1.17 2022/01/14 10:17:30 tb Exp $ */ 1/* $OpenBSD: pkey.c,v 1.18 2022/11/11 17:07:39 joshua Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006 3 * project 2006
4 */ 4 */
@@ -221,11 +221,9 @@ pkey_main(int argc, char **argv)
221 char *passin = NULL, *passout = NULL; 221 char *passin = NULL, *passout = NULL;
222 int ret = 1; 222 int ret = 1;
223 223
224 if (single_execution) { 224 if (pledge("stdio cpath wpath rpath tty", NULL) == -1) {
225 if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { 225 perror("pledge");
226 perror("pledge"); 226 exit(1);
227 exit(1);
228 }
229 } 227 }
230 228
231 memset(&pkey_config, 0, sizeof(pkey_config)); 229 memset(&pkey_config, 0, sizeof(pkey_config));