From dd5a4279f9be3988023a72c7f840aa2690c264f3 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Mon, 4 Dec 2017 13:37:01 +0000
Subject: [PATCH 1/1] Fix some formatting nits

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4778)
---
 ssl/s3_enc.c             |  2 +-
 ssl/ssl_lib.c            |  2 +-
 ssl/statem/statem_clnt.c | 11 ++++++-----
 ssl/statem/statem_srvr.c |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 351b10f357..4c63d4acd5 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -147,7 +147,7 @@ int ssl3_change_cipher_state(SSL *s, int which)
             if (s->expand == NULL) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                          SSL_F_SSL3_CHANGE_CIPHER_STATE,
-                        SSL_R_COMPRESSION_LIBRARY_ERROR);
+                         SSL_R_COMPRESSION_LIBRARY_ERROR);
                 goto err;
             }
         }
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 61ddf418e9..a215f6816b 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -4987,7 +4987,7 @@ int ssl_cache_cipherlist(SSL *s, PACKET *cipher_suites, int sslv2format)
 
     if (PACKET_remaining(cipher_suites) % n != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_SSL_CACHE_CIPHERLIST,
-               SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
+                 SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
         return 0;
     }
 
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 48e6a0a224..e1dcf37453 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1532,7 +1532,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt)
 #else
     if (s->hit && compression != s->session->compress_meth) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PROCESS_SERVER_HELLO,
-               SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
+                 SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
         goto err;
     }
     if (compression == 0)
@@ -2268,7 +2268,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
         md_ctx = EVP_MD_CTX_new();
         if (md_ctx == NULL) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_KEY_EXCHANGE,
-                   ERR_R_MALLOC_FAILURE);
+                     ERR_R_MALLOC_FAILURE);
             goto err;
         }
 
@@ -2664,7 +2664,7 @@ int tls_process_initial_server_flight(SSL *s)
         if (ret < 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
                      SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT,
-                    ERR_R_MALLOC_FAILURE);
+                     ERR_R_MALLOC_FAILURE);
             return 0;
         }
     }
@@ -3240,7 +3240,8 @@ int tls_client_key_exchange_post_work(SSL *s)
                                        sizeof(sctpauthkey), labelbuffer,
                                        sizeof(labelbuffer), NULL, 0, 0) <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK, ERR_R_INTERNAL_ERROR);
+                     SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK,
+                     ERR_R_INTERNAL_ERROR);
             goto err;
         }
 
@@ -3380,7 +3381,7 @@ int tls_construct_client_certificate(SSL *s, WPACKET *pkt)
          * state and thus ssl3_send_alert may crash.
          */
         SSLfatal(s, SSL_AD_NO_ALERT, SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE,
-               SSL_R_CANNOT_CHANGE_CIPHER);
+                 SSL_R_CANNOT_CHANGE_CIPHER);
         return 0;
     }
 
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 0ba7f89e30..f95c19b41b 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1576,7 +1576,7 @@ static int tls_early_post_process_client_hello(SSL *s)
     if (!ssl_cache_cipherlist(s, &clienthello->ciphersuites,
                               clienthello->isv2) ||
         !bytes_to_cipher_list(s, &clienthello->ciphersuites, &ciphers, &scsvs,
-                             clienthello->isv2, 1)) {
+                              clienthello->isv2, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
-- 
2.34.1