summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_client.c
diff options
context:
space:
mode:
authortb <>2023-12-29 12:06:48 +0000
committertb <>2023-12-29 12:06:48 +0000
commit3bb20b5309c2ee7a1cffbae029be5dbf4306a10b (patch)
tree5c5e36628dffe9c350604857846ae2b19e25713e /src/usr.bin/openssl/s_client.c
parent74f37a921dec4d88238715b69fdd65f00d225fda (diff)
downloadopenbsd-3bb20b5309c2ee7a1cffbae029be5dbf4306a10b.tar.gz
openbsd-3bb20b5309c2ee7a1cffbae029be5dbf4306a10b.tar.bz2
openbsd-3bb20b5309c2ee7a1cffbae029be5dbf4306a10b.zip
s_client: pause hasn't worked in ages. Just ignore it
ok jsing
Diffstat (limited to 'src/usr.bin/openssl/s_client.c')
-rw-r--r--src/usr.bin/openssl/s_client.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index e5a6b006b4..d993f51636 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.62 2023/07/03 08:03:56 beck Exp $ */ 1/* $OpenBSD: s_client.c,v 1.63 2023/12/29 12:06:48 tb 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 *
@@ -223,7 +223,6 @@ static struct {
223 char *npn_in; 223 char *npn_in;
224 unsigned int off; 224 unsigned int off;
225 char *passarg; 225 char *passarg;
226 int pause;
227 int peekaboo; 226 int peekaboo;
228 char *port; 227 char *port;
229 int prexit; 228 int prexit;
@@ -659,9 +658,7 @@ static const struct option s_client_options[] = {
659 }, 658 },
660 { 659 {
661 .name = "pause", 660 .name = "pause",
662 .desc = "Pause 1 second between each read and write call", 661 .type = OPTION_DISCARD,
663 .type = OPTION_FLAG,
664 .opt.flag = &cfg.pause,
665 }, 662 },
666 { 663 {
667 .name = "peekaboo", 664 .name = "peekaboo",
@@ -832,7 +829,7 @@ sc_usage(void)
832 " [-keymatexport label] [-keymatexportlen len] [-legacy_server_connect]\n" 829 " [-keymatexport label] [-keymatexportlen len] [-legacy_server_connect]\n"
833 " [-msg] [-mtu mtu] [-nbio] [-nbio_test] [-no_comp] [-no_ign_eof]\n" 830 " [-msg] [-mtu mtu] [-nbio] [-nbio_test] [-no_comp] [-no_ign_eof]\n"
834 " [-no_legacy_server_connect] [-no_ticket] \n" 831 " [-no_legacy_server_connect] [-no_ticket] \n"
835 " [-no_tls1_2] [-no_tls1_3] [-pass arg] [-pause] [-policy_check]\n" 832 " [-no_tls1_2] [-no_tls1_3] [-pass arg] [-policy_check]\n"
836 " [-port port] [-prexit] [-proxy host:port] [-quiet] [-reconnect]\n" 833 " [-port port] [-prexit] [-proxy host:port] [-quiet] [-reconnect]\n"
837 " [-servername name] [-serverpref] [-sess_in file] [-sess_out file]\n" 834 " [-servername name] [-serverpref] [-sess_in file] [-sess_out file]\n"
838 " [-showcerts] [-starttls protocol] [-state] [-status] [-timeout]\n" 835 " [-showcerts] [-starttls protocol] [-state] [-status] [-timeout]\n"
@@ -1088,8 +1085,6 @@ s_client_main(int argc, char **argv)
1088 goto end; 1085 goto end;
1089 } 1086 }
1090 } 1087 }
1091 if (cfg.pause & 0x01)
1092 SSL_set_debug(con, 1);
1093 1088
1094 if (SSL_is_dtls(con)) { 1089 if (SSL_is_dtls(con)) {
1095 sbio = BIO_new_dgram(s, BIO_NOCLOSE); 1090 sbio = BIO_new_dgram(s, BIO_NOCLOSE);