[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  246b52f39aac36d1f4bc705c27c6354cb67041f4 (commit)
      from  91d2728b38b1df930f337e163816a0fc9580b6a6 (commit)


- Log -----------------------------------------------------------------
commit 246b52f39aac36d1f4bc705c27c6354cb67041f4
Author: Hiroyuki YAMAMORI <h-yamamo at db3.so-net.ne.jp>
Date:   Wed Aug 26 14:45:40 2015 +0100

    Fix DTLS1.2 buffers
    
    Fix the setup of DTLS1.2 buffers to take account of the Header
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/ssl3_buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c
index 66fb721..7685e69 100644
--- a/ssl/record/ssl3_buffer.c
+++ b/ssl/record/ssl3_buffer.c
@@ -147,7 +147,7 @@ int ssl3_setup_read_buffer(SSL *s)
     
     b = RECORD_LAYER_get_rbuf(&s->rlayer);
 
-    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;
@@ -189,7 +189,7 @@ int ssl3_setup_write_buffer(SSL *s)
 
     wb = RECORD_LAYER_get_wbuf(&s->rlayer);
 
-    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;