From: tb <tb@openbsd.org>
Date: Fri, 29 Dec 2023 12:06:48 +0000 (+0000)
Subject: s_client: pause hasn't worked in ages. Just ignore it
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4578675d11047837db3bda6fd71ab9165ffbafbe;p=openbsd

s_client: pause hasn't worked in ages. Just ignore it

ok jsing
---

diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index be060a3e54d..3c376f4b463 100644
--- a/usr.bin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.152 2023/07/27 07:01:50 tb Exp $
+.\" $OpenBSD: openssl.1,v 1.153 2023/12/29 12:06:48 tb Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -110,7 +110,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: July 27 2023 $
+.Dd $Mdocdate: December 29 2023 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -4279,7 +4279,6 @@ Verify the input data and output the recovered data.
 .Op Fl no_tls1_2
 .Op Fl no_tls1_3
 .Op Fl pass Ar arg
-.Op Fl pause
 .Op Fl policy_check
 .Op Fl port Ar port
 .Op Fl prexit
@@ -4445,8 +4444,6 @@ Disable the use of TLS1.2 and 1.3, respectively.
 Disable RFC 4507 session ticket support.
 .It Fl pass Ar arg
 The private key password source.
-.It Fl pause
-Pause 1 second between each read and write call.
 .It Fl port Ar port
 The
 .Ar port
diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c
index e5a6b006b4e..d993f516363 100644
--- a/usr.bin/openssl/s_client.c
+++ b/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.62 2023/07/03 08:03:56 beck Exp $ */
+/* $OpenBSD: s_client.c,v 1.63 2023/12/29 12:06:48 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -223,7 +223,6 @@ static struct {
 	char *npn_in;
 	unsigned int off;
 	char *passarg;
-	int pause;
 	int peekaboo;
 	char *port;
 	int prexit;
@@ -659,9 +658,7 @@ static const struct option s_client_options[] = {
 	},
 	{
 		.name = "pause",
-		.desc = "Pause 1 second between each read and write call",
-		.type = OPTION_FLAG,
-		.opt.flag = &cfg.pause,
+		.type = OPTION_DISCARD,
 	},
 	{
 		.name = "peekaboo",
@@ -832,7 +829,7 @@ sc_usage(void)
 	    "    [-keymatexport label] [-keymatexportlen len] [-legacy_server_connect]\n"
 	    "    [-msg] [-mtu mtu] [-nbio] [-nbio_test] [-no_comp] [-no_ign_eof]\n"
 	    "    [-no_legacy_server_connect] [-no_ticket] \n"
-	    "    [-no_tls1_2] [-no_tls1_3] [-pass arg] [-pause] [-policy_check]\n"
+	    "    [-no_tls1_2] [-no_tls1_3] [-pass arg] [-policy_check]\n"
 	    "    [-port port] [-prexit] [-proxy host:port] [-quiet] [-reconnect]\n"
 	    "    [-servername name] [-serverpref] [-sess_in file] [-sess_out file]\n"
 	    "    [-showcerts] [-starttls protocol] [-state] [-status] [-timeout]\n"
@@ -1088,8 +1085,6 @@ s_client_main(int argc, char **argv)
 			goto end;
 		}
 	}
-	if (cfg.pause & 0x01)
-		SSL_set_debug(con, 1);
 
 	if (SSL_is_dtls(con)) {
 		sbio = BIO_new_dgram(s, BIO_NOCLOSE);