From c4962abc9b5940cdd3bed920b19334fd269df31b Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 18 Oct 2014 19:59:47 -0400 Subject: Update openssl to version openssl-1.0.1j Conflicts: openssl/Makefile openssl/crypto/opensslconf.h --- openssl/ssl/d1_both.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'openssl/ssl/d1_both.c') 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) -- cgit v1.2.3