summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkcs12.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/pkcs12.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/pkcs12.c')
-rw-r--r--src/usr.bin/openssl/pkcs12.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index fb8a1f0ea4..6e671e9275 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.23 2022/09/14 16:31:36 tb Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.24 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. 3 * project.
4 */ 4 */
@@ -536,11 +536,9 @@ pkcs12_main(int argc, char **argv)
536 char *cpass = NULL, *mpass = NULL; 536 char *cpass = NULL, *mpass = NULL;
537 char *passin = NULL, *passout = NULL; 537 char *passin = NULL, *passout = NULL;
538 538
539 if (single_execution) { 539 if (pledge("stdio cpath wpath rpath tty", NULL) == -1) {
540 if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { 540 perror("pledge");
541 perror("pledge"); 541 exit(1);
542 exit(1);
543 }
544 } 542 }
545 543
546 memset(&pkcs12_config, 0, sizeof(pkcs12_config)); 544 memset(&pkcs12_config, 0, sizeof(pkcs12_config));