From 0cc3e8df7b9aba3df87c3ae71630950a0b4c8f9e Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 23 May 2020 12:52:54 +0000
Subject: In ssl_lib.c revision 1.217, jsing enabled SSL_MODE_AUTO_RETRY by
 default. To avoid hanging on a blocking read, we need to clear the
 SSL_MODE_AUTO_RETRY flag in the s_client and the s_server.

ok beck inoguchi jsing
---
 src/usr.bin/openssl/s_client.c | 5 ++++-
 src/usr.bin/openssl/s_server.c | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index 88b098286a..cc886b11e6 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.45 2020/05/22 16:11:23 deraadt Exp $ */
+/* $OpenBSD: s_client.c,v 1.46 2020/05/23 12:52:54 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -653,6 +653,9 @@ s_client_main(int argc, char **argv)
 		ERR_print_errors(bio_err);
 		goto end;
 	}
+
+	SSL_CTX_clear_mode(ctx, SSL_MODE_AUTO_RETRY);
+
 	if (vpm)
 		SSL_CTX_set1_param(ctx, vpm);
 
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index e0838b2b50..dbf59ad854 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.36 2020/05/23 09:02:02 tb Exp $ */
+/* $OpenBSD: s_server.c,v 1.37 2020/05/23 12:52:54 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -968,6 +968,8 @@ s_server_main(int argc, char *argv[])
 		goto end;
 	}
 
+	SSL_CTX_clear_mode(ctx, SSL_MODE_AUTO_RETRY);
+
 	if (!SSL_CTX_set_min_proto_version(ctx, min_version))
 		goto end;
 	if (!SSL_CTX_set_max_proto_version(ctx, max_version))
-- 
cgit v1.2.3-55-g6feb