diff options
| author | jkim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-10-15 17:32:57 +0000 |
| commit | 9a02b27a6e11c9667427250a26589d17ad31e847 (patch) | |
| tree | 6195ffd39cd3e0b3d6c711f6531b3e7e13b85b44 /ssl/d1_both.c | |
| parent | 8bd1d6691f94efdce2338dffd823889f6c6b8ed2 (diff) | |
| download | FreeBSD-src-9a02b27a6e11c9667427250a26589d17ad31e847.zip FreeBSD-src-9a02b27a6e11c9667427250a26589d17ad31e847.tar.gz | |
Import OpenSSL 1.0.1j.
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 89cdca8..2e4250f 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) |
