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/cms.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/cms.c')
-rw-r--r-- | src/usr.bin/openssl/cms.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c index a3004e8af3..e3f4aaf3a8 100644 --- a/src/usr.bin/openssl/cms.c +++ b/src/usr.bin/openssl/cms.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms.c,v 1.30 2022/03/23 15:16:59 tb Exp $ */ | 1 | /* $OpenBSD: cms.c,v 1.31 2022/11/11 17:07:38 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 | */ |
@@ -1165,11 +1165,9 @@ cms_main(int argc, char **argv) | |||
1165 | char *passin = NULL; | 1165 | char *passin = NULL; |
1166 | unsigned char *pwri_tmp = NULL; | 1166 | unsigned char *pwri_tmp = NULL; |
1167 | 1167 | ||
1168 | if (single_execution) { | 1168 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) { |
1169 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) { | 1169 | perror("pledge"); |
1170 | perror("pledge"); | 1170 | exit(1); |
1171 | exit(1); | ||
1172 | } | ||
1173 | } | 1171 | } |
1174 | 1172 | ||
1175 | memset(&cms_config, 0, sizeof(cms_config)); | 1173 | memset(&cms_config, 0, sizeof(cms_config)); |