commit 5eda213ebe382009c2f37a8eade5cbcdae6017ed
author Ben Laurie <ben@links.org> Thu Aug 01 12:33:15 2013 +0100
committer Ben Laurie <ben@links.org> Fri Sep 06 13:59:14 2013 +0100
tree 43cf31d12c2acf4ba3e017f4a6f0bc9b97b7e133
parent a6a48e87bc469f37ed1c53d0e4d22faaa0a5adf3

More cleanup.

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index cf40da5..29189fd 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1056,7 +1056,7 @@
 	EVP_PKEY *s_key = NULL, *s_dkey = NULL;
 	int no_cache = 0, ext_cache = 0;
 	int rev = 0, naccept = -1;
-    int c_no_resumption_on_reneg = 0;
+	int c_no_resumption_on_reneg = 0;
 #ifndef OPENSSL_NO_TLSEXT
 	EVP_PKEY *s_key2 = NULL;
 	X509 *s_cert2 = NULL;
@@ -1961,10 +1961,8 @@
 		}
 #endif
 
-    if (c_no_resumption_on_reneg)
-        {
-        SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-        }
+	if (c_no_resumption_on_reneg)
+		SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
 	if (!set_cert_key_stuff(ctx, s_cert, s_key, s_chain, build_chain))
 		goto end;
 #ifndef OPENSSL_NO_TLSEXT
@@ -3569,18 +3567,12 @@
 			   void *arg)
 	{
 	if (TLSEXT_TYPE_server_authz == ext_type)
-		{
-		client_provided_server_authz = (memchr(in,
-		TLSEXT_AUTHZDATAFORMAT_dtcp,
-		inlen) != NULL);
-		}
+		client_provided_server_authz
+		  = memchr(in,	TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;
 
 	if (TLSEXT_TYPE_client_authz == ext_type)
-		{
-		client_provided_client_authz = (memchr(in,
-		TLSEXT_AUTHZDATAFORMAT_dtcp,
-		inlen) != NULL);
-		}
+		client_provided_client_authz
+		  = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;
 
 	return 1;
 	}
@@ -3591,7 +3583,8 @@
 	{
 	if (c_auth && client_provided_client_authz && client_provided_server_authz)
 		{
-		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
+		if (!c_auth_require_reneg
+		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
 			{
 			*out = auth_ext_data;
 			*outlen = 1;
@@ -3622,7 +3615,8 @@
 	unsigned char *result;
 	if (c_auth && client_provided_client_authz && client_provided_server_authz)
 		{
-		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
+		if (!c_auth_require_reneg
+		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
 			{
 			result = OPENSSL_malloc(10);
 			memcpy(result, "1234512345", 10);