reindented code

1 files changed, 288 insertions, 305 deletions

diff --git a/tests/mini-dtls-rehandshake.c b/tests/mini-dtls-rehandshake.c
index 187d9297b4..84828b5bdb 100644
--- a/tests/mini-dtls-rehandshake.c
+++ b/tests/mini-dtls-rehandshake.c
@@ -31,7 +31,7 @@
 
 int main()
 {
-  exit(77);
+	exit(77);
 }
 
 #else
@@ -53,16 +53,14 @@ static void terminate(void);
 /* This program tests the rehandshake in DTLS
  */
 
-static void
-server_log_func (int level, const char *str)
+static void server_log_func(int level, const char *str)
 {
-  fprintf (stderr, "server|<%d>| %s", level, str);
+	fprintf(stderr, "server|<%d>| %s", level, str);
 }
 
-static void
-client_log_func (int level, const char *str)
+static void client_log_func(int level, const char *str)
 {
-  fprintf (stderr, "client|<%d>| %s", level, str);
+	fprintf(stderr, "client|<%d>| %s", level, str);
 }
 
 /* A very basic TLS client, with anonymous authentication.
@@ -74,132 +72,123 @@ client_log_func (int level, const char *str)
 gnutls_session_t session;
 
 static ssize_t
-push (gnutls_transport_ptr_t tr, const void *data, size_t len)
+push(gnutls_transport_ptr_t tr, const void *data, size_t len)
 {
-int fd = (long int)tr;
+	int fd = (long int) tr;
 
-  return send(fd, data, len, 0);
+	return send(fd, data, len, 0);
 }
 
-static void
-client (int fd, int server_init)
+static void client(int fd, int server_init)
 {
-  int ret;
-  char buffer[MAX_BUF + 1];
-  gnutls_anon_client_credentials_t anoncred;
-  /* Need to enable anonymous KX specifically. */
-
-  global_init ();
-
-  if (debug)
-    {
-      gnutls_global_set_log_function (client_log_func);
-      gnutls_global_set_log_level (4711);
-    }
-
-  gnutls_anon_allocate_client_credentials (&anoncred);
-
-  /* Initialize TLS session
-   */
-  gnutls_init (&session, GNUTLS_CLIENT|GNUTLS_DATAGRAM);
-  gnutls_dtls_set_mtu( session, 1500);
-
-  /* Use default priorities */
-  gnutls_priority_set_direct (session, "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL", NULL);
-
-  /* put the anonymous credentials to the current session
-   */
-  gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
-
-  gnutls_transport_set_int (session, fd);
-  gnutls_transport_set_push_function (session, push);
-
-  /* Perform the TLS handshake
-   */
-  do 
-    {
-      ret = gnutls_handshake (session);
-    }
-  while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-
-  if (ret < 0)
-    {
-      fail ("client: Handshake failed\n");
-      gnutls_perror (ret);
-      exit(1);
-    }
-  else
-    {
-      if (debug)
-        success ("client: Handshake was completed\n");
-    }
-
-  if (debug)
-    success ("client: TLS version is: %s\n",
-             gnutls_protocol_get_name (gnutls_protocol_get_version
-                                       (session)));
-
-  if (!server_init)
-    {
-      if (debug) success("Initiating client rehandshake\n");
-      do 
-        {
-          ret = gnutls_handshake (session);
-        }
-      while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-
-      if (ret < 0)
-        {
-          fail ("2nd client gnutls_handshake: %s\n", gnutls_strerror(ret));
-          terminate();
-        }
-    }
-  else
-    {
-      do {
-        ret = gnutls_record_recv (session, buffer, MAX_BUF);
-      } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-    }
-
-  if (ret == 0)
-    {
-      if (debug)
-        success ("client: Peer has closed the TLS connection\n");
-      goto end;
-    }
-  else if (ret < 0)
-    {
-      if (server_init && ret == GNUTLS_E_REHANDSHAKE)
-        {
-          if (debug) success("Initiating rehandshake due to server request\n");
-          do 
-            {
-              ret = gnutls_handshake (session);
-            }
-          while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-        }
-
-      if (ret != 0)
-        {
-          fail ("client: Error: %s\n", gnutls_strerror (ret));
-          exit(1);
-        }
-    }
-
-  do {
-    ret = gnutls_record_send (session, MSG, strlen (MSG));
-  } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-  gnutls_bye (session, GNUTLS_SHUT_WR);
-
-end:
-
-  close (fd);
-
-  gnutls_deinit (session);
-
-  gnutls_anon_free_client_credentials (anoncred);
-
-  gnutls_global_deinit ();
+	int ret;
+	char buffer[MAX_BUF + 1];
+	gnutls_anon_client_credentials_t anoncred;
+	/* Need to enable anonymous KX specifically. */
+
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(client_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_anon_allocate_client_credentials(&anoncred);
+
+	/* Initialize TLS session
+	 */
+	gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
+	gnutls_dtls_set_mtu(session, 1500);
+
+	/* Use default priorities */
+	gnutls_priority_set_direct(session,
+				   "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
+				   NULL);
+
+	/* put the anonymous credentials to the current session
+	 */
+	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
+
+	gnutls_transport_set_int(session, fd);
+	gnutls_transport_set_push_function(session, push);
+
+	/* Perform the TLS handshake
+	 */
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+	if (ret < 0) {
+		fail("client: Handshake failed\n");
+		gnutls_perror(ret);
+		exit(1);
+	} else {
+		if (debug)
+			success("client: Handshake was completed\n");
+	}
+
+	if (debug)
+		success("client: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	if (!server_init) {
+		if (debug)
+			success("Initiating client rehandshake\n");
+		do {
+			ret = gnutls_handshake(session);
+		}
+		while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+		if (ret < 0) {
+			fail("2nd client gnutls_handshake: %s\n",
+			     gnutls_strerror(ret));
+			terminate();
+		}
+	} else {
+		do {
+			ret = gnutls_record_recv(session, buffer, MAX_BUF);
+		} while (ret == GNUTLS_E_AGAIN
+			 || ret == GNUTLS_E_INTERRUPTED);
+	}
+
+	if (ret == 0) {
+		if (debug)
+			success
+			    ("client: Peer has closed the TLS connection\n");
+		goto end;
+	} else if (ret < 0) {
+		if (server_init && ret == GNUTLS_E_REHANDSHAKE) {
+			if (debug)
+				success
+				    ("Initiating rehandshake due to server request\n");
+			do {
+				ret = gnutls_handshake(session);
+			}
+			while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+		}
+
+		if (ret != 0) {
+			fail("client: Error: %s\n", gnutls_strerror(ret));
+			exit(1);
+		}
+	}
+
+	do {
+		ret = gnutls_record_send(session, MSG, strlen(MSG));
+	} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+      end:
+
+	close(fd);
+
+	gnutls_deinit(session);
+
+	gnutls_anon_free_client_credentials(anoncred);
+
+	gnutls_global_deinit();
 }
 
 
@@ -207,201 +196,195 @@ end:
 gnutls_anon_server_credentials_t anoncred;
 pid_t child;
 
-static gnutls_session_t
-initialize_tls_session (void)
+static gnutls_session_t initialize_tls_session(void)
 {
-  gnutls_session_t session;
+	gnutls_session_t session;
 
-  gnutls_init (&session, GNUTLS_SERVER|GNUTLS_DATAGRAM);
-  gnutls_dtls_set_mtu( session, 1500);
+	gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
+	gnutls_dtls_set_mtu(session, 1500);
 
-  /* avoid calling all the priority functions, since the defaults
-   * are adequate.
-   */
-  gnutls_priority_set_direct (session, "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL", NULL);
+	/* avoid calling all the priority functions, since the defaults
+	 * are adequate.
+	 */
+	gnutls_priority_set_direct(session,
+				   "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
+				   NULL);
 
-  gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
+	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
 
-  return session;
+	return session;
 }
 
 static void terminate(void)
 {
-int status;
+	int status;
 
-  kill(child, SIGTERM);
-  wait(&status);
-  exit(1);
+	kill(child, SIGTERM);
+	wait(&status);
+	exit(1);
 }
 
-static void
-server (int fd, int server_init)
+static void server(int fd, int server_init)
 {
-int ret;
-char buffer[MAX_BUF + 1];
-  /* this must be called once in the program
-   */
-  global_init ();
-
-  if (debug)
-    {
-      gnutls_global_set_log_function (server_log_func);
-      gnutls_global_set_log_level (4711);
-    }
-
-  gnutls_anon_allocate_server_credentials (&anoncred);
-
-  session = initialize_tls_session ();
-
-  gnutls_transport_set_int (session, fd);
-  gnutls_transport_set_push_function (session, push);
-
-  do 
-    {
-      ret = gnutls_handshake (session);
-    }
-  while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-  if (ret < 0)
-    {
-      close (fd);
-      gnutls_deinit (session);
-      fail ("server: Handshake has failed (%s)\n\n", gnutls_strerror (ret));
-      terminate();
-    }
-  if (debug)
-    success ("server: Handshake was completed\n");
-
-  if (debug)
-    success ("server: TLS version is: %s\n",
-             gnutls_protocol_get_name (gnutls_protocol_get_version
-                                       (session)));
-
-  /* see the Getting peer's information example */
-  /* print_info(session); */
-
-  if (server_init)
-    {
-      if (debug) success("server: Sending dummy packet\n");
-      ret = gnutls_rehandshake(session);
-      if (ret < 0)
-        {
-          fail ("gnutls_rehandshake: %s\n", gnutls_strerror(ret));
-          terminate();
-        }
-
-      if (debug) success("server: Initiating rehandshake\n");
-      do 
-        {
-          ret = gnutls_handshake (session);
-        }
-      while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-
-      if (ret < 0)
-        {
-          fail ("server: 2nd gnutls_handshake: %s\n", gnutls_strerror(ret));
-          terminate();
-        }
-    }
-
-  for (;;)
-    {
-      memset (buffer, 0, MAX_BUF + 1);
-
-      do {
-        ret = gnutls_record_recv (session, buffer, MAX_BUF);
-      } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-      if (ret == 0)
-        {
-          if (debug)
-            success ("server: Peer has closed the GnuTLS connection\n");
-          break;
-        }
-      else if (ret < 0)
-        {
-          if (!server_init && ret == GNUTLS_E_REHANDSHAKE)
-            {
-              if (debug) success("Initiating rehandshake due to client request\n");
-              do 
-                {
-                  ret = gnutls_handshake (session);
-                }
-              while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
-              if (ret == 0) break;
-            }
-
-          fail ("server: Received corrupted data(%s). Closing...\n", gnutls_strerror(ret));
-          terminate();
-        }
-      else if (ret > 0)
-        {
-          /* echo data back to the client
-           */
-          do {
-            ret = gnutls_record_send (session, buffer, strlen (buffer));
-          } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-        }
-    }
-  
-
-  /* do not wait for the peer to close the connection.
-   */
-  gnutls_bye (session, GNUTLS_SHUT_WR);
-
-  close (fd);
-  gnutls_deinit (session);
-
-  gnutls_anon_free_server_credentials (anoncred);
-
-  gnutls_global_deinit ();
-
-  if (debug)
-    success ("server: finished\n");
+	int ret;
+	char buffer[MAX_BUF + 1];
+	/* this must be called once in the program
+	 */
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(server_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_anon_allocate_server_credentials(&anoncred);
+
+	session = initialize_tls_session();
+
+	gnutls_transport_set_int(session, fd);
+	gnutls_transport_set_push_function(session, push);
+
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+	if (ret < 0) {
+		close(fd);
+		gnutls_deinit(session);
+		fail("server: Handshake has failed (%s)\n\n",
+		     gnutls_strerror(ret));
+		terminate();
+	}
+	if (debug)
+		success("server: Handshake was completed\n");
+
+	if (debug)
+		success("server: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	/* see the Getting peer's information example */
+	/* print_info(session); */
+
+	if (server_init) {
+		if (debug)
+			success("server: Sending dummy packet\n");
+		ret = gnutls_rehandshake(session);
+		if (ret < 0) {
+			fail("gnutls_rehandshake: %s\n",
+			     gnutls_strerror(ret));
+			terminate();
+		}
+
+		if (debug)
+			success("server: Initiating rehandshake\n");
+		do {
+			ret = gnutls_handshake(session);
+		}
+		while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+		if (ret < 0) {
+			fail("server: 2nd gnutls_handshake: %s\n",
+			     gnutls_strerror(ret));
+			terminate();
+		}
+	}
+
+	for (;;) {
+		memset(buffer, 0, MAX_BUF + 1);
+
+		do {
+			ret = gnutls_record_recv(session, buffer, MAX_BUF);
+		} while (ret == GNUTLS_E_AGAIN
+			 || ret == GNUTLS_E_INTERRUPTED);
+
+		if (ret == 0) {
+			if (debug)
+				success
+				    ("server: Peer has closed the GnuTLS connection\n");
+			break;
+		} else if (ret < 0) {
+			if (!server_init && ret == GNUTLS_E_REHANDSHAKE) {
+				if (debug)
+					success
+					    ("Initiating rehandshake due to client request\n");
+				do {
+					ret = gnutls_handshake(session);
+				}
+				while (ret < 0
+				       && gnutls_error_is_fatal(ret) == 0);
+				if (ret == 0)
+					break;
+			}
+
+			fail("server: Received corrupted data(%s). Closing...\n", gnutls_strerror(ret));
+			terminate();
+		} else if (ret > 0) {
+			/* echo data back to the client
+			 */
+			do {
+				ret =
+				    gnutls_record_send(session, buffer,
+						       strlen(buffer));
+			} while (ret == GNUTLS_E_AGAIN
+				 || ret == GNUTLS_E_INTERRUPTED);
+		}
+	}
+
+
+	/* do not wait for the peer to close the connection.
+	 */
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+	gnutls_deinit(session);
+
+	gnutls_anon_free_server_credentials(anoncred);
+
+	gnutls_global_deinit();
+
+	if (debug)
+		success("server: finished\n");
 }
 
-static void start (int server_initiated)
+static void start(int server_initiated)
 {
-  int fd[2];
-  int ret;
-  
-  ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
-  if (ret < 0)
-    {
-      perror("socketpair");
-      exit(1);
-    }
-
-  child = fork ();
-  if (child < 0)
-    {
-      perror ("fork");
-      fail ("fork");
-      exit(1);
-    }
-
-  if (child)
-    {
-      int status;
-      /* parent */
-
-      server (fd[0], server_initiated);
-      wait (&status);
-      if (WEXITSTATUS(status) != 0)
-        fail("Child died with status %d\n", WEXITSTATUS(status));
-    }
-  else 
-    {
-      close(fd[0]);
-      client (fd[1], server_initiated);
-      exit(0);
-    }
+	int fd[2];
+	int ret;
+
+	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
+	if (ret < 0) {
+		perror("socketpair");
+		exit(1);
+	}
+
+	child = fork();
+	if (child < 0) {
+		perror("fork");
+		fail("fork");
+		exit(1);
+	}
+
+	if (child) {
+		int status;
+		/* parent */
+
+		server(fd[0], server_initiated);
+		wait(&status);
+		if (WEXITSTATUS(status) != 0)
+			fail("Child died with status %d\n",
+			     WEXITSTATUS(status));
+	} else {
+		close(fd[0]);
+		client(fd[1], server_initiated);
+		exit(0);
+	}
 }
 
-void
-doit (void)
+void doit(void)
 {
-  start(0);
-  start(1);
+	start(0);
+	start(1);
 }
 
-#endif /* _WIN32 */
+#endif				/* _WIN32 */