generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building without multiblock support

Browse Source 
Not all platforms support multiblock. Building without it fails prior to
this fix.

RT#4396

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-03-07 23:26:32 +00:00
parent ebc4815fa5
commit fa22f98f19
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Configure
View File

@ -280,6 +280,7 @@ my @disablables = (
"md5", "md5",
"mdc2", "mdc2",
"md[-_]ghost94", "md[-_]ghost94",
"multiblock",
"nextprotoneg", "nextprotoneg",
"ocb", "ocb",
"ocsp", "ocsp",

4
ssl/record/rec_layer_s3.c
View File

@ -450,9 +450,9 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
{ {
const unsigned char *buf = buf_; const unsigned char *buf = buf_;
int tot; int tot;
unsigned int n, nw; unsigned int n, split_send_fragment, maxpipes;
#if !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK #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; unsigned int u_len = (unsigned int)len;
#endif #endif
SSL3_BUFFER *wb = &s->rlayer.wbuf[0]; SSL3_BUFFER *wb = &s->rlayer.wbuf[0];