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/s_client.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/s_client.c')
-rw-r--r-- | src/usr.bin/openssl/s_client.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index 15ebb0c0a7..41f6502325 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_client.c,v 1.58 2022/02/03 17:44:04 tb Exp $ */ | 1 | /* $OpenBSD: s_client.c,v 1.59 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 | * |
@@ -923,11 +923,9 @@ s_client_main(int argc, char **argv) | |||
923 | struct sockaddr_storage peer; | 923 | struct sockaddr_storage peer; |
924 | int peerlen = sizeof(peer); | 924 | int peerlen = sizeof(peer); |
925 | 925 | ||
926 | if (single_execution) { | 926 | if (pledge("stdio cpath wpath rpath inet dns tty", NULL) == -1) { |
927 | if (pledge("stdio cpath wpath rpath inet dns tty", NULL) == -1) { | 927 | perror("pledge"); |
928 | perror("pledge"); | 928 | exit(1); |
929 | exit(1); | ||
930 | } | ||
931 | } | 929 | } |
932 | 930 | ||
933 | memset(&s_client_config, 0, sizeof(s_client_config)); | 931 | memset(&s_client_config, 0, sizeof(s_client_config)); |