More cleanup.

(cherry picked from commit 5eda213ebe382009c2f37a8eade5cbcdae6017ed)
Conflicts:
	apps/s_client.c
	apps/s_server.c

5 files changed, 15 insertions, 17 deletions

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 98ea3ec6c2..f5ed658d10 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -3571,9 +3571,11 @@ int ssl3_check_finished(SSL *s)
 	{
 	int ok;
 	long n;
-/*	Read the message to see if it is supplemental data, regardless if there is a session ticket
-	this function is called when we really expect a Certificate
-	message, so permit appropriate message length */
+
+	/* Read the message to see if it is supplemental data,
+	 * regardless if there is a session ticket this function is
+	 * called when we really expect a Certificate message, so
+	 * permit appropriate message length */
 	n=s->method->ssl_get_message(s,
 		SSL3_ST_CR_CERT_A,
 		SSL3_ST_CR_CERT_B,
@@ -3584,9 +3586,7 @@ int ssl3_check_finished(SSL *s)
 	s->s3->tmp.reuse_message = 1;
 
 	if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)
-		{
 		return 3;
-		}
 	/* If we have no ticket it cannot be a resumed session. */
 	if (!s->session->tlsext_tick)
 		return 1;
@@ -3739,7 +3739,7 @@ int tls1_get_server_supplemental_data(SSL *s)
 		goto f_err;
 		}
 	n2l3(p, supp_data_len);
-	while (p<d+supp_data_len)
+	while (p < d+supp_data_len)
 		{
 		n2s(p, supp_data_entry_type);
 		n2s(p, supp_data_entry_len);
@@ -3759,7 +3759,7 @@ int tls1_get_server_supplemental_data(SSL *s)
 					}
 				}
 			}
-		p+=supp_data_entry_len;
+		p += supp_data_entry_len;
 		}
 	return 1;
 f_err:
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 3d6c2d6104..aefc559011 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -903,9 +903,7 @@ int ssl3_check_client_hello(SSL *s)
 	s->s3->tmp.reuse_message = 1;
 #ifndef OPENSSL_NO_TLSEXT
 	if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)
-		{
 		return 3;
-		}
 #endif
 	if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
 		{
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 157870c3bd..f91141bdc0 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1202,11 +1202,11 @@ struct ssl_ctx_st
 	custom_srv_ext_record *custom_srv_ext_records;
 	size_t custom_srv_ext_records_count;
 
-    /* Arrays containing the callbacks for Supplemental Data. */
-    cli_supp_data_record *cli_supp_data_records;
-    size_t cli_supp_data_records_count;
-    srv_supp_data_record *srv_supp_data_records;
-    size_t srv_supp_data_records_count;
+ 	/* Arrays containing the callbacks for Supplemental Data. */
+ 	cli_supp_data_record *cli_supp_data_records;
+	size_t cli_supp_data_records_count;
+	srv_supp_data_record *srv_supp_data_records;
+	size_t srv_supp_data_records_count;
 	};
 
 #endif
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 6cbc083945..1670a87271 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1877,7 +1877,7 @@ int SSL_CTX_set_cli_supp_data(SSL_CTX *ctx,
 			return 0;
 
 	ctx->cli_supp_data_records = OPENSSL_realloc(ctx->cli_supp_data_records,
-	(ctx->cli_supp_data_records_count+1) * sizeof(cli_supp_data_record));
+	  (ctx->cli_supp_data_records_count+1) * sizeof(cli_supp_data_record));
 	if (!ctx->cli_supp_data_records)
 		{
 		ctx->cli_supp_data_records_count = 0;
@@ -1906,7 +1906,7 @@ int SSL_CTX_set_srv_supp_data(SSL_CTX *ctx,
 			return 0;
 
 	ctx->srv_supp_data_records = OPENSSL_realloc(ctx->srv_supp_data_records,
-	(ctx->srv_supp_data_records_count+1) * sizeof(srv_supp_data_record));
+	  (ctx->srv_supp_data_records_count+1) * sizeof(srv_supp_data_record));
 	if (!ctx->srv_supp_data_records)
 		{
 		ctx->srv_supp_data_records_count = 0;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 8bffe14aae..fc7c655907 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -446,7 +446,7 @@ int custom_ext = 0;
 /* This set based on extension callbacks */
 int custom_ext_error = 0;
 
-/*Not IETF assigned supplemental data types*/
+/* Not IETF assigned supplemental data types */
 #define CUSTOM_SUPP_DATA_TYPE_0 100
 #define CUSTOM_SUPP_DATA_TYPE_1 101
 #define CUSTOM_SUPP_DATA_TYPE_2 102