From 367d1521ed7abff59a0ba480e767481f95f6b23f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 4 Mar 2017 12:43:38 +0000
Subject: Remove handling for SSLv2.

---
 src/regress/lib/libssl/ssl/ssltest.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c
index 5a1d1f5b0a..2a088c80b3 100644
--- a/src/regress/lib/libssl/ssl/ssltest.c
+++ b/src/regress/lib/libssl/ssl/ssltest.c
@@ -1262,21 +1262,11 @@ doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, clock_t *s_time,
 				}
 			} /* no loop, BIO_ctrl_get_read_request now returns 0 anyway */
 
-			if (!progress && !prev_progress)
+			if (!progress && !prev_progress) {
 				if (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0) {
-				fprintf(stderr, "ERROR: got stuck\n");
-				if (strcmp("SSLv2", SSL_get_version(c_ssl)) == 0) {
-					fprintf(stderr, "This can happen for SSL2 because "
-					    "CLIENT-FINISHED and SERVER-VERIFY are written \n"
-					    "concurrently ...");
-					if (strncmp("2SCF", SSL_state_string(c_ssl), 4) == 0 &&
-						    strncmp("2SSV", SSL_state_string(s_ssl), 4) == 0) {
-						fprintf(stderr, " ok.\n");
-						goto end;
-					}
+					fprintf(stderr, "ERROR: got stuck\n");
+					goto err;
 				}
-				fprintf(stderr, " ERROR.\n");
-				goto err;
 			}
 			prev_progress = progress;
 		}
@@ -1294,7 +1284,6 @@ doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, clock_t *s_time,
 		goto err;
 	}
 
-end:
 	ret = 0;
 
 err:
-- 
cgit v1.2.3-55-g6feb