[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6b937f8b115d817b00116bc6291d604b16dc4602 (commit)
      from  10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (commit)


- Log -----------------------------------------------------------------
commit 6b937f8b115d817b00116bc6291d604b16dc4602
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Mar 12 08:54:28 2015 +0100

    ssl/s3_clnt.c: fix intermittent failures.
    
    [and respect error return value in ssltest.c]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/s3_clnt.c | 1 +
 ssl/ssltest.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 1e611c4..b37a733 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2580,6 +2580,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                 DH_free(dh_clnt);
                 goto err;
             }
+            pmslen = n;
 
             if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
                 n = 0;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 7a157a6..12d3efb 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1707,13 +1707,14 @@ int main(int argc, char *argv[])
             ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time);
         else
             ret = doit(s_ssl, c_ssl, bytes);
+	if (ret)  break;
     }
 
     if (!verbose) {
         print_details(c_ssl, "");
     }
-    if ((number > 1) || (bytes > 1L))
-        BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", number,
+    if ((i > 1) || (bytes > 1L))
+        BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n", i,
                    bytes);
     if (print_time) {
 #ifdef CLOCKS_PER_SEC