diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-10-08 16:37:01 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-10-10 10:51:53 +0200 |
| commit | 751b26b13256b9918bdb7f833fb7d701f115ab2e (patch) | |
| tree | ebd3c6cb512f0fa0fe79d7055774fff6413a01ca /ssl/statem/statem_clnt.c | |
| parent | Add atomic write call (diff) | |
| download | openssl-751b26b13256b9918bdb7f833fb7d701f115ab2e.tar.xz openssl-751b26b13256b9918bdb7f833fb7d701f115ab2e.zip | |
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)
Diffstat (limited to '')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 5 |
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) |