aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2017-10-08 23:37:01 +0900
committerMatt Caswell <matt@openssl.org>2017-10-10 09:51:53 +0100
commit751b26b13256b9918bdb7f833fb7d701f115ab2e (patch)
treeebd3c6cb512f0fa0fe79d7055774fff6413a01ca
parent30ff41beab5d8a53cbcbdab4109b32b9ef5c0f6e (diff)
downloadopenssl-751b26b13256b9918bdb7f833fb7d701f115ab2e.tar.gz
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)
-rw-r--r--ssl/statem/statem_clnt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 2ad33f2e7c..88c0889023 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)