[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  fa22f98f19d2bf6c898d6939103d686ae3b34ba6 (commit)
      from  ebc4815fa56b64d711ada36899a35182a99cbbdb (commit)


- Log -----------------------------------------------------------------
commit fa22f98f19d2bf6c898d6939103d686ae3b34ba6
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 7 23:26:32 2016 +0000

    Fix building without multiblock support
    
    Not all platforms support multiblock. Building without it fails prior to
    this fix.
    
    RT#4396
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure                 | 1 +
 ssl/record/rec_layer_s3.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 34926ab..10be766 100755
--- a/Configure
+++ b/Configure
@@ -280,6 +280,7 @@ my @disablables = (
     "md5",
     "mdc2",
     "md[-_]ghost94",
+    "multiblock",
     "nextprotoneg",
     "ocb",
     "ocsp",
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 91a70e5..6d2f250 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -450,9 +450,9 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
 {
     const unsigned char *buf = buf_;
     int tot;
-    unsigned int n, nw;
+    unsigned int n, split_send_fragment, maxpipes;
 #if !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
-    unsigned int max_send_fragment, split_send_fragment, maxpipes;
+    unsigned int max_send_fragment, nw;
     unsigned int u_len = (unsigned int)len;
 #endif
     SSL3_BUFFER *wb = &s->rlayer.wbuf[0];