generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssl/s3_clnt.c: fix intermittent failures.

Browse Source 
[and respect error return value in ssltest.c]

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Andy Polyakov 2015-03-12 08:54:28 +01:00
parent 10bf4fc2c3
commit 6b937f8b11
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/s3_clnt.c
View File

@ -2580,6 +2580,7 @@ int ssl3_send_client_key_exchange(SSL *s)
DH_free(dh_clnt); DH_free(dh_clnt);
goto err; goto err;
} }
pmslen = n;
if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY) if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
n = 0; n = 0;

5
ssl/ssltest.c
View File

@ -1707,13 +1707,14 @@ int main(int argc, char *argv[])
ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time); ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time);
else else
ret = doit(s_ssl, c_ssl, bytes); ret = doit(s_ssl, c_ssl, bytes);
if (ret) break;
} }
if (!verbose) { if (!verbose) {
print_details(c_ssl, ""); print_details(c_ssl, "");
} }
if ((number > 1) || (bytes > 1L)) if ((i > 1) || (bytes > 1L))
BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", number, BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", i,
bytes); bytes);
if (print_time) { if (print_time) {
#ifdef CLOCKS_PER_SEC #ifdef CLOCKS_PER_SEC