Indent code

Co-authored-by: Simon Josefsson <simon@josefsson.org>
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>

1 files changed, 85 insertions, 105 deletions

diff --git a/tests/record-pad.c b/tests/record-pad.c
index f625163179..8eb00b0642 100644
--- a/tests/record-pad.c
+++ b/tests/record-pad.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -35,23 +35,23 @@ int main(void)
 
 #else
 
-#include <string.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <gnutls/gnutls.h>
-#include <gnutls/dtls.h>
-#include <signal.h>
-#include <assert.h>
-
-#include "cert-common.h"
-#include "utils.h"
-
-#define MAX_BUF 1024
-#define HIGH(x) (3*x)
+# include <string.h>
+# include <sys/types.h>
+# include <netinet/in.h>
+# include <sys/socket.h>
+# include <sys/wait.h>
+# include <arpa/inet.h>
+# include <unistd.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/dtls.h>
+# include <signal.h>
+# include <assert.h>
+
+# include "cert-common.h"
+# include "utils.h"
+
+# define MAX_BUF 1024
+# define HIGH(x) (3*x)
 static void terminate(void);
 static size_t total;
 
@@ -68,16 +68,12 @@ static void client_log_func(int level, const char *str)
 	fprintf(stderr, "client|<%d>| %s", level, str);
 }
 
-
 /* A very basic TLS client, with anonymous authentication.
  */
 
-
-
-static ssize_t
-push(gnutls_transport_ptr_t tr, const void *data, size_t len)
+static ssize_t push(gnutls_transport_ptr_t tr, const void *data, size_t len)
 {
-	int fd = (long int) tr;
+	int fd = (long int)tr;
 
 	total += len;
 	return send(fd, data, len, 0);
@@ -111,8 +107,8 @@ static void client(int fd, struct test_st *test)
 	gnutls_anon_allocate_client_credentials(&anoncred);
 	gnutls_certificate_allocate_credentials(&x509_cred);
 
-	assert(gnutls_init(&session, GNUTLS_CLIENT|test->flags)>=0);
-	assert(gnutls_priority_set_direct(session, test->prio, NULL)>=0);
+	assert(gnutls_init(&session, GNUTLS_CLIENT | test->flags) >= 0);
+	assert(gnutls_priority_set_direct(session, test->prio, NULL) >= 0);
 
 	/* put the anonymous credentials to the current session
 	 */
@@ -144,15 +140,14 @@ static void client(int fd, struct test_st *test)
 
 	do {
 		do {
-			ret = gnutls_record_recv(session, buffer, sizeof(buffer));
-		} while (ret == GNUTLS_E_AGAIN
-			 || ret == GNUTLS_E_INTERRUPTED);
+			ret =
+			    gnutls_record_recv(session, buffer, sizeof(buffer));
+		} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
 	} while (ret > 0);
 
 	if (ret == 0) {
 		if (debug)
-			success
-			    ("client: Peer has closed the TLS connection\n");
+			success("client: Peer has closed the TLS connection\n");
 		goto end;
 	} else if (ret < 0) {
 		if (ret != 0) {
@@ -175,7 +170,6 @@ static void client(int fd, struct test_st *test)
 	gnutls_global_deinit();
 }
 
-
 /* These are global */
 pid_t child;
 
@@ -207,14 +201,13 @@ static void server(int fd, struct test_st *test)
 
 	gnutls_certificate_allocate_credentials(&x509_cred);
 	gnutls_certificate_set_x509_key_mem(x509_cred, &server_cert,
-					    &server_key,
-					    GNUTLS_X509_FMT_PEM);
+					    &server_key, GNUTLS_X509_FMT_PEM);
 
 	gnutls_anon_allocate_server_credentials(&anoncred);
 
-	assert(gnutls_init(&session, GNUTLS_SERVER|test->flags)>=0);
+	assert(gnutls_init(&session, GNUTLS_SERVER | test->flags) >= 0);
 
-	assert(gnutls_priority_set_direct(session, test->prio, NULL)>=0);
+	assert(gnutls_priority_set_direct(session, test->prio, NULL) >= 0);
 
 	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
@@ -248,30 +241,27 @@ static void server(int fd, struct test_st *test)
 	do {
 		ret =
 		    gnutls_record_send2(session, buffer,
-					test->data,
-					test->pad, 0);
-	} while (ret == GNUTLS_E_AGAIN
-		 || ret == GNUTLS_E_INTERRUPTED);
+					test->data, test->pad, 0);
+	} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
 
 	if (test->sret < 0) {
 		if (ret >= 0)
 			fail("server: expected failure got success!\n");
 		if (ret != test->sret)
-			fail("server: expected different failure: '%s', got: '%s'\n",
-			     gnutls_strerror(test->sret), gnutls_strerror(ret));
+			fail("server: expected different failure: '%s', got: '%s'\n", gnutls_strerror(test->sret), gnutls_strerror(ret));
 		goto finish;
 	}
 
 	if (ret < 0) {
-		fail("Error sending packet: %s\n",
-		     gnutls_strerror(ret));
+		fail("Error sending packet: %s\n", gnutls_strerror(ret));
 		terminate();
 	}
 
-	expected = test->data + test->pad + gnutls_record_overhead_size(session);
+	expected =
+	    test->data + test->pad + gnutls_record_overhead_size(session);
 	if (total != expected) {
 		fail("Sent data (%u) are lower than expected (%u)\n",
-		     (unsigned) total, (unsigned) expected);
+		     (unsigned)total, (unsigned)expected);
 		terminate();
 	}
 
@@ -324,7 +314,7 @@ static void start(struct test_st *test)
 	}
 }
 
-#define AES_GCM "NONE:+VERS-TLS1.3:+AES-256-GCM:+AEAD:+SIGN-ALL:+GROUP-ALL"
+# define AES_GCM "NONE:+VERS-TLS1.3:+AES-256-GCM:+AEAD:+SIGN-ALL:+GROUP-ALL"
 
 static void ch_handler(int sig)
 {
@@ -334,72 +324,62 @@ static void ch_handler(int sig)
 	return;
 }
 
-struct test_st tests[] =
-{
+struct test_st tests[] = {
 	{
-		.name = "AES-GCM with max pad",
-		.pad = HIGH(MAX_BUF+1)-(MAX_BUF+1),
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = 0
-	},
+	 .name = "AES-GCM with max pad",
+	 .pad = HIGH(MAX_BUF + 1) - (MAX_BUF + 1),
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = 0},
 	{
-		.name = "AES-GCM with zero pad",
-		.pad = 0,
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = 0
-	},
+	 .name = "AES-GCM with zero pad",
+	 .pad = 0,
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = 0},
 	{
-		.name = "AES-GCM with 1-byte pad",
-		.pad = 1,
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = 0
-	},
+	 .name = "AES-GCM with 1-byte pad",
+	 .pad = 1,
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = 0},
 	{
-		.name = "AES-GCM with pad, but no data",
-		.pad = 16,
-		.data = 0,
-		.prio = AES_GCM,
-		.flags = 0
-	},
+	 .name = "AES-GCM with pad, but no data",
+	 .pad = 16,
+	 .data = 0,
+	 .prio = AES_GCM,
+	 .flags = 0},
 	{
-		.name = "AES-GCM with max pad and safe padding check",
-		.pad = HIGH(MAX_BUF+1)-(MAX_BUF+1),
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = GNUTLS_SAFE_PADDING_CHECK
-	},
+	 .name = "AES-GCM with max pad and safe padding check",
+	 .pad = HIGH(MAX_BUF + 1) - (MAX_BUF + 1),
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = GNUTLS_SAFE_PADDING_CHECK},
 	{
-		.name = "AES-GCM with zero pad and safe padding check",
-		.pad = 0,
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = GNUTLS_SAFE_PADDING_CHECK
-	},
+	 .name = "AES-GCM with zero pad and safe padding check",
+	 .pad = 0,
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = GNUTLS_SAFE_PADDING_CHECK},
 	{
-		.name = "AES-GCM with 1-byte pad and safe padding check",
-		.pad = 1,
-		.data = MAX_BUF,
-		.prio = AES_GCM,
-		.flags = GNUTLS_SAFE_PADDING_CHECK
-	},
+	 .name = "AES-GCM with 1-byte pad and safe padding check",
+	 .pad = 1,
+	 .data = MAX_BUF,
+	 .prio = AES_GCM,
+	 .flags = GNUTLS_SAFE_PADDING_CHECK},
 	{
-		.name = "AES-GCM with pad, but no data and safe padding check",
-		.pad = 16,
-		.data = 0,
-		.prio = AES_GCM,
-		.flags = GNUTLS_SAFE_PADDING_CHECK
-	},
+	 .name = "AES-GCM with pad, but no data and safe padding check",
+	 .pad = 16,
+	 .data = 0,
+	 .prio = AES_GCM,
+	 .flags = GNUTLS_SAFE_PADDING_CHECK},
 	{
-		.name = "AES-GCM with pad, but no data and no pad",
-		.pad = 0,
-		.data = 0,
-		.prio = AES_GCM,
-		.flags = GNUTLS_SAFE_PADDING_CHECK,
-		.sret = GNUTLS_E_INVALID_REQUEST
-	},
+	 .name = "AES-GCM with pad, but no data and no pad",
+	 .pad = 0,
+	 .data = 0,
+	 .prio = AES_GCM,
+	 .flags = GNUTLS_SAFE_PADDING_CHECK,
+	 .sret = GNUTLS_E_INVALID_REQUEST},
 };
 
 void doit(void)
@@ -407,7 +387,7 @@ void doit(void)
 	unsigned i;
 	signal(SIGCHLD, ch_handler);
 
-	for (i=0;i<sizeof(tests)/sizeof(tests[0]);i++) {
+	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
 		start(&tests[i]);
 	}
 }