summaryrefslogtreecommitdiff
path: root/ssl/d1_both.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2014-10-15 17:32:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2014-10-15 17:32:57 +0000
commit58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (patch)
tree6195ffd39cd3e0b3d6c711f6531b3e7e13b85b44 /ssl/d1_both.c
parentcb6864802ed26a1031701a6a385961592a5cac25 (diff)
Diffstat (limited to 'ssl/d1_both.c')
-rw-r--r--ssl/d1_both.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 89cdca806480b..2e4250fcfecfd 100644
--- a/ssl/d1_both.c
+++ b/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)