[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  751b26b13256b9918bdb7f833fb7d701f115ab2e (commit)
      from  30ff41beab5d8a53cbcbdab4109b32b9ef5c0f6e (commit)


- Log -----------------------------------------------------------------
commit 751b26b13256b9918bdb7f833fb7d701f115ab2e
Author: Tatsuhiro Tsujikawa <tatsuhiro.t at gmail.com>
Date:   Sun Oct 8 23:37:01 2017 +0900

    Don't change client random in Client Hello in its second flight
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4490)

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

Summary of changes:
 ssl/statem/statem_clnt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 2ad33f2..88c0889 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1035,8 +1035,9 @@ int tls_construct_client_hello(SSL *s, WPACKET *pkt)
                 break;
             }
         }
-    } else
-        i = 1;
+    } else {
+        i = s->hello_retry_request == 0;
+    }
 
     if (i && ssl_fill_hello_random(s, 0, p, sizeof(s->s3->client_random),
                                    DOWNGRADE_NONE) <= 0)