diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-03-04 12:43:39 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-03-04 12:43:39 +0000 |
| commit | 3838792c58976ccbe06b07e1d731246f78fa2bb1 (patch) | |
| tree | c0534951f439778a3d4e6fea13f0fd0fdf9d3ce0 | |
| parent | e9756015c7decb30e0842ebf0a46a8099829546e (diff) | |
Remove handling for SSLv2.
| -rw-r--r-- | regress/lib/libssl/ssl/ssltest.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/regress/lib/libssl/ssl/ssltest.c b/regress/lib/libssl/ssl/ssltest.c index 5a1d1f5b0a0..2a088c80b37 100644 --- a/regress/lib/libssl/ssl/ssltest.c +++ b/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: |