summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_server.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/s_server.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/s_server.c')
-rw-r--r--src/usr.bin/openssl/s_server.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 9b06856ac9..adf98451ec 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_server.c,v 1.54 2021/12/06 11:06:58 tb Exp $ */ 1/* $OpenBSD: s_server.c,v 1.55 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 *
@@ -1081,11 +1081,9 @@ s_server_main(int argc, char *argv[])
1081 X509 *s_cert2 = NULL; 1081 X509 *s_cert2 = NULL;
1082 tlsextalpnctx alpn_ctx = { NULL, 0 }; 1082 tlsextalpnctx alpn_ctx = { NULL, 0 };
1083 1083
1084 if (single_execution) { 1084 if (pledge("stdio rpath inet dns tty", NULL) == -1) {
1085 if (pledge("stdio rpath inet dns tty", NULL) == -1) { 1085 perror("pledge");
1086 perror("pledge"); 1086 exit(1);
1087 exit(1);
1088 }
1089 } 1087 }
1090 1088
1091 memset(&s_server_config, 0, sizeof(s_server_config)); 1089 memset(&s_server_config, 0, sizeof(s_server_config));