diff options
-rw-r--r-- | src/regress/lib/libssl/ssl/ssltest.c | 17 |
1 files 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, | |||
1262 | } | 1262 | } |
1263 | } /* no loop, BIO_ctrl_get_read_request now returns 0 anyway */ | 1263 | } /* no loop, BIO_ctrl_get_read_request now returns 0 anyway */ |
1264 | 1264 | ||
1265 | if (!progress && !prev_progress) | 1265 | if (!progress && !prev_progress) { |
1266 | if (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0) { | 1266 | if (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0) { |
1267 | fprintf(stderr, "ERROR: got stuck\n"); | 1267 | fprintf(stderr, "ERROR: got stuck\n"); |
1268 | if (strcmp("SSLv2", SSL_get_version(c_ssl)) == 0) { | 1268 | goto err; |
1269 | fprintf(stderr, "This can happen for SSL2 because " | ||
1270 | "CLIENT-FINISHED and SERVER-VERIFY are written \n" | ||
1271 | "concurrently ..."); | ||
1272 | if (strncmp("2SCF", SSL_state_string(c_ssl), 4) == 0 && | ||
1273 | strncmp("2SSV", SSL_state_string(s_ssl), 4) == 0) { | ||
1274 | fprintf(stderr, " ok.\n"); | ||
1275 | goto end; | ||
1276 | } | ||
1277 | } | 1269 | } |
1278 | fprintf(stderr, " ERROR.\n"); | ||
1279 | goto err; | ||
1280 | } | 1270 | } |
1281 | prev_progress = progress; | 1271 | prev_progress = progress; |
1282 | } | 1272 | } |
@@ -1294,7 +1284,6 @@ doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, clock_t *s_time, | |||
1294 | goto err; | 1284 | goto err; |
1295 | } | 1285 | } |
1296 | 1286 | ||
1297 | end: | ||
1298 | ret = 0; | 1287 | ret = 0; |
1299 | 1288 | ||
1300 | err: | 1289 | err: |