summaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-22 03:41:31 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:20:10 +0000
commit739a5eee619fc8c03736140828891b369f8690f4 (patch)
tree055d593c853598e031351cfb4d0ccf350fad877c /ssl/s3_pkt.c
parent0f113f3ee4d629ef9a4a30911b22b224772085e5 (diff)
Rerun util/openssl-format-source -v -c .master-post-auto-reformat
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 737dabbce0..c1421b1d67 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -710,8 +710,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
u_len >= 4 * (max_send_fragment = s->max_send_fragment) &&
s->compress == NULL && s->msg_callback == NULL &&
!SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) &&
- EVP_CIPHER_flags(s->
- enc_write_ctx->cipher) &
+ EVP_CIPHER_flags(s->enc_write_ctx->cipher) &
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) {
unsigned char aad[13];
EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
@@ -921,8 +920,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
#if 0 && !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
if (type == SSL3_RT_APPLICATION_DATA && s->compress == NULL &&
!SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) &&
- EVP_CIPHER_flags(s->
- enc_write_ctx->cipher) &
+ EVP_CIPHER_flags(s->enc_write_ctx->cipher) &
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)
do {
unsigned char aad[13];