diff options
author | Matt Caswell <matt@openssl.org> | 2017-03-20 18:03:34 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-03-21 10:09:14 +0000 |
commit | 2c7e64564cf7ab00c099d4f398ae9e53698b68f6 (patch) | |
tree | d2f22aa0fa7e07d2ad0f3db8199ec5307b670368 /test/ssl-tests/protocol_version.pm | |
parent | 7baabf45c424c135ecfafc6b3bb7ea1d225fbfda (diff) |
Fix resumption after HRR
Commit 6b1bb98fa moved the processing of ClientHello extensions into the
state machine post-processing stage. After processing s->init_num is reset
to 0, so by post-processing we cannot rely on its value. Unfortunately we
were using it to handle the PSK extension. This causes the handshake to
fail.
We were using init_num to figure out the length of ClientHello2 so we can
remove it from the handshake_buffer. The handshake_buffer holds the
transcript of all the messages sent so far. For PSK processing though we
only want to add in a partial ClientHello2. This commit changes things so
we just work out where ClientHello2 starts, working forward from the
beginning of handshake_buffer.
Fixes #2983
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2996)
(cherry picked from commit 77815a026cbedbb7b9a89558612f69e6294fe1ea)
Diffstat (limited to 'test/ssl-tests/protocol_version.pm')
0 files changed, 0 insertions, 0 deletions