Indent (using GNU indent 2.2.11).

5 files changed, 66 insertions, 54 deletions

diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 7c1dc01f3f..2223c98068 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -141,17 +141,19 @@ gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
   gnutls_cert *ccert;
   /* this should be first */
 
-  ret = gnutls_privkey_init(&privkey);
-  if (ret < 0) 
+  ret = gnutls_privkey_init (&privkey);
+  if (ret < 0)
     {
-      gnutls_assert();
+      gnutls_assert ();
       return ret;
     }
 
-  ret = gnutls_privkey_import_openpgp (privkey, pkey, GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
+  ret =
+    gnutls_privkey_import_openpgp (privkey, pkey,
+				   GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
   if (ret < 0)
     {
-      gnutls_privkey_deinit(privkey);
+      gnutls_privkey_deinit (privkey);
       gnutls_assert ();
       return ret;
     }
@@ -161,7 +163,7 @@ gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
   if (ccert == NULL)
     {
       gnutls_assert ();
-      gnutls_privkey_deinit(privkey);
+      gnutls_privkey_deinit (privkey);
       return GNUTLS_E_MEMORY_ERROR;
     }
 
@@ -169,19 +171,20 @@ gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
   if (ret < 0)
     {
       gnutls_assert ();
-      gnutls_free(ccert);
-      gnutls_privkey_deinit(privkey);
+      gnutls_free (ccert);
+      gnutls_privkey_deinit (privkey);
       return ret;
     }
 
-  ret = certificate_credentials_append_pkey(res, privkey);
-  if (ret >=0) ret = certificate_credential_append_crt_list(res, ccert, 1);
+  ret = certificate_credentials_append_pkey (res, privkey);
+  if (ret >= 0)
+    ret = certificate_credential_append_crt_list (res, ccert, 1);
 
   if (ret < 0)
     {
-      gnutls_assert();
-      gnutls_free(ccert);
-      gnutls_privkey_deinit(privkey);
+      gnutls_assert ();
+      gnutls_free (ccert);
+      gnutls_privkey_deinit (privkey);
       return ret;
     }
 
@@ -402,27 +405,27 @@ gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t res,
   if (subkey_id != NULL)
     {
       if (strcasecmp (subkey_id, "auto") == 0)
-        ret = gnutls_openpgp_crt_get_auth_subkey (crt, keyid, 1);
+	ret = gnutls_openpgp_crt_get_auth_subkey (crt, keyid, 1);
       else
-        ret = get_keyid (keyid, subkey_id);
+	ret = get_keyid (keyid, subkey_id);
 
       if (ret < 0)
-        gnutls_assert();
+	gnutls_assert ();
 
       if (ret >= 0)
-        {
-          ret = gnutls_openpgp_crt_set_preferred_key_id (crt, keyid);
-          if (ret >= 0)
-            ret = gnutls_openpgp_privkey_set_preferred_key_id (pkey, keyid);
-        }
+	{
+	  ret = gnutls_openpgp_crt_set_preferred_key_id (crt, keyid);
+	  if (ret >= 0)
+	    ret = gnutls_openpgp_privkey_set_preferred_key_id (pkey, keyid);
+	}
 
       if (ret < 0)
-        {
-          gnutls_assert ();
-          gnutls_openpgp_privkey_deinit (pkey);
-          gnutls_openpgp_crt_deinit (crt);
-          return ret;
-        }
+	{
+	  gnutls_assert ();
+	  gnutls_openpgp_privkey_deinit (pkey);
+	  gnutls_openpgp_crt_deinit (crt);
+	  return ret;
+	}
     }
 
   ret = gnutls_certificate_set_openpgp_key (res, crt, pkey);
@@ -740,7 +743,8 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, gnutls_openpgp_crt_t cert)
 
       _gnutls_debug_log
 	("Importing Openpgp cert and using openpgp sub key: %s\n",
-	 _gnutls_bin2hex (keyid, sizeof (keyid), err_buf, sizeof (err_buf), NULL));
+	 _gnutls_bin2hex (keyid, sizeof (keyid), err_buf, sizeof (err_buf),
+			  NULL));
 
       KEYID_IMPORT (kid32, keyid);
 
@@ -874,10 +878,11 @@ gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
 
       KEYID_IMPORT (kid, keyid);
 
-      idx = gnutls_openpgp_privkey_get_subkey_idx(key, keyid);
-      pk_algorithm = gnutls_openpgp_privkey_get_subkey_pk_algorithm (key, idx, NULL);
-      result = _gnutls_openpgp_privkey_get_mpis (key, kid,
-						 params, &params_size);
+      idx = gnutls_openpgp_privkey_get_subkey_idx (key, keyid);
+      pk_algorithm =
+	gnutls_openpgp_privkey_get_subkey_pk_algorithm (key, idx, NULL);
+      result =
+	_gnutls_openpgp_privkey_get_mpis (key, kid, params, &params_size);
     }
   else
     {
@@ -893,7 +898,8 @@ gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
     }
 
 
-  result = _gnutls_soft_sign (pk_algorithm, params, params_size, hash, signature);
+  result =
+    _gnutls_soft_sign (pk_algorithm, params, params_size, hash, signature);
 
   for (i = 0; i < params_size; i++)
     _gnutls_mpi_release (&params[i]);
@@ -923,8 +929,9 @@ gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
  **/
 int
 gnutls_openpgp_privkey_decrypt_data (gnutls_openpgp_privkey_t key,
-      unsigned int flags, const gnutls_datum_t * ciphertext,
-				  gnutls_datum_t * plaintext)
+				     unsigned int flags,
+				     const gnutls_datum_t * ciphertext,
+				     gnutls_datum_t * plaintext)
 {
   int result, i;
   bigint_t params[MAX_PUBLIC_PARAMS_SIZE];
@@ -937,7 +944,7 @@ gnutls_openpgp_privkey_decrypt_data (gnutls_openpgp_privkey_t key,
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
     }
-  
+
   result = gnutls_openpgp_privkey_get_preferred_key_id (key, keyid);
   if (result == 0)
     {
@@ -963,11 +970,12 @@ gnutls_openpgp_privkey_decrypt_data (gnutls_openpgp_privkey_t key,
 
   if (pk_algorithm != GNUTLS_PK_RSA)
     {
-      gnutls_assert();
+      gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
     }
 
-  result = _gnutls_pkcs1_rsa_decrypt (plaintext, ciphertext, params, params_size, 2);
+  result =
+    _gnutls_pkcs1_rsa_decrypt (plaintext, ciphertext, params, params_size, 2);
 
   for (i = 0; i < params_size; i++)
     _gnutls_mpi_release (&params[i]);
diff --git a/lib/openpgp/openpgp_int.h b/lib/openpgp/openpgp_int.h
index 8071aa0098..235bcfd482 100644
--- a/lib/openpgp/openpgp_int.h
+++ b/lib/openpgp/openpgp_int.h
@@ -1,8 +1,8 @@
 #ifndef OPENPGP_LOCAL_H
-# define OPENPGP_LOCAL_H
+#define OPENPGP_LOCAL_H
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #ifdef ENABLE_OPENPGP
diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index 0413668c8a..eaa1902d68 100644
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -37,7 +37,8 @@
 #define adds _gnutls_buffer_append_str
 
 static void
-hexdump (gnutls_buffer_st * str, const char *data, size_t len, const char *spc)
+hexdump (gnutls_buffer_st * str, const char *data, size_t len,
+	 const char *spc)
 {
   size_t j;
 
@@ -237,7 +238,9 @@ print_key_info (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, int idx)
 	name = _("unknown");
 
       addf (str, _("\tPublic Key Algorithm: %s\n"), name);
-      addf (str, _("\tKey Security Level: %s\n"), gnutls_sec_param_get_name(gnutls_pk_bits_to_sec_param(err, bits)));
+      addf (str, _("\tKey Security Level: %s\n"),
+	    gnutls_sec_param_get_name (gnutls_pk_bits_to_sec_param
+				       (err, bits)));
 
       switch (err)
 	{
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 2dede0e083..e2a5230be3 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -773,7 +773,7 @@ _gnutls_openpgp_find_subkey_idx (cdk_kbnode_t knode, uint32_t keyid[2],
   int i = 0;
   uint32_t local_keyid[2];
 
-  _gnutls_hard_log("Looking keyid: %x.%x\n", keyid[0], keyid[1]);
+  _gnutls_hard_log ("Looking keyid: %x.%x\n", keyid[0], keyid[1]);
 
   ctx = NULL;
   while ((p = cdk_kbnode_walk (knode, &ctx, 0)))
@@ -788,7 +788,8 @@ _gnutls_openpgp_find_subkey_idx (cdk_kbnode_t knode, uint32_t keyid[2],
 	  else
 	    cdk_pk_get_keyid (pkt->pkt.secret_key->pk, local_keyid);
 
-          _gnutls_hard_log("Found keyid: %x.%x\n", local_keyid[0], local_keyid[1]);
+	  _gnutls_hard_log ("Found keyid: %x.%x\n", local_keyid[0],
+			    local_keyid[1]);
 	  if (local_keyid[0] == keyid[0] && local_keyid[1] == keyid[1])
 	    {
 	      return i;
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 9450e33cb4..a3cdf12751 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -87,13 +87,13 @@ gnutls_openpgp_privkey_deinit (gnutls_openpgp_privkey_t key)
 gnutls_sec_param_t
 gnutls_openpgp_privkey_sec_param (gnutls_openpgp_privkey_t key)
 {
-gnutls_pk_algorithm_t algo;
-unsigned int bits;
+  gnutls_pk_algorithm_t algo;
+  unsigned int bits;
 
   algo = gnutls_openpgp_privkey_get_pk_algorithm (key, &bits);
-  if (algo == GNUTLS_PK_UNKNOWN) 
+  if (algo == GNUTLS_PK_UNKNOWN)
     {
-      gnutls_assert();
+      gnutls_assert ();
       return GNUTLS_SEC_PARAM_UNKNOWN;
     }
 
@@ -718,7 +718,7 @@ _gnutls_openpgp_privkey_get_mpis (gnutls_openpgp_privkey_t pkey,
   gnutls_pk_params_st pk_params;
   cdk_packet_t pkt;
 
-  memset(&pk_params, 0, sizeof(pk_params));
+  memset (&pk_params, 0, sizeof (pk_params));
 
   if (keyid == NULL)
     pkt = cdk_kbnode_find_packet (pkey->knode, CDK_PKT_SECRET_KEY);
@@ -739,7 +739,7 @@ _gnutls_openpgp_privkey_get_mpis (gnutls_openpgp_privkey_t pkey,
     case GNUTLS_PK_RSA:
       /* openpgp does not hold all parameters as in PKCS #1
        */
-      pk_params.params_nr = RSA_PRIVATE_PARAMS-2;
+      pk_params.params_nr = RSA_PRIVATE_PARAMS - 2;
       break;
     case GNUTLS_PK_DSA:
       pk_params.params_nr = DSA_PRIVATE_PARAMS;
@@ -758,9 +758,9 @@ _gnutls_openpgp_privkey_get_mpis (gnutls_openpgp_privkey_t pkey,
 	  goto error;
 	}
     }
-    /* fixup will generate exp1 and exp2 that are not
-     * available here.
-     */
+  /* fixup will generate exp1 and exp2 that are not
+   * available here.
+   */
   result = _gnutls_pk_fixup (pk_algorithm, GNUTLS_IMPORT, &pk_params);
   if (result < 0)
     {
@@ -775,7 +775,7 @@ _gnutls_openpgp_privkey_get_mpis (gnutls_openpgp_privkey_t pkey,
     }
 
   *params_size = pk_params.params_nr;
-  for(i=0;i<pk_params.params_nr;i++)
+  for (i = 0; i < pk_params.params_nr; i++)
     params[i] = pk_params.params[i];
 
   return 0;