diff options
author | Matt Caswell <matt@openssl.org> | 2016-03-07 23:26:32 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-03-08 08:52:45 +0000 |
commit | fa22f98f19d2bf6c898d6939103d686ae3b34ba6 (patch) | |
tree | f63389f6a4ed490e8ba0b4c6d6565d9fb21e8ac7 | |
parent | ebc4815fa56b64d711ada36899a35182a99cbbdb (diff) | |
download | openssl-fa22f98f19d2bf6c898d6939103d686ae3b34ba6.zip openssl-fa22f98f19d2bf6c898d6939103d686ae3b34ba6.tar.gz openssl-fa22f98f19d2bf6c898d6939103d686ae3b34ba6.tar.bz2 |
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>
-rwxr-xr-x | Configure | 1 | ||||
-rw-r--r-- | ssl/record/rec_layer_s3.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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]; |