summaryrefslogtreecommitdiffstats
path: root/ssl/s2_srvr.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-21 23:56:21 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:38:49 +0000
commit47050853f13b07f91b5b4a058dcb188621296f21 (patch)
treeb39655bc64f7214931b5c9bfe3d3406a38bef145 /ssl/s2_srvr.c
parent10621efd3296a92f489f6ab26a88e88d9790930e (diff)
Rerun util/openssl-format-source -v -c .OpenSSL_1_0_1-post-auto-reformat
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s2_srvr.c')
-rw-r--r--ssl/s2_srvr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 65ccce3e02..daba6dd7ad 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -484,8 +484,7 @@ static int get_client_master_key(SSL *s)
if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
|| (is_export && ((i != ek)
|| (s->s2->tmp.clear +
- (unsigned int)i !=
- (unsigned int)
+ (unsigned int)i != (unsigned int)
EVP_CIPHER_key_length(c)))))) {
ERR_clear_error();
if (is_export)