diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 20:57:54 -0400 |
| commit | c4962abc9b5940cdd3bed920b19334fd269df31b (patch) | |
| tree | 59c80b695ba170e37a9be4edfc2770e7b50ebea1 /openssl/ssl/d1_both.c | |
| parent | c70e12e95b569baa2274eacfbac43dd2df40c2ae (diff) | |
| download | vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.gz vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.bz2 vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.zip | |
Update openssl to version openssl-1.0.1j
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
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) |