kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL_apply_handback: check session is where it's expected to be.

Browse Source 
Found by fuzzing.

Change-Id: I831f7869b16486eef7ac887ee199450e38461086
Reviewed-on: https://boringssl-review.googlesource.com/28044
Commit-Queue: Matt Braithwaite <mab@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Matthew Braithwaite 2018-05-04 09:28:50 -07:00 committed by CQ bot account: commit-bot@chromium.org
parent 0e9e0ba18c
commit 9fdf7cb97a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/handoff.cc
View File

@ -265,6 +265,9 @@ bool SSL_apply_handback(SSL *ssl, Span<const uint8_t> handback) {
s3->hs->state = CBS_len(&transcript) == 0 ? state12_finish_server_handshake
: state12_read_client_certificate;
s3->session_reused = session_reused;
if (s3->hs->state == state12_read_client_certificate && session_reused) {
return false;
}
s3->tlsext_channel_id_valid = channel_id_valid;
s3->next_proto_negotiated.CopyFrom(next_proto);
s3->alpn_selected.CopyFrom(alpn);