diff options
author | joshua <> | 2022-11-11 17:07:39 +0000 |
---|---|---|
committer | joshua <> | 2022-11-11 17:07:39 +0000 |
commit | f8749b129444d560b9e645a68ec7b045800243ed (patch) | |
tree | 34334d4d84a0e642e816557dc806adc84e7a2f27 /src/usr.bin/openssl/pkcs8.c | |
parent | c3cccf93ef7724489b269171de95147b247b7799 (diff) | |
download | openbsd-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/pkcs8.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs8.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c index 0629b20c37..ea12230006 100644 --- a/src/usr.bin/openssl/pkcs8.c +++ b/src/usr.bin/openssl/pkcs8.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs8.c,v 1.14 2019/07/14 03:30:46 guenther Exp $ */ | 1 | /* $OpenBSD: pkcs8.c,v 1.15 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 1999-2004. | 3 | * project 1999-2004. |
4 | */ | 4 | */ |
@@ -203,11 +203,9 @@ pkcs8_main(int argc, char **argv) | |||
203 | char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL; | 203 | char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL; |
204 | int ret = 1; | 204 | int ret = 1; |
205 | 205 | ||
206 | if (single_execution) { | 206 | if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { |
207 | if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { | 207 | perror("pledge"); |
208 | perror("pledge"); | 208 | exit(1); |
209 | exit(1); | ||
210 | } | ||
211 | } | 209 | } |
212 | 210 | ||
213 | memset(&pkcs8_config, 0, sizeof(pkcs8_config)); | 211 | memset(&pkcs8_config, 0, sizeof(pkcs8_config)); |