generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Follow on from CVE-2014-3571. This fixes the code that was the original source

Browse Source 
of the crash due to p being NULL. Steve's fix prevents this situation from
occuring - however this is by no means obvious by looking at the code for
dtls1_get_record. This fix just makes things look a bit more sane.

Conflicts:
	ssl/d1_pkt.c

Reviewed-by: Dr Stephen Henson <steve@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-03 00:54:35 +00:00
parent bf6fa208b5
commit b2688c9161
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/d1_pkt.c
View File

@ -663,7 +663,8 @@ again:
* would be dropped unnecessarily. * would be dropped unnecessarily.
*/ */
if (!(s->d1->listen && rr->type == SSL3_RT_HANDSHAKE && if (!(s->d1->listen && rr->type == SSL3_RT_HANDSHAKE &&
*p == SSL3_MT_CLIENT_HELLO) && s->packet_length > DTLS1_RT_HEADER_LENGTH &&
s->packet[DTLS1_RT_HEADER_LENGTH] == SSL3_MT_CLIENT_HELLO) &&
!dtls1_record_replay_check(s, bitmap)) !dtls1_record_replay_check(s, bitmap))
{ {
rr->length = 0; rr->length = 0;