reindented code

1 files changed, 281 insertions, 272 deletions

diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index e87e2d307f..abb0ed348b 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -31,8 +31,7 @@
 #include <limits.h>
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 /* Openpgp certificate stuff
@@ -45,257 +44,270 @@ extern "C"
  *
  * Enumeration of different OpenPGP key formats.
  */
-  typedef enum gnutls_openpgp_crt_fmt
-  {
-    GNUTLS_OPENPGP_FMT_RAW,
-    GNUTLS_OPENPGP_FMT_BASE64
-  } gnutls_openpgp_crt_fmt_t;
+	typedef enum gnutls_openpgp_crt_fmt {
+		GNUTLS_OPENPGP_FMT_RAW,
+		GNUTLS_OPENPGP_FMT_BASE64
+	} gnutls_openpgp_crt_fmt_t;
 
 #define GNUTLS_OPENPGP_KEYID_SIZE 8
 #define GNUTLS_OPENPGP_V4_FINGERPRINT_SIZE 20
-  typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
+	typedef unsigned char
+	    gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
 
 /* gnutls_openpgp_cert_t should be defined in gnutls.h
  */
 
-  /* initializes the memory for gnutls_openpgp_crt_t struct */
-  int gnutls_openpgp_crt_init (gnutls_openpgp_crt_t * key);
-  /* frees all memory */
-  void gnutls_openpgp_crt_deinit (gnutls_openpgp_crt_t key);
-
-  int gnutls_openpgp_crt_import (gnutls_openpgp_crt_t key,
-                                 const gnutls_datum_t * data,
-                                 gnutls_openpgp_crt_fmt_t format);
-  int gnutls_openpgp_crt_export (gnutls_openpgp_crt_t key,
-                                 gnutls_openpgp_crt_fmt_t format,
-                                 void *output_data,
-                                 size_t * output_data_size);
-  int gnutls_openpgp_crt_export2 (gnutls_openpgp_crt_t key,
-                                  gnutls_openpgp_crt_fmt_t format,
-                                  gnutls_datum_t * out);
-
-  int gnutls_openpgp_crt_print (gnutls_openpgp_crt_t cert,
-                                gnutls_certificate_print_formats_t format,
-                                gnutls_datum_t * out);
+	/* initializes the memory for gnutls_openpgp_crt_t struct */
+	int gnutls_openpgp_crt_init(gnutls_openpgp_crt_t * key);
+	/* frees all memory */
+	void gnutls_openpgp_crt_deinit(gnutls_openpgp_crt_t key);
+
+	int gnutls_openpgp_crt_import(gnutls_openpgp_crt_t key,
+				      const gnutls_datum_t * data,
+				      gnutls_openpgp_crt_fmt_t format);
+	int gnutls_openpgp_crt_export(gnutls_openpgp_crt_t key,
+				      gnutls_openpgp_crt_fmt_t format,
+				      void *output_data,
+				      size_t * output_data_size);
+	int gnutls_openpgp_crt_export2(gnutls_openpgp_crt_t key,
+				       gnutls_openpgp_crt_fmt_t format,
+				       gnutls_datum_t * out);
+
+	int gnutls_openpgp_crt_print(gnutls_openpgp_crt_t cert,
+				     gnutls_certificate_print_formats_t
+				     format, gnutls_datum_t * out);
 
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
 #define GNUTLS_OPENPGP_MASTER_KEYID_IDX INT_MAX
 
-  int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t key,
-                                        unsigned int *key_usage);
-  int gnutls_openpgp_crt_get_fingerprint (gnutls_openpgp_crt_t key, void *fpr,
-                                          size_t * fprlen);
-  int gnutls_openpgp_crt_get_subkey_fingerprint (gnutls_openpgp_crt_t key,
-                                                 unsigned int idx,
-                                                 void *fpr, size_t * fprlen);
-
-  int gnutls_openpgp_crt_get_name (gnutls_openpgp_crt_t key,
-                                   int idx, char *buf, size_t * sizeof_buf);
-
-    gnutls_pk_algorithm_t
-    gnutls_openpgp_crt_get_pk_algorithm (gnutls_openpgp_crt_t key,
-                                         unsigned int *bits);
-
-  int gnutls_openpgp_crt_get_version (gnutls_openpgp_crt_t key);
-
-  time_t gnutls_openpgp_crt_get_creation_time (gnutls_openpgp_crt_t key);
-  time_t gnutls_openpgp_crt_get_expiration_time (gnutls_openpgp_crt_t key);
-
-  int gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key,
-                                     gnutls_openpgp_keyid_t keyid);
-
-  int gnutls_openpgp_crt_check_hostname (gnutls_openpgp_crt_t key,
-                                         const char *hostname);
-
-  int gnutls_openpgp_crt_get_revoked_status (gnutls_openpgp_crt_t key);
-
-  int gnutls_openpgp_crt_get_subkey_count (gnutls_openpgp_crt_t key);
-  int gnutls_openpgp_crt_get_subkey_idx (gnutls_openpgp_crt_t key,
-                                         const gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_crt_get_subkey_revoked_status (gnutls_openpgp_crt_t key,
-                                                    unsigned int idx);
-    gnutls_pk_algorithm_t
-    gnutls_openpgp_crt_get_subkey_pk_algorithm (gnutls_openpgp_crt_t key,
-                                                unsigned int idx,
-                                                unsigned int *bits);
-  time_t gnutls_openpgp_crt_get_subkey_creation_time (gnutls_openpgp_crt_t
-                                                      key, unsigned int idx);
-  time_t gnutls_openpgp_crt_get_subkey_expiration_time (gnutls_openpgp_crt_t
-                                                        key,
-                                                        unsigned int idx);
-  int gnutls_openpgp_crt_get_subkey_id (gnutls_openpgp_crt_t key,
-                                        unsigned int idx,
-                                        gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_crt_get_subkey_usage (gnutls_openpgp_crt_t key,
-                                           unsigned int idx,
-                                           unsigned int *key_usage);
-
-  int gnutls_openpgp_crt_get_subkey_pk_dsa_raw (gnutls_openpgp_crt_t crt,
-                                                unsigned int idx,
-                                                gnutls_datum_t * p,
-                                                gnutls_datum_t * q,
-                                                gnutls_datum_t * g,
-                                                gnutls_datum_t * y);
-  int gnutls_openpgp_crt_get_subkey_pk_rsa_raw (gnutls_openpgp_crt_t crt,
-                                                unsigned int idx,
-                                                gnutls_datum_t * m,
-                                                gnutls_datum_t * e);
-  int gnutls_openpgp_crt_get_pk_dsa_raw (gnutls_openpgp_crt_t crt,
-                                         gnutls_datum_t * p,
-                                         gnutls_datum_t * q,
-                                         gnutls_datum_t * g,
-                                         gnutls_datum_t * y);
-  int gnutls_openpgp_crt_get_pk_rsa_raw (gnutls_openpgp_crt_t crt,
-                                         gnutls_datum_t * m,
-                                         gnutls_datum_t * e);
-
-  int gnutls_openpgp_crt_get_preferred_key_id (gnutls_openpgp_crt_t key,
-                                               gnutls_openpgp_keyid_t keyid);
-  int
-    gnutls_openpgp_crt_set_preferred_key_id (gnutls_openpgp_crt_t key,
-                                             const gnutls_openpgp_keyid_t
-                                             keyid);
+	int gnutls_openpgp_crt_get_key_usage(gnutls_openpgp_crt_t key,
+					     unsigned int *key_usage);
+	int gnutls_openpgp_crt_get_fingerprint(gnutls_openpgp_crt_t key,
+					       void *fpr, size_t * fprlen);
+	int gnutls_openpgp_crt_get_subkey_fingerprint(gnutls_openpgp_crt_t
+						      key,
+						      unsigned int idx,
+						      void *fpr,
+						      size_t * fprlen);
+
+	int gnutls_openpgp_crt_get_name(gnutls_openpgp_crt_t key,
+					int idx, char *buf,
+					size_t * sizeof_buf);
+
+	 gnutls_pk_algorithm_t
+	    gnutls_openpgp_crt_get_pk_algorithm(gnutls_openpgp_crt_t key,
+						unsigned int *bits);
+
+	int gnutls_openpgp_crt_get_version(gnutls_openpgp_crt_t key);
+
+	time_t gnutls_openpgp_crt_get_creation_time(gnutls_openpgp_crt_t
+						    key);
+	time_t gnutls_openpgp_crt_get_expiration_time(gnutls_openpgp_crt_t
+						      key);
+
+	int gnutls_openpgp_crt_get_key_id(gnutls_openpgp_crt_t key,
+					  gnutls_openpgp_keyid_t keyid);
+
+	int gnutls_openpgp_crt_check_hostname(gnutls_openpgp_crt_t key,
+					      const char *hostname);
+
+	int gnutls_openpgp_crt_get_revoked_status(gnutls_openpgp_crt_t
+						  key);
+
+	int gnutls_openpgp_crt_get_subkey_count(gnutls_openpgp_crt_t key);
+	int gnutls_openpgp_crt_get_subkey_idx(gnutls_openpgp_crt_t key,
+					      const gnutls_openpgp_keyid_t
+					      keyid);
+	int gnutls_openpgp_crt_get_subkey_revoked_status
+	    (gnutls_openpgp_crt_t key, unsigned int idx);
+	 gnutls_pk_algorithm_t
+	    gnutls_openpgp_crt_get_subkey_pk_algorithm(gnutls_openpgp_crt_t
+						       key,
+						       unsigned int idx,
+						       unsigned int *bits);
+	time_t
+	    gnutls_openpgp_crt_get_subkey_creation_time
+	    (gnutls_openpgp_crt_t key, unsigned int idx);
+	time_t
+	    gnutls_openpgp_crt_get_subkey_expiration_time
+	    (gnutls_openpgp_crt_t key, unsigned int idx);
+	int gnutls_openpgp_crt_get_subkey_id(gnutls_openpgp_crt_t key,
+					     unsigned int idx,
+					     gnutls_openpgp_keyid_t keyid);
+	int gnutls_openpgp_crt_get_subkey_usage(gnutls_openpgp_crt_t key,
+						unsigned int idx,
+						unsigned int *key_usage);
+
+	int gnutls_openpgp_crt_get_subkey_pk_dsa_raw(gnutls_openpgp_crt_t
+						     crt, unsigned int idx,
+						     gnutls_datum_t * p,
+						     gnutls_datum_t * q,
+						     gnutls_datum_t * g,
+						     gnutls_datum_t * y);
+	int gnutls_openpgp_crt_get_subkey_pk_rsa_raw(gnutls_openpgp_crt_t
+						     crt, unsigned int idx,
+						     gnutls_datum_t * m,
+						     gnutls_datum_t * e);
+	int gnutls_openpgp_crt_get_pk_dsa_raw(gnutls_openpgp_crt_t crt,
+					      gnutls_datum_t * p,
+					      gnutls_datum_t * q,
+					      gnutls_datum_t * g,
+					      gnutls_datum_t * y);
+	int gnutls_openpgp_crt_get_pk_rsa_raw(gnutls_openpgp_crt_t crt,
+					      gnutls_datum_t * m,
+					      gnutls_datum_t * e);
+
+	int gnutls_openpgp_crt_get_preferred_key_id(gnutls_openpgp_crt_t
+						    key,
+						    gnutls_openpgp_keyid_t
+						    keyid);
+	int
+	 gnutls_openpgp_crt_set_preferred_key_id(gnutls_openpgp_crt_t key,
+						 const
+						 gnutls_openpgp_keyid_t
+						 keyid);
 
 /* privkey stuff.
  */
-  int gnutls_openpgp_privkey_init (gnutls_openpgp_privkey_t * key);
-  void gnutls_openpgp_privkey_deinit (gnutls_openpgp_privkey_t key);
-    gnutls_pk_algorithm_t
-    gnutls_openpgp_privkey_get_pk_algorithm (gnutls_openpgp_privkey_t key,
-                                             unsigned int *bits);
-
-    gnutls_sec_param_t
-    gnutls_openpgp_privkey_sec_param (gnutls_openpgp_privkey_t key);
-  int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key,
-                                     const gnutls_datum_t * data,
-                                     gnutls_openpgp_crt_fmt_t format,
-                                     const char *password,
-                                     unsigned int flags);
-
-  int gnutls_openpgp_privkey_get_fingerprint (gnutls_openpgp_privkey_t key,
-                                              void *fpr, size_t * fprlen);
-  int gnutls_openpgp_privkey_get_subkey_fingerprint (gnutls_openpgp_privkey_t
-                                                     key, unsigned int idx,
-                                                     void *fpr,
-                                                     size_t * fprlen);
-  int gnutls_openpgp_privkey_get_key_id (gnutls_openpgp_privkey_t key,
-                                         gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_privkey_get_subkey_count (gnutls_openpgp_privkey_t key);
-  int gnutls_openpgp_privkey_get_subkey_idx (gnutls_openpgp_privkey_t key,
-                                             const gnutls_openpgp_keyid_t
-                                             keyid);
-
-  int
-    gnutls_openpgp_privkey_get_subkey_revoked_status (gnutls_openpgp_privkey_t
-                                                      key, unsigned int idx);
-
-  int gnutls_openpgp_privkey_get_revoked_status (gnutls_openpgp_privkey_t
-                                                 key);
-
-    gnutls_pk_algorithm_t
-    gnutls_openpgp_privkey_get_subkey_pk_algorithm (gnutls_openpgp_privkey_t
-                                                    key, unsigned int idx,
-                                                    unsigned int *bits);
-
-    time_t
-    gnutls_openpgp_privkey_get_subkey_expiration_time
-    (gnutls_openpgp_privkey_t key, unsigned int idx);
-
-  int gnutls_openpgp_privkey_get_subkey_id (gnutls_openpgp_privkey_t key,
-                                            unsigned int idx,
-                                            gnutls_openpgp_keyid_t keyid);
-
-    time_t
-    gnutls_openpgp_privkey_get_subkey_creation_time (gnutls_openpgp_privkey_t
-                                                     key, unsigned int idx);
-
-  int
-    gnutls_openpgp_privkey_export_subkey_dsa_raw (gnutls_openpgp_privkey_t
-                                                  pkey, unsigned int idx,
-                                                  gnutls_datum_t * p,
-                                                  gnutls_datum_t * q,
-                                                  gnutls_datum_t * g,
-                                                  gnutls_datum_t * y,
-                                                  gnutls_datum_t * x);
-  int gnutls_openpgp_privkey_export_subkey_rsa_raw (gnutls_openpgp_privkey_t
-                                                    pkey, unsigned int idx,
-                                                    gnutls_datum_t * m,
-                                                    gnutls_datum_t * e,
-                                                    gnutls_datum_t * d,
-                                                    gnutls_datum_t * p,
-                                                    gnutls_datum_t * q,
-                                                    gnutls_datum_t * u);
-
-  int gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t pkey,
-                                             gnutls_datum_t * p,
-                                             gnutls_datum_t * q,
-                                             gnutls_datum_t * g,
-                                             gnutls_datum_t * y,
-                                             gnutls_datum_t * x);
-  int gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t pkey,
-                                             gnutls_datum_t * m,
-                                             gnutls_datum_t * e,
-                                             gnutls_datum_t * d,
-                                             gnutls_datum_t * p,
-                                             gnutls_datum_t * q,
-                                             gnutls_datum_t * u);
-
-  int gnutls_openpgp_privkey_export (gnutls_openpgp_privkey_t key,
-                                     gnutls_openpgp_crt_fmt_t format,
-                                     const char *password,
-                                     unsigned int flags,
-                                     void *output_data,
-                                     size_t * output_data_size);
-  int gnutls_openpgp_privkey_export2 (gnutls_openpgp_privkey_t key,
-                                      gnutls_openpgp_crt_fmt_t format,
-                                      const char *password,
-                                      unsigned int flags,
-                                      gnutls_datum_t * out);
-
-  int
-    gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key,
-                                                 const gnutls_openpgp_keyid_t
-                                                 keyid);
-  int gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t
-                                                   key,
-                                                   gnutls_openpgp_keyid_t
-                                                   keyid);
-
-  int gnutls_openpgp_crt_get_auth_subkey (gnutls_openpgp_crt_t crt,
-                                          gnutls_openpgp_keyid_t keyid,
-                                          unsigned int flag);
+	int gnutls_openpgp_privkey_init(gnutls_openpgp_privkey_t * key);
+	void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey_t key);
+	 gnutls_pk_algorithm_t
+	    gnutls_openpgp_privkey_get_pk_algorithm
+	    (gnutls_openpgp_privkey_t key, unsigned int *bits);
+
+	 gnutls_sec_param_t
+	    gnutls_openpgp_privkey_sec_param(gnutls_openpgp_privkey_t key);
+	int gnutls_openpgp_privkey_import(gnutls_openpgp_privkey_t key,
+					  const gnutls_datum_t * data,
+					  gnutls_openpgp_crt_fmt_t format,
+					  const char *password,
+					  unsigned int flags);
+
+	int gnutls_openpgp_privkey_get_fingerprint(gnutls_openpgp_privkey_t
+						   key, void *fpr,
+						   size_t * fprlen);
+	int gnutls_openpgp_privkey_get_subkey_fingerprint
+	    (gnutls_openpgp_privkey_t key, unsigned int idx, void *fpr,
+	     size_t * fprlen);
+	int gnutls_openpgp_privkey_get_key_id(gnutls_openpgp_privkey_t key,
+					      gnutls_openpgp_keyid_t
+					      keyid);
+	int gnutls_openpgp_privkey_get_subkey_count
+	    (gnutls_openpgp_privkey_t key);
+	int gnutls_openpgp_privkey_get_subkey_idx(gnutls_openpgp_privkey_t
+						  key,
+						  const
+						  gnutls_openpgp_keyid_t
+						  keyid);
+
+	int
+	 gnutls_openpgp_privkey_get_subkey_revoked_status
+	    (gnutls_openpgp_privkey_t key, unsigned int idx);
+
+	int gnutls_openpgp_privkey_get_revoked_status
+	    (gnutls_openpgp_privkey_t key);
+
+	 gnutls_pk_algorithm_t
+	    gnutls_openpgp_privkey_get_subkey_pk_algorithm
+	    (gnutls_openpgp_privkey_t key, unsigned int idx,
+	     unsigned int *bits);
+
+	 time_t
+	    gnutls_openpgp_privkey_get_subkey_expiration_time
+	    (gnutls_openpgp_privkey_t key, unsigned int idx);
+
+	int gnutls_openpgp_privkey_get_subkey_id(gnutls_openpgp_privkey_t
+						 key, unsigned int idx,
+						 gnutls_openpgp_keyid_t
+						 keyid);
+
+	 time_t
+	    gnutls_openpgp_privkey_get_subkey_creation_time
+	    (gnutls_openpgp_privkey_t key, unsigned int idx);
+
+	int
+	 gnutls_openpgp_privkey_export_subkey_dsa_raw
+	    (gnutls_openpgp_privkey_t pkey, unsigned int idx,
+	     gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * g,
+	     gnutls_datum_t * y, gnutls_datum_t * x);
+	int gnutls_openpgp_privkey_export_subkey_rsa_raw
+	    (gnutls_openpgp_privkey_t pkey, unsigned int idx,
+	     gnutls_datum_t * m, gnutls_datum_t * e, gnutls_datum_t * d,
+	     gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * u);
+
+	int gnutls_openpgp_privkey_export_dsa_raw(gnutls_openpgp_privkey_t
+						  pkey, gnutls_datum_t * p,
+						  gnutls_datum_t * q,
+						  gnutls_datum_t * g,
+						  gnutls_datum_t * y,
+						  gnutls_datum_t * x);
+	int gnutls_openpgp_privkey_export_rsa_raw(gnutls_openpgp_privkey_t
+						  pkey, gnutls_datum_t * m,
+						  gnutls_datum_t * e,
+						  gnutls_datum_t * d,
+						  gnutls_datum_t * p,
+						  gnutls_datum_t * q,
+						  gnutls_datum_t * u);
+
+	int gnutls_openpgp_privkey_export(gnutls_openpgp_privkey_t key,
+					  gnutls_openpgp_crt_fmt_t format,
+					  const char *password,
+					  unsigned int flags,
+					  void *output_data,
+					  size_t * output_data_size);
+	int gnutls_openpgp_privkey_export2(gnutls_openpgp_privkey_t key,
+					   gnutls_openpgp_crt_fmt_t format,
+					   const char *password,
+					   unsigned int flags,
+					   gnutls_datum_t * out);
+
+	int
+	 gnutls_openpgp_privkey_set_preferred_key_id
+	    (gnutls_openpgp_privkey_t key,
+	     const gnutls_openpgp_keyid_t keyid);
+	int gnutls_openpgp_privkey_get_preferred_key_id
+	    (gnutls_openpgp_privkey_t key, gnutls_openpgp_keyid_t keyid);
+
+	int gnutls_openpgp_crt_get_auth_subkey(gnutls_openpgp_crt_t crt,
+					       gnutls_openpgp_keyid_t
+					       keyid, unsigned int flag);
 
 /* Keyring stuff.
  */
 
-  int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring_t * keyring);
-  void gnutls_openpgp_keyring_deinit (gnutls_openpgp_keyring_t keyring);
+	int gnutls_openpgp_keyring_init(gnutls_openpgp_keyring_t *
+					keyring);
+	void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t
+					   keyring);
 
-  int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
-                                     const gnutls_datum_t * data,
-                                     gnutls_openpgp_crt_fmt_t format);
+	int gnutls_openpgp_keyring_import(gnutls_openpgp_keyring_t keyring,
+					  const gnutls_datum_t * data,
+					  gnutls_openpgp_crt_fmt_t format);
 
-  int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
-                                       const gnutls_openpgp_keyid_t keyid,
-                                       unsigned int flags);
+	int gnutls_openpgp_keyring_check_id(gnutls_openpgp_keyring_t ring,
+					    const gnutls_openpgp_keyid_t
+					    keyid, unsigned int flags);
 
 
-  int gnutls_openpgp_crt_verify_ring (gnutls_openpgp_crt_t key,
-                                      gnutls_openpgp_keyring_t keyring,
-                                      unsigned int flags, unsigned int *verify
-                                      /* the output of the verification */ );
+	int gnutls_openpgp_crt_verify_ring(gnutls_openpgp_crt_t key,
+					   gnutls_openpgp_keyring_t
+					   keyring, unsigned int flags,
+					   unsigned int *verify
+					   /* the output of the verification */
+					   );
 
-  int gnutls_openpgp_crt_verify_self (gnutls_openpgp_crt_t key,
-                                      unsigned int flags,
-                                      unsigned int *verify);
+	int gnutls_openpgp_crt_verify_self(gnutls_openpgp_crt_t key,
+					   unsigned int flags,
+					   unsigned int *verify);
 
-  int gnutls_openpgp_keyring_get_crt (gnutls_openpgp_keyring_t ring,
-                                      unsigned int idx,
-                                      gnutls_openpgp_crt_t * cert);
+	int gnutls_openpgp_keyring_get_crt(gnutls_openpgp_keyring_t ring,
+					   unsigned int idx,
+					   gnutls_openpgp_crt_t * cert);
 
-  int gnutls_openpgp_keyring_get_crt_count (gnutls_openpgp_keyring_t ring);
+	int gnutls_openpgp_keyring_get_crt_count(gnutls_openpgp_keyring_t
+						 ring);
 
 
 
@@ -316,59 +328,56 @@ extern "C"
  * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned,
  *   otherwise an error code is returned.
  */
-  typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t session,
-                                               const unsigned char *keyfpr,
-                                               unsigned int keyfpr_length,
-                                               gnutls_datum_t * key);
+	typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t
+						     session,
+						     const unsigned char
+						     *keyfpr,
+						     unsigned int
+						     keyfpr_length,
+						     gnutls_datum_t * key);
 
-  void
-    gnutls_openpgp_set_recv_key_function (gnutls_session_t session,
-                                          gnutls_openpgp_recv_key_func func);
+	void
+	 gnutls_openpgp_set_recv_key_function(gnutls_session_t session,
+					      gnutls_openpgp_recv_key_func
+					      func);
 
 
 
 /* certificate authentication stuff.
  */
-  int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
-					  gnutls_openpgp_crt_t crt,
-                                          gnutls_openpgp_privkey_t pkey);
-
-  int
-    gnutls_certificate_set_openpgp_key_file (gnutls_certificate_credentials_t
-                                             res, const char *certfile,
-                                             const char *keyfile,
-                                             gnutls_openpgp_crt_fmt_t format);
-  int gnutls_certificate_set_openpgp_key_mem (gnutls_certificate_credentials_t
-                                              res,
-                                              const gnutls_datum_t * cert,
-                                              const gnutls_datum_t * key,
-                                              gnutls_openpgp_crt_fmt_t
-                                              format);
-
-  int
-    gnutls_certificate_set_openpgp_key_file2 (gnutls_certificate_credentials_t
-                                              res, const char *certfile,
-                                              const char *keyfile,
-                                              const char *subkey_id,
-                                              gnutls_openpgp_crt_fmt_t
-                                              format);
-  int
-    gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t
-                                             res, const gnutls_datum_t * cert,
-                                             const gnutls_datum_t * key,
-                                             const char *subkey_id,
-                                             gnutls_openpgp_crt_fmt_t format);
-
-  int gnutls_certificate_set_openpgp_keyring_mem (
-   gnutls_certificate_credentials_t c, const unsigned char *data,
-   size_t dlen, gnutls_openpgp_crt_fmt_t format);
-
-  int gnutls_certificate_set_openpgp_keyring_file (
-   gnutls_certificate_credentials_t c, const char *file,
-   gnutls_openpgp_crt_fmt_t format);
+	int gnutls_certificate_set_openpgp_key
+	    (gnutls_certificate_credentials_t res,
+	     gnutls_openpgp_crt_t crt, gnutls_openpgp_privkey_t pkey);
+
+	int
+	 gnutls_certificate_set_openpgp_key_file
+	    (gnutls_certificate_credentials_t res, const char *certfile,
+	     const char *keyfile, gnutls_openpgp_crt_fmt_t format);
+	int gnutls_certificate_set_openpgp_key_mem
+	    (gnutls_certificate_credentials_t res,
+	     const gnutls_datum_t * cert, const gnutls_datum_t * key,
+	     gnutls_openpgp_crt_fmt_t format);
+
+	int
+	 gnutls_certificate_set_openpgp_key_file2
+	    (gnutls_certificate_credentials_t res, const char *certfile,
+	     const char *keyfile, const char *subkey_id,
+	     gnutls_openpgp_crt_fmt_t format);
+	int
+	 gnutls_certificate_set_openpgp_key_mem2
+	    (gnutls_certificate_credentials_t res,
+	     const gnutls_datum_t * cert, const gnutls_datum_t * key,
+	     const char *subkey_id, gnutls_openpgp_crt_fmt_t format);
+
+	int gnutls_certificate_set_openpgp_keyring_mem
+	    (gnutls_certificate_credentials_t c, const unsigned char *data,
+	     size_t dlen, gnutls_openpgp_crt_fmt_t format);
+
+	int gnutls_certificate_set_openpgp_keyring_file
+	    (gnutls_certificate_credentials_t c, const char *file,
+	     gnutls_openpgp_crt_fmt_t format);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif                          /* GNUTLS_OPENPGP_H */
+#endif				/* GNUTLS_OPENPGP_H */