reindented code

1 files changed, 178 insertions, 176 deletions

diff --git a/tests/crq_apis.c b/tests/crq_apis.c
index 38233d7395..daf8d89e18 100644
--- a/tests/crq_apis.c
+++ b/tests/crq_apis.c
@@ -32,186 +32,188 @@
 
 #include "utils.h"
 
-static void
-tls_log_func (int level, const char *str)
+static void tls_log_func(int level, const char *str)
 {
-  fprintf (stderr, "%s |<%d>| %s", "crq_key_id", level, str);
+	fprintf(stderr, "%s |<%d>| %s", "crq_key_id", level, str);
 }
 
 static unsigned char key_pem[] =
-  "-----BEGIN RSA PRIVATE KEY-----\n"
-  "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n"
-  "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n"
-  "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n"
-  "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n"
-  "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n"
-  "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n"
-  "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n"
-  "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n"
-  "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n"
-  "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n"
-  "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n"
-  "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n"
-  "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n"
-  "-----END RSA PRIVATE KEY-----\n";
-const gnutls_datum_t key = { key_pem, sizeof (key_pem) };
-
-void
-doit (void)
+    "-----BEGIN RSA PRIVATE KEY-----\n"
+    "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n"
+    "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n"
+    "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n"
+    "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n"
+    "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n"
+    "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n"
+    "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n"
+    "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n"
+    "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n"
+    "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n"
+    "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n"
+    "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n"
+    "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n"
+    "-----END RSA PRIVATE KEY-----\n";
+const gnutls_datum_t key = { key_pem, sizeof(key_pem) };
+
+void doit(void)
 {
-  gnutls_x509_privkey_t pkey;
-  gnutls_x509_crt_t crt;
-  gnutls_x509_crq_t crq;
-
-  gnutls_datum_t out;
+	gnutls_x509_privkey_t pkey;
+	gnutls_x509_crt_t crt;
+	gnutls_x509_crq_t crq;
+
+	gnutls_datum_t out;
 
-  size_t s = 0;
-
-  char smallbuf[10];
-
-  int ret;
-
-  ret = global_init ();
-  if (ret < 0)
-    fail ("global_init\n");
-
-  gnutls_global_set_log_function (tls_log_func);
-  if (debug)
-    gnutls_global_set_log_level (4711);
-
-  ret = gnutls_x509_crq_init (&crq);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_init\n");
-
-  ret = gnutls_x509_privkey_init (&pkey);
-  if (ret != 0)
-    fail ("gnutls_x509_privkey_init\n");
-
-  ret = gnutls_x509_crt_init (&crt);
-  if (ret != 0)
-    fail ("gnutls_x509_crt_init\n");
-
-  ret = gnutls_x509_privkey_import (pkey, &key, GNUTLS_X509_FMT_PEM);
-  if (ret != 0)
-    fail ("gnutls_x509_privkey_import\n");
-
-  ret = gnutls_x509_crq_set_version (crq, 0);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_version\n");
-
-  ret = gnutls_x509_crq_set_key (crq, pkey);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_key\n");
-
-  s = 0;
-  ret = gnutls_x509_crq_get_extension_info (crq, 0, NULL, &s, NULL);
-  if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
-    fail ("gnutls_x509_crq_get_extension_info\n");
-
-  ret = gnutls_x509_crq_set_basic_constraints (crq, 0, 0);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_basic_constraints %d\n", ret);
-
-  ret = gnutls_x509_crq_set_key_usage (crq, 0);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_key_usage %d\n", ret);
-
-  ret = gnutls_x509_crq_get_challenge_password (crq, NULL, &s);
-  if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
-    fail ("%d: gnutls_x509_crq_get_challenge_password %d: %s\n", __LINE__, ret, gnutls_strerror(ret));
-
-  ret = gnutls_x509_crq_set_challenge_password (crq, "foo");
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_challenge_password %d\n", ret);
-
-  s = 0;
-  ret = gnutls_x509_crq_get_challenge_password (crq, NULL, &s);
-  if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER || s != 4)
-    fail ("%d: gnutls_x509_crq_get_challenge_password %d: %s (passlen: %d)\n", __LINE__, ret, gnutls_strerror(ret), (int)s);
-
-  s = 10;
-  ret = gnutls_x509_crq_get_challenge_password (crq, smallbuf, &s);
-  if (ret != 0 || s != 3 || strcmp (smallbuf, "foo") != 0)
-    fail ("%d: gnutls_x509_crq_get_challenge_password3 %d/%d/%s\n",
-          __LINE__, ret, (int) s, smallbuf);
-
-  s = 0;
-  ret = gnutls_x509_crq_get_extension_info (crq, 0, NULL, &s, NULL);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_get_extension_info2\n");
-
-  s = 0;
-  ret = gnutls_x509_crq_get_extension_data (crq, 0, NULL, &s);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_get_extension_data\n");
-
-  ret = gnutls_x509_crq_set_subject_alt_name (crq, GNUTLS_SAN_DNSNAME,
-                                              "foo", 3, 1);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_subject_alt_name\n");
-
-  ret = gnutls_x509_crq_set_subject_alt_name (crq, GNUTLS_SAN_DNSNAME,
-                                              "bar", 3, 1);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_subject_alt_name\n");
-
-  ret = gnutls_x509_crq_set_subject_alt_name (crq, GNUTLS_SAN_DNSNAME,
-                                              "apa", 3, 0);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_subject_alt_name\n");
-
-  ret = gnutls_x509_crq_set_subject_alt_name (crq, GNUTLS_SAN_DNSNAME,
-                                              "foo", 3, 1);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_subject_alt_name\n");
-
-  s = 0;
-  ret = gnutls_x509_crq_get_key_purpose_oid (crq, 0, NULL, &s, NULL);
-  if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
-    fail ("gnutls_x509_crq_get_key_purpose_oid %d\n", ret);
-
-  s = 0;
-  ret =
-    gnutls_x509_crq_set_key_purpose_oid (crq, GNUTLS_KP_TLS_WWW_SERVER, 0);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_key_purpose_oid %d\n", ret);
-
-  s = 0;
-  ret = gnutls_x509_crq_get_key_purpose_oid (crq, 0, NULL, &s, NULL);
-  if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
-    fail ("gnutls_x509_crq_get_key_purpose_oid %d\n", ret);
-
-  s = 0;
-  ret =
-    gnutls_x509_crq_set_key_purpose_oid (crq, GNUTLS_KP_TLS_WWW_CLIENT, 1);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_set_key_purpose_oid2 %d\n", ret);
-
-  ret = gnutls_x509_crq_print (crq, GNUTLS_CRT_PRINT_FULL, &out);
-  if (ret != 0)
-    fail ("gnutls_x509_crq_print\n");
-  if (debug)
-    printf ("crq: %.*s\n", out.size, out.data);
-  gnutls_free (out.data);
-
-  ret = gnutls_x509_crt_set_version (crt, 3);
-  if (ret != 0)
-    fail ("gnutls_x509_crt_set_version\n");
-
-  ret = gnutls_x509_crt_set_crq_extensions (crt, crq);
-  if (ret != 0)
-    fail ("gnutls_x509_crt_set_crq_extensions\n");
-
-  ret = gnutls_x509_crt_print (crt, GNUTLS_CRT_PRINT_FULL, &out);
-  if (ret != 0)
-    fail ("gnutls_x509_crt_print\n");
-  if (debug)
-    printf ("crt: %.*s\n", out.size, out.data);
-  gnutls_free (out.data);
-
-  gnutls_x509_crq_deinit (crq);
-  gnutls_x509_crt_deinit (crt);
-  gnutls_x509_privkey_deinit (pkey);
-
-  gnutls_global_deinit ();
+	size_t s = 0;
+
+	char smallbuf[10];
+
+	int ret;
+
+	ret = global_init();
+	if (ret < 0)
+		fail("global_init\n");
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(4711);
+
+	ret = gnutls_x509_crq_init(&crq);
+	if (ret != 0)
+		fail("gnutls_x509_crq_init\n");
+
+	ret = gnutls_x509_privkey_init(&pkey);
+	if (ret != 0)
+		fail("gnutls_x509_privkey_init\n");
+
+	ret = gnutls_x509_crt_init(&crt);
+	if (ret != 0)
+		fail("gnutls_x509_crt_init\n");
+
+	ret = gnutls_x509_privkey_import(pkey, &key, GNUTLS_X509_FMT_PEM);
+	if (ret != 0)
+		fail("gnutls_x509_privkey_import\n");
+
+	ret = gnutls_x509_crq_set_version(crq, 0);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_version\n");
+
+	ret = gnutls_x509_crq_set_key(crq, pkey);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_key\n");
+
+	s = 0;
+	ret = gnutls_x509_crq_get_extension_info(crq, 0, NULL, &s, NULL);
+	if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+		fail("gnutls_x509_crq_get_extension_info\n");
+
+	ret = gnutls_x509_crq_set_basic_constraints(crq, 0, 0);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_basic_constraints %d\n", ret);
+
+	ret = gnutls_x509_crq_set_key_usage(crq, 0);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_key_usage %d\n", ret);
+
+	ret = gnutls_x509_crq_get_challenge_password(crq, NULL, &s);
+	if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+		fail("%d: gnutls_x509_crq_get_challenge_password %d: %s\n",
+		     __LINE__, ret, gnutls_strerror(ret));
+
+	ret = gnutls_x509_crq_set_challenge_password(crq, "foo");
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_challenge_password %d\n", ret);
+
+	s = 0;
+	ret = gnutls_x509_crq_get_challenge_password(crq, NULL, &s);
+	if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER || s != 4)
+		fail("%d: gnutls_x509_crq_get_challenge_password %d: %s (passlen: %d)\n", __LINE__, ret, gnutls_strerror(ret), (int) s);
+
+	s = 10;
+	ret = gnutls_x509_crq_get_challenge_password(crq, smallbuf, &s);
+	if (ret != 0 || s != 3 || strcmp(smallbuf, "foo") != 0)
+		fail("%d: gnutls_x509_crq_get_challenge_password3 %d/%d/%s\n", __LINE__, ret, (int) s, smallbuf);
+
+	s = 0;
+	ret = gnutls_x509_crq_get_extension_info(crq, 0, NULL, &s, NULL);
+	if (ret != 0)
+		fail("gnutls_x509_crq_get_extension_info2\n");
+
+	s = 0;
+	ret = gnutls_x509_crq_get_extension_data(crq, 0, NULL, &s);
+	if (ret != 0)
+		fail("gnutls_x509_crq_get_extension_data\n");
+
+	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
+						   "foo", 3, 1);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_subject_alt_name\n");
+
+	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
+						   "bar", 3, 1);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_subject_alt_name\n");
+
+	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
+						   "apa", 3, 0);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_subject_alt_name\n");
+
+	ret = gnutls_x509_crq_set_subject_alt_name(crq, GNUTLS_SAN_DNSNAME,
+						   "foo", 3, 1);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_subject_alt_name\n");
+
+	s = 0;
+	ret = gnutls_x509_crq_get_key_purpose_oid(crq, 0, NULL, &s, NULL);
+	if (ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+		fail("gnutls_x509_crq_get_key_purpose_oid %d\n", ret);
+
+	s = 0;
+	ret =
+	    gnutls_x509_crq_set_key_purpose_oid(crq,
+						GNUTLS_KP_TLS_WWW_SERVER,
+						0);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_key_purpose_oid %d\n", ret);
+
+	s = 0;
+	ret = gnutls_x509_crq_get_key_purpose_oid(crq, 0, NULL, &s, NULL);
+	if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
+		fail("gnutls_x509_crq_get_key_purpose_oid %d\n", ret);
+
+	s = 0;
+	ret =
+	    gnutls_x509_crq_set_key_purpose_oid(crq,
+						GNUTLS_KP_TLS_WWW_CLIENT,
+						1);
+	if (ret != 0)
+		fail("gnutls_x509_crq_set_key_purpose_oid2 %d\n", ret);
+
+	ret = gnutls_x509_crq_print(crq, GNUTLS_CRT_PRINT_FULL, &out);
+	if (ret != 0)
+		fail("gnutls_x509_crq_print\n");
+	if (debug)
+		printf("crq: %.*s\n", out.size, out.data);
+	gnutls_free(out.data);
+
+	ret = gnutls_x509_crt_set_version(crt, 3);
+	if (ret != 0)
+		fail("gnutls_x509_crt_set_version\n");
+
+	ret = gnutls_x509_crt_set_crq_extensions(crt, crq);
+	if (ret != 0)
+		fail("gnutls_x509_crt_set_crq_extensions\n");
+
+	ret = gnutls_x509_crt_print(crt, GNUTLS_CRT_PRINT_FULL, &out);
+	if (ret != 0)
+		fail("gnutls_x509_crt_print\n");
+	if (debug)
+		printf("crt: %.*s\n", out.size, out.data);
+	gnutls_free(out.data);
+
+	gnutls_x509_crq_deinit(crq);
+	gnutls_x509_crt_deinit(crt);
+	gnutls_x509_privkey_deinit(pkey);
+
+	gnutls_global_deinit();
 }