wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash in dtls1_get_record whilst in the listen state where you get two

Browse source 
separate reads performed - one for the header and one for the body of the
handshake record.

CVE-2014-3571

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-01-03 00:45:13 +00:00 committed by Matt Caswell
parent eb37b6aa41
commit bf6fa208b5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/d1_pkt.c
View file

@ -634,8 +634,6 @@ again:
/* now s->packet_length == DTLS1_RT_HEADER_LENGTH */ /* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
i=rr->length; i=rr->length;
n=ssl3_read_n(s,i,i,1); n=ssl3_read_n(s,i,i,1);
if (n <= 0) return(n); /* error or non-blocking io */
/* this packet contained a partial record, dump it */ /* this packet contained a partial record, dump it */
if ( n != i) if ( n != i)
{ {

2
ssl/s3_pkt.c
View file

@ -182,6 +182,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
* at once (as long as it fits into the buffer). */ * at once (as long as it fits into the buffer). */
if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
{ {
if (left == 0 && extend)
return 0;
if (left > 0 && n > left) if (left > 0 && n > left)
n = left; n = left;
} }