From: Matt Caswell <matt@openssl.org>
Date: Mon, 7 Mar 2016 23:26:32 +0000 (+0000)
Subject: Fix building without multiblock support
X-Git-Tag: OpenSSL_1_1_0-pre4~264
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa22f98f19d2bf6c898d6939103d686ae3b34ba6;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/Configure b/Configure
index 34926ab0d8..10be766d02 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 91a70e54f9..6d2f250b7b 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];