[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  f8641c9c693179fe7461608c51aaa8700dca6da2 (commit)
      from  6c8e02af7e8d789d2b3dd6efe937b8c64784643f (commit)


- Log -----------------------------------------------------------------
commit f8641c9c693179fe7461608c51aaa8700dca6da2
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Dec 16 11:18:47 2016 +0100

    test/ssl_test: give up if both client and server wait on read
    
    In some cases, both client and server end of the test can end up in
    SSL_ERROR_WANT_READ and never get out of it, making the test spin.
    Detect it and give up instead of waiting endlessly.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2096)
    (cherry picked from commit ceb6d746941063eccf7655c7709ba56ca117044b)

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

Summary of changes:
 test/handshake_helper.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index c14d8e3..1d0e2a4 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -867,7 +867,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     HANDSHAKE_EX_DATA server_ex_data, client_ex_data;
     CTX_DATA client_ctx_data, server_ctx_data, server2_ctx_data;
     HANDSHAKE_RESULT *ret = HANDSHAKE_RESULT_new();
-    int client_turn = 1;
+    int client_turn = 1, client_turn_count = 0;
     connect_phase_t phase = HANDSHAKE;
     handshake_status_t status = HANDSHAKE_RETRY;
     const unsigned char* tick = NULL;
@@ -956,6 +956,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
 
         switch (status) {
         case HANDSHAKE_SUCCESS:
+            client_turn_count = 0;
             phase = next_phase(test_ctx, phase);
             if (phase == CONNECTION_DONE) {
                 ret->result = SSL_TEST_SUCCESS;
@@ -981,6 +982,16 @@ static HANDSHAKE_RESULT *do_handshake_internal(
             ret->result = SSL_TEST_INTERNAL_ERROR;
             goto err;
         case HANDSHAKE_RETRY:
+            if (client_turn_count++ >= 2000) {
+                /*
+                 * At this point, there's been so many PEER_RETRY in a row
+                 * that it's likely both sides are stuck waiting for a read.
+                 * It's time to give up.
+                 */
+                ret->result = SSL_TEST_INTERNAL_ERROR;
+                goto err;
+            }
+
             /* Continue. */
             client_turn ^= 1;
             break;