diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:16:10 -0500 |
commit | a1babdda61e8cb3f8d0608d87120ba46ca91a21d (patch) | |
tree | 633a4386cd59bc6ef0b809b67ca1cc0bb494218f /openssl/ssl/d1_both.c | |
parent | 8fafe3481b134a4d368ba57e3698754a6a45c4c1 (diff) | |
download | vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.tar.gz vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.tar.bz2 vcxsrv-a1babdda61e8cb3f8d0608d87120ba46ca91a21d.zip |
Update openssl to version openssl-1.0.1j
Diffstat (limited to 'openssl/ssl/d1_both.c')
-rw-r--r-- | openssl/ssl/d1_both.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl/ssl/d1_both.c b/openssl/ssl/d1_both.c index 89cdca806..2e4250fcf 100644 --- a/openssl/ssl/d1_both.c +++ b/openssl/ssl/d1_both.c @@ -1492,6 +1492,9 @@ dtls1_process_heartbeat(SSL *s) /* Read type and payload length first */ if (1 + 2 + 16 > s->s3->rrec.length) return 0; /* silently discard */ + if (s->s3->rrec.length > SSL3_RT_MAX_PLAIN_LENGTH) + return 0; /* silently discard per RFC 6520 sec. 4 */ + hbtype = *p++; n2s(p, payload); if (1 + 2 + payload + 16 > s->s3->rrec.length) |