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/pkcs7.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/pkcs7.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs7.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/pkcs7.c b/src/usr.bin/openssl/pkcs7.c index 4c184911c9..4f0c529424 100644 --- a/src/usr.bin/openssl/pkcs7.c +++ b/src/usr.bin/openssl/pkcs7.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs7.c,v 1.11 2019/07/14 03:30:46 guenther Exp $ */ | 1 | /* $OpenBSD: pkcs7.c,v 1.12 2022/11/11 17:07:39 joshua Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -154,11 +154,9 @@ pkcs7_main(int argc, char **argv) | |||
154 | int ret = 1; | 154 | int ret = 1; |
155 | int i; | 155 | int i; |
156 | 156 | ||
157 | if (single_execution) { | 157 | if (pledge("stdio cpath wpath rpath", NULL) == -1) { |
158 | if (pledge("stdio cpath wpath rpath", NULL) == -1) { | 158 | perror("pledge"); |
159 | perror("pledge"); | 159 | exit(1); |
160 | exit(1); | ||
161 | } | ||
162 | } | 160 | } |
163 | 161 | ||
164 | memset(&pkcs7_config, 0, sizeof(pkcs7_config)); | 162 | memset(&pkcs7_config, 0, sizeof(pkcs7_config)); |