From: Hiroyuki YAMAMORI <h-yamamo@db3.so-net.ne.jp>
Date: Wed, 26 Aug 2015 14:04:09 +0000 (+0100)
Subject: Fix DTLS1.2 buffers
X-Git-Tag: OpenSSL_1_0_2e~105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28643a1615f4b09295a18d7ae0cb13adca8c8d00;p=oweals%2Fopenssl.git

Fix DTLS1.2 buffers

Fix the setup of DTLS1.2 buffers to take account of the Header

Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 019e21cd02..09d0661e81 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -648,7 +648,7 @@ int ssl3_setup_read_buffer(SSL *s)
     unsigned char *p;
     size_t len, align = 0, headerlen;
 
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+    if (SSL_IS_DTLS(s))
         headerlen = DTLS1_RT_HEADER_LENGTH;
     else
         headerlen = SSL3_RT_HEADER_LENGTH;
@@ -687,7 +687,7 @@ int ssl3_setup_write_buffer(SSL *s)
     unsigned char *p;
     size_t len, align = 0, headerlen;
 
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+    if (SSL_IS_DTLS(s))
         headerlen = DTLS1_RT_HEADER_LENGTH + 1;
     else
         headerlen = SSL3_RT_HEADER_LENGTH;