提交 fa22f98f 编写于 作者: M Matt Caswell

Fix building without multiblock support

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

RT#4396
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 ebc4815f
...@@ -280,6 +280,7 @@ my @disablables = ( ...@@ -280,6 +280,7 @@ my @disablables = (
"md5", "md5",
"mdc2", "mdc2",
"md[-_]ghost94", "md[-_]ghost94",
"multiblock",
"nextprotoneg", "nextprotoneg",
"ocb", "ocb",
"ocsp", "ocsp",
......
...@@ -450,9 +450,9 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) ...@@ -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];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册