commit 751b26b13256b9918bdb7f833fb7d701f115ab2e
author Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Sun Oct 08 23:37:01 2017 +0900
committer Matt Caswell <matt@openssl.org> Tue Oct 10 09:51:53 2017 +0100
tree ebd3c6cb512f0fa0fe79d7055774fff6413a01ca
parent 30ff41beab5d8a53cbcbdab4109b32b9ef5c0f6e

Don't change client random in Client Hello in its second flight

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4490)

ssl/statem/statem_clnt.c

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 @@
                 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)