Indent (using GNU indent 2.2.11).

9 files changed, 375 insertions, 320 deletions

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 6eed91dfce..f80d136359 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -10,114 +10,124 @@
 /* Public key operations */
 
 struct gnutls_pubkey_st;
-typedef struct gnutls_pubkey_st* gnutls_pubkey_t;
+typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
 
 int gnutls_pubkey_init (gnutls_pubkey_t * key);
 void gnutls_pubkey_deinit (gnutls_pubkey_t key);
-int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key, unsigned int* bits);
+int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key, unsigned int *bits);
 
-int gnutls_pubkey_import_x509(gnutls_pubkey_t pkey, gnutls_x509_crt_t crt, unsigned int flags);
-int gnutls_pubkey_import_pkcs11(gnutls_pubkey_t pkey, gnutls_pkcs11_obj_t crt, unsigned int flags);
-int gnutls_pubkey_import_openpgp(gnutls_pubkey_t pkey,
-				 gnutls_openpgp_crt_t crt,
-				 gnutls_openpgp_keyid_t keyid,
-				 unsigned int flags);
+int gnutls_pubkey_import_x509 (gnutls_pubkey_t pkey, gnutls_x509_crt_t crt,
+			       unsigned int flags);
+int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t pkey,
+				 gnutls_pkcs11_obj_t crt, unsigned int flags);
+int gnutls_pubkey_import_openpgp (gnutls_pubkey_t pkey,
+				  gnutls_openpgp_crt_t crt,
+				  gnutls_openpgp_keyid_t keyid,
+				  unsigned int flags);
 
 int gnutls_pubkey_get_preferred_hash_algorithm (gnutls_pubkey_t key,
-			      gnutls_digest_algorithm_t * hash, unsigned int *mand);
+						gnutls_digest_algorithm_t *
+						hash, unsigned int *mand);
 
 int gnutls_pubkey_get_pk_rsa_raw (gnutls_pubkey_t crt,
-				gnutls_datum_t * m, gnutls_datum_t * e);
+				  gnutls_datum_t * m, gnutls_datum_t * e);
 int gnutls_pubkey_get_pk_dsa_raw (gnutls_pubkey_t crt,
-				gnutls_datum_t * p, gnutls_datum_t * q,
-				gnutls_datum_t * g, gnutls_datum_t * y);
+				  gnutls_datum_t * p, gnutls_datum_t * q,
+				  gnutls_datum_t * g, gnutls_datum_t * y);
 
 int gnutls_pubkey_export (gnutls_pubkey_t key,
-			      gnutls_x509_crt_fmt_t format,
-			      void *output_data, size_t * output_data_size);
+			  gnutls_x509_crt_fmt_t format,
+			  void *output_data, size_t * output_data_size);
 
 int gnutls_pubkey_get_key_id (gnutls_pubkey_t key, unsigned int flags,
-			    unsigned char *output_data,
-			    size_t * output_data_size);
+			      unsigned char *output_data,
+			      size_t * output_data_size);
 
-int gnutls_pubkey_get_key_usage(gnutls_pubkey_t key, unsigned int *usage);
+int gnutls_pubkey_get_key_usage (gnutls_pubkey_t key, unsigned int *usage);
 int gnutls_pubkey_set_key_usage (gnutls_pubkey_t key, unsigned int usage);
 
 int gnutls_pubkey_import (gnutls_pubkey_t key,
-			      const gnutls_datum_t * data,
-			      gnutls_x509_crt_fmt_t format);
+			  const gnutls_datum_t * data,
+			  gnutls_x509_crt_fmt_t format);
 
 
-int gnutls_pubkey_import_pkcs11_url( gnutls_pubkey_t key, const char* url, 
-	unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
+int gnutls_pubkey_import_pkcs11_url (gnutls_pubkey_t key, const char *url,
+				     unsigned int flags
+				     /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
 int gnutls_pubkey_import_dsa_raw (gnutls_pubkey_t key,
-				    const gnutls_datum_t * p,
-				    const gnutls_datum_t * q,
-				    const gnutls_datum_t * g,
-				    const gnutls_datum_t * y);
+				  const gnutls_datum_t * p,
+				  const gnutls_datum_t * q,
+				  const gnutls_datum_t * g,
+				  const gnutls_datum_t * y);
 int gnutls_pubkey_import_rsa_raw (gnutls_pubkey_t pubkey,
-			      const gnutls_datum_t * m,
-			      const gnutls_datum_t * e);
+				  const gnutls_datum_t * m,
+				  const gnutls_datum_t * e);
 
-int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt,
-			       gnutls_pubkey_t key);
+int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key);
 
-int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq,
-			       gnutls_pubkey_t key);
+int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key);
 
 int
 gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags,
-			     const gnutls_datum_t * hash,
-			     const gnutls_datum_t * signature);
+			   const gnutls_datum_t * hash,
+			   const gnutls_datum_t * signature);
 int
 gnutls_pubkey_get_verify_algorithm (gnutls_pubkey_t key,
-				      const gnutls_datum_t * signature,
-				      gnutls_digest_algorithm_t * hash);
+				    const gnutls_datum_t * signature,
+				    gnutls_digest_algorithm_t * hash);
 
 /* Private key operations */
 
 struct gnutls_privkey_st;
-typedef struct gnutls_privkey_st* gnutls_privkey_t;
+typedef struct gnutls_privkey_st *gnutls_privkey_t;
 
 int gnutls_privkey_init (gnutls_privkey_t * key);
 void gnutls_privkey_deinit (gnutls_privkey_t key);
-int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key, unsigned int* bits);
+int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key,
+				     unsigned int *bits);
 gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key);
 
 
 #define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE 1
-int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey, gnutls_pkcs11_privkey_t key, unsigned int flags);
-int gnutls_privkey_import_x509 (gnutls_privkey_t pkey, gnutls_x509_privkey_t key, unsigned int flags);
-int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, gnutls_openpgp_privkey_t key, unsigned int flags);
-
-int gnutls_privkey_sign_data(gnutls_privkey_t signer,
-				gnutls_digest_algorithm_t hash,
-				unsigned int flags,
-				const gnutls_datum_t * data,
-				gnutls_datum_t * signature);
+int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey,
+				  gnutls_pkcs11_privkey_t key,
+				  unsigned int flags);
+int gnutls_privkey_import_x509 (gnutls_privkey_t pkey,
+				gnutls_x509_privkey_t key,
+				unsigned int flags);
+int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
+				   gnutls_openpgp_privkey_t key,
+				   unsigned int flags);
+
+int gnutls_privkey_sign_data (gnutls_privkey_t signer,
+			      gnutls_digest_algorithm_t hash,
+			      unsigned int flags,
+			      const gnutls_datum_t * data,
+			      gnutls_datum_t * signature);
 int gnutls_privkey_sign_hash (gnutls_privkey_t key,
-				 const gnutls_datum_t * hash,
-				 gnutls_datum_t * signature);
+			      const gnutls_datum_t * hash,
+			      gnutls_datum_t * signature);
 
-int gnutls_privkey_decrypt_data(gnutls_privkey_t signer,
-				unsigned int flags,
-				const gnutls_datum_t * ciphertext,
-				gnutls_datum_t * plaintext);
+int gnutls_privkey_decrypt_data (gnutls_privkey_t signer,
+				 unsigned int flags,
+				 const gnutls_datum_t * ciphertext,
+				 gnutls_datum_t * plaintext);
 
-int gnutls_x509_crt_privkey_sign (gnutls_x509_crt_t crt, gnutls_x509_crt_t issuer,
-			     gnutls_privkey_t issuer_key,
-			     gnutls_digest_algorithm_t dig,
-			     unsigned int flags);
+int gnutls_x509_crt_privkey_sign (gnutls_x509_crt_t crt,
+				  gnutls_x509_crt_t issuer,
+				  gnutls_privkey_t issuer_key,
+				  gnutls_digest_algorithm_t dig,
+				  unsigned int flags);
 
 int gnutls_x509_crl_privkey_sign (gnutls_x509_crl_t crl,
-			     gnutls_x509_crt_t issuer,
-			     gnutls_privkey_t issuer_key,
-			     gnutls_digest_algorithm_t dig,
-			     unsigned int flags);
+				  gnutls_x509_crt_t issuer,
+				  gnutls_privkey_t issuer_key,
+				  gnutls_digest_algorithm_t dig,
+				  unsigned int flags);
 
 int gnutls_x509_crq_privkey_sign (gnutls_x509_crq_t crq,
-			     gnutls_privkey_t key,
-			     gnutls_digest_algorithm_t dig,
-			     unsigned int flags);
+				  gnutls_privkey_t key,
+				  gnutls_digest_algorithm_t dig,
+				  unsigned int flags);
 
 #endif
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 566f8c599f..ee038c71dc 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -1,7 +1,7 @@
 /* Typedefs for more compatibility with older GnuTLS. */
 
 #ifndef _GNUTLS_COMPAT_H
-# define _GNUTLS_COMPAT_H
+#define _GNUTLS_COMPAT_H
 
 #ifdef __GNUC__
 
@@ -112,63 +112,69 @@
 #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER
 #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION
 
-  typedef struct gnutls_retr_st
+typedef struct gnutls_retr_st
+{
+  gnutls_certificate_type_t type;
+  union
   {
-    gnutls_certificate_type_t type;
-    union
-    {
-      gnutls_x509_crt_t *x509;
-      gnutls_openpgp_crt_t pgp;
-    } cert;
-    unsigned int ncerts;	/* one for pgp keys */
-
-    union
-    {
-      gnutls_x509_privkey_t x509;
-      gnutls_openpgp_privkey_t pgp;
-    } key;
-
-    unsigned int deinit_all;	/* if non zero all keys will be deinited */
-  } gnutls_retr_st;
+    gnutls_x509_crt_t *x509;
+    gnutls_openpgp_crt_t pgp;
+  } cert;
+  unsigned int ncerts;		/* one for pgp keys */
+
+  union
+  {
+    gnutls_x509_privkey_t x509;
+    gnutls_openpgp_privkey_t pgp;
+  } key;
+
+  unsigned int deinit_all;	/* if non zero all keys will be deinited */
+} gnutls_retr_st;
 
 typedef int gnutls_certificate_client_retrieve_function (gnutls_session_t,
-							   const
-							   gnutls_datum_t *
-							   req_ca_rdn,
-							   int nreqs,
-							   const
-							   gnutls_pk_algorithm_t
-							   * pk_algos,
-							   int
-							   pk_algos_length,
-							   gnutls_retr_st *);
+							 const
+							 gnutls_datum_t *
+							 req_ca_rdn,
+							 int nreqs,
+							 const
+							 gnutls_pk_algorithm_t
+							 * pk_algos,
+							 int
+							 pk_algos_length,
+							 gnutls_retr_st *);
 typedef int gnutls_certificate_server_retrieve_function (gnutls_session_t,
-							   gnutls_retr_st *);
+							 gnutls_retr_st *);
 
 void gnutls_certificate_client_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_client_retrieve_function * func) _GNUTLS_GCC_ATTR_DEPRECATED;
-void gnutls_certificate_server_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_server_retrieve_function * func) _GNUTLS_GCC_ATTR_DEPRECATED;
+  (gnutls_certificate_credentials_t cred,
+   gnutls_certificate_client_retrieve_function *
+   func) _GNUTLS_GCC_ATTR_DEPRECATED;
+void
+  gnutls_certificate_server_set_retrieve_function
+  (gnutls_certificate_credentials_t cred,
+   gnutls_certificate_server_retrieve_function *
+   func) _GNUTLS_GCC_ATTR_DEPRECATED;
 
   /* External signing callback.  Experimental. */
-  typedef int (*gnutls_sign_func) (gnutls_session_t session,
-				   void *userdata,
-				   gnutls_certificate_type_t cert_type,
-				   const gnutls_datum_t * cert,
-				   const gnutls_datum_t * hash,
-				   gnutls_datum_t * signature);
-
-  void gnutls_sign_callback_set (gnutls_session_t session,
-				 gnutls_sign_func sign_func, void *userdata) _GNUTLS_GCC_ATTR_DEPRECATED;
-    gnutls_sign_func
-    gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
-
-  int gnutls_ext_register (int type,
-			   const char *name,
-			   gnutls_ext_parse_type_t parse_type,
-			   gnutls_ext_recv_func recv_func,
-			   gnutls_ext_send_func send_func) _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef int (*gnutls_sign_func) (gnutls_session_t session,
+				 void *userdata,
+				 gnutls_certificate_type_t cert_type,
+				 const gnutls_datum_t * cert,
+				 const gnutls_datum_t * hash,
+				 gnutls_datum_t * signature);
+
+void
+gnutls_sign_callback_set (gnutls_session_t session,
+			  gnutls_sign_func sign_func, void *userdata)
+  _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_sign_func
+gnutls_sign_callback_get (gnutls_session_t session, void **userdata);
+
+     int gnutls_ext_register (int type,
+			      const char *name,
+			      gnutls_ext_parse_type_t parse_type,
+			      gnutls_ext_recv_func recv_func,
+			      gnutls_ext_send_func send_func)
+  _GNUTLS_GCC_ATTR_DEPRECATED;
 
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 61279597dc..072434d352 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef GNUTLS_CRYPTO_H
-# define GNUTLS_CRYPTO_H
+#define GNUTLS_CRYPTO_H
 
 typedef struct cipher_hd_st *gnutls_cipher_hd_t;
 
@@ -36,9 +36,10 @@ int gnutls_cipher_encrypt (const gnutls_cipher_hd_t handle,
 int gnutls_cipher_decrypt (const gnutls_cipher_hd_t handle,
 			   void *ciphertext, size_t ciphertextlen);
 int gnutls_cipher_decrypt2 (gnutls_cipher_hd_t handle, const void *ciphertext,
-		       size_t ciphertextlen, void* text, size_t textlen);
-int gnutls_cipher_encrypt2 (gnutls_cipher_hd_t handle, void *text, size_t textlen,
-  void* ciphertext, size_t ciphertextlen);
+			    size_t ciphertextlen, void *text, size_t textlen);
+int gnutls_cipher_encrypt2 (gnutls_cipher_hd_t handle, void *text,
+			    size_t textlen, void *ciphertext,
+			    size_t ciphertextlen);
 
 void gnutls_cipher_deinit (gnutls_cipher_hd_t handle);
 int gnutls_cipher_get_block_size (gnutls_cipher_algorithm_t algorithm);
@@ -306,13 +307,13 @@ typedef struct gnutls_crypto_pk
 /* priority: infinity for backend algorithms, 90 for kernel
    algorithms, lowest wins
  */
-# define gnutls_crypto_single_cipher_register(algo, prio, st)		\
+#define gnutls_crypto_single_cipher_register(algo, prio, st)		\
   gnutls_crypto_single_cipher_register2 (algo, prio, \
 					 GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_single_mac_register(algo, prio, st)		\
+#define gnutls_crypto_single_mac_register(algo, prio, st)		\
   gnutls_crypto_single_mac_register2 (algo, prio, \
 				      GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_single_digest_register(algo, prio, st)		\
+#define gnutls_crypto_single_digest_register(algo, prio, st)		\
   gnutls_crypto_single_digest_register2(algo, prio,			\
 					GNUTLS_CRYPTO_API_VERSION, st)
 
@@ -333,11 +334,11 @@ int gnutls_crypto_single_digest_register2 (gnutls_digest_algorithm_t
 					   gnutls_crypto_single_digest_st *
 					   s);
 
-# define gnutls_crypto_cipher_register(prio, st)			\
+#define gnutls_crypto_cipher_register(prio, st)			\
   gnutls_crypto_cipher_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_mac_register(prio, st)				\
+#define gnutls_crypto_mac_register(prio, st)				\
   gnutls_crypto_mac_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_digest_register(prio, st)			\
+#define gnutls_crypto_digest_register(prio, st)			\
   gnutls_crypto_digest_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
 
 int gnutls_crypto_cipher_register2 (int priority, int version,
@@ -347,11 +348,11 @@ int gnutls_crypto_mac_register2 (int priority, int version,
 int gnutls_crypto_digest_register2 (int priority, int version,
 				    const gnutls_crypto_digest_st * s);
 
-# define gnutls_crypto_rnd_register(prio, st)				\
+#define gnutls_crypto_rnd_register(prio, st)				\
   gnutls_crypto_rnd_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_pk_register(prio, st)				\
+#define gnutls_crypto_pk_register(prio, st)				\
   gnutls_crypto_pk_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
-# define gnutls_crypto_bigint_register(prio, st)			\
+#define gnutls_crypto_bigint_register(prio, st)			\
   gnutls_crypto_bigint_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st)
 
 int gnutls_crypto_rnd_register2 (int priority, int version,
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 79bc595b3b..a5b7d35bc0 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -35,13 +35,13 @@
 
 
 #ifndef GNUTLS_H
-# define GNUTLS_H
+#define GNUTLS_H
 
 /* Get size_t. */
 #include <stddef.h>
 /* Get ssize_t. */
 #ifndef HAVE_SSIZE_T
-# define HAVE_SSIZE_T
+#define HAVE_SSIZE_T
 /* *INDENT-OFF* */
 @DEFINE_SSIZE_T@
 /* *INDENT-ON* */
@@ -245,8 +245,8 @@ extern "C"
     GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384,
     GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512,
     GNUTLS_DIG_SHA224 = GNUTLS_MAC_SHA224
-    /* If you add anything here, make sure you align with
-       gnutls_mac_algorithm_t. */
+      /* If you add anything here, make sure you align with
+         gnutls_mac_algorithm_t. */
   } gnutls_digest_algorithm_t;
 
   /* exported for other gnutls headers. This is the maximum number of
@@ -585,21 +585,21 @@ extern "C"
    * Enumeration of different digital signature algorithms.
    */
   typedef enum
-    {
-      GNUTLS_SIGN_UNKNOWN = 0,
-      GNUTLS_SIGN_RSA_SHA1 = 1,
-      GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
-      GNUTLS_SIGN_DSA_SHA1 = 2,
-      GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
-      GNUTLS_SIGN_RSA_MD5 = 3,
-      GNUTLS_SIGN_RSA_MD2 = 4,
-      GNUTLS_SIGN_RSA_RMD160 = 5,
-      GNUTLS_SIGN_RSA_SHA256 = 6,
-      GNUTLS_SIGN_RSA_SHA384 = 7,
-      GNUTLS_SIGN_RSA_SHA512 = 8,
-      GNUTLS_SIGN_RSA_SHA224 = 9,
-      GNUTLS_SIGN_DSA_SHA224 = 10,
-      GNUTLS_SIGN_DSA_SHA256 = 11
+  {
+    GNUTLS_SIGN_UNKNOWN = 0,
+    GNUTLS_SIGN_RSA_SHA1 = 1,
+    GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
+    GNUTLS_SIGN_DSA_SHA1 = 2,
+    GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
+    GNUTLS_SIGN_RSA_MD5 = 3,
+    GNUTLS_SIGN_RSA_MD2 = 4,
+    GNUTLS_SIGN_RSA_RMD160 = 5,
+    GNUTLS_SIGN_RSA_SHA256 = 6,
+    GNUTLS_SIGN_RSA_SHA384 = 7,
+    GNUTLS_SIGN_RSA_SHA512 = 8,
+    GNUTLS_SIGN_RSA_SHA224 = 9,
+    GNUTLS_SIGN_DSA_SHA224 = 10,
+    GNUTLS_SIGN_DSA_SHA256 = 11
   } gnutls_sign_algorithm_t;
 
   const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t sign);
@@ -616,14 +616,14 @@ extern "C"
    * Enumeration of security parameters for passive attacks
    */
   typedef enum
-    {
-      GNUTLS_SEC_PARAM_UNKNOWN,
-      GNUTLS_SEC_PARAM_WEAK,
-      GNUTLS_SEC_PARAM_LOW,
-      GNUTLS_SEC_PARAM_NORMAL,
-      GNUTLS_SEC_PARAM_HIGH,
-      GNUTLS_SEC_PARAM_ULTRA
-    } gnutls_sec_param_t;
+  {
+    GNUTLS_SEC_PARAM_UNKNOWN,
+    GNUTLS_SEC_PARAM_WEAK,
+    GNUTLS_SEC_PARAM_LOW,
+    GNUTLS_SEC_PARAM_NORMAL,
+    GNUTLS_SEC_PARAM_HIGH,
+    GNUTLS_SEC_PARAM_ULTRA
+  } gnutls_sec_param_t;
 
 
 /* If you want to change this, then also change the define in
@@ -685,10 +685,10 @@ extern "C"
   const char *gnutls_alert_get_name (gnutls_alert_description_t alert);
 
   gnutls_sec_param_t gnutls_pk_bits_to_sec_param (gnutls_pk_algorithm_t algo,
-                                      unsigned int bits);
-  const char * gnutls_sec_param_get_name (gnutls_sec_param_t param);
+						  unsigned int bits);
+  const char *gnutls_sec_param_get_name (gnutls_sec_param_t param);
   unsigned int gnutls_sec_param_to_pk_bits (gnutls_pk_algorithm_t algo,
-                                      gnutls_sec_param_t param);
+					    gnutls_sec_param_t param);
 
 /* get information on the current session */
   gnutls_cipher_algorithm_t gnutls_cipher_get (gnutls_session_t session);
@@ -1124,13 +1124,13 @@ extern "C"
   int gnutls_global_init (void);
   void gnutls_global_deinit (void);
 
-  typedef int (*mutex_init_func)(void** mutex);
-  typedef int (*mutex_lock_func)(void** mutex);
-  typedef int (*mutex_unlock_func)(void** mutex);
-  typedef int (*mutex_deinit_func)(void** mutex);
-  
-  void gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func, 
-    mutex_lock_func, mutex_unlock_func);
+  typedef int (*mutex_init_func) (void **mutex);
+  typedef int (*mutex_lock_func) (void **mutex);
+  typedef int (*mutex_unlock_func) (void **mutex);
+  typedef int (*mutex_deinit_func) (void **mutex);
+
+  void gnutls_global_set_mutex (mutex_init_func init, mutex_deinit_func,
+				mutex_lock_func, mutex_unlock_func);
 
   typedef void *(*gnutls_alloc_function) (size_t);
   typedef void *(*gnutls_calloc_function) (size_t, size_t);
@@ -1211,16 +1211,19 @@ extern "C"
 
 /* Session stuff
  */
-  typedef struct {
-    void  *iov_base;    /* Starting address */
-    size_t iov_len;     /* Number of bytes to transfer */
+  typedef struct
+  {
+    void *iov_base;		/* Starting address */
+    size_t iov_len;		/* Number of bytes to transfer */
   } giovec_t;
 
   typedef ssize_t (*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
 				       size_t);
-  typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *, size_t);
+  typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
+				       size_t);
 
-  typedef ssize_t (*gnutls_vec_push_func) (gnutls_transport_ptr_t, const giovec_t *iov, int iovcnt);
+  typedef ssize_t (*gnutls_vec_push_func) (gnutls_transport_ptr_t,
+					   const giovec_t * iov, int iovcnt);
 
   typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t);
 
@@ -1239,14 +1242,14 @@ extern "C"
 
 
   void gnutls_transport_set_push_function2 (gnutls_session_t session,
-                                      gnutls_vec_push_func vec_func);
+					    gnutls_vec_push_func vec_func);
   void gnutls_transport_set_push_function (gnutls_session_t session,
 					   gnutls_push_func push_func);
   void gnutls_transport_set_pull_function (gnutls_session_t session,
 					   gnutls_pull_func pull_func);
 
   void gnutls_transport_set_errno_function (gnutls_session_t session,
-					   gnutls_errno_func errno_func);
+					    gnutls_errno_func errno_func);
 
   void gnutls_transport_set_errno (gnutls_session_t session, int err);
   void gnutls_transport_set_global_errno (int err);
@@ -1460,19 +1463,20 @@ extern "C"
   typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
 
   struct gnutls_pkcs11_privkey_st;
-  typedef struct gnutls_pkcs11_privkey_st* gnutls_pkcs11_privkey_t;
+  typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t;
 
-  typedef enum {
-    GNUTLS_PRIVKEY_X509, /* gnutls_x509_privkey_t */
-    GNUTLS_PRIVKEY_OPENPGP, /* gnutls_openpgp_privkey_t */
-    GNUTLS_PRIVKEY_PKCS11 /* gnutls_pkcs11_privkey_t */
+  typedef enum
+  {
+    GNUTLS_PRIVKEY_X509,	/* gnutls_x509_privkey_t */
+    GNUTLS_PRIVKEY_OPENPGP,	/* gnutls_openpgp_privkey_t */
+    GNUTLS_PRIVKEY_PKCS11	/* gnutls_pkcs11_privkey_t */
   } gnutls_privkey_type_t;
 
   typedef struct gnutls_retr2_st
   {
     gnutls_certificate_type_t cert_type;
     gnutls_privkey_type_t key_type;
-    
+
     union
     {
       gnutls_x509_crt_t *x509;
@@ -1525,16 +1529,16 @@ extern "C"
    */
 
   typedef int gnutls_certificate_retrieve_function (gnutls_session_t,
-							   const
-							   gnutls_datum_t *
-							   req_ca_rdn,
-							   int nreqs,
-							   const
-							   gnutls_pk_algorithm_t
-							   * pk_algos,
-							   int
-							   pk_algos_length,
-							   gnutls_retr2_st *);
+						    const
+						    gnutls_datum_t *
+						    req_ca_rdn,
+						    int nreqs,
+						    const
+						    gnutls_pk_algorithm_t
+						    * pk_algos,
+						    int
+						    pk_algos_length,
+						    gnutls_retr2_st *);
 
 
   void gnutls_certificate_set_retrieve_function
diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index 9f88fe87b6..462c7a5ffb 100644
--- a/lib/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
@@ -1,5 +1,5 @@
 #ifndef GNUTLSXX_H
-# define GNUTLSXX_H
+#define GNUTLSXX_H
 
 #include <exception>
 #include <vector>
@@ -310,8 +310,7 @@ namespace gnutls
 				 gnutls_x509_crt_fmt_t type,
 				 const char *password);
 
-    void set_retrieve_function (gnutls_certificate_retrieve_function *
-				func);
+    void set_retrieve_function (gnutls_certificate_retrieve_function * func);
 
   protected:
       gnutls_certificate_credentials_t cred;
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 81b73b7c94..cad2235f1b 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -28,14 +28,14 @@
  */
 
 #ifndef GNUTLS_OPENPGP_H
-# define GNUTLS_OPENPGP_H
+#define GNUTLS_OPENPGP_H
 
-# include <gnutls/gnutls.h>
+#include <gnutls/gnutls.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C"
 {
-# endif
+#endif
 
 /* Openpgp certificate stuff
  */
@@ -161,7 +161,8 @@ extern "C"
     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);
+    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,
@@ -169,18 +170,18 @@ extern "C"
 				     unsigned int flags);
 
   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 gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
 					const gnutls_datum_t * hash,
 					gnutls_datum_t * signature);
   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_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);
@@ -363,8 +364,8 @@ extern "C"
     (gnutls_certificate_credentials_t c, const char *file,
      gnutls_openpgp_crt_fmt_t format);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif				/* GNUTLS_OPENPGP_H */
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 477c9ad22c..95c74d62d0 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -15,68 +15,76 @@
  * multiple times if the token is not detected and the retry counter
  * will be increased.
  */
-typedef int (*gnutls_pkcs11_token_callback_t)(
-	void * const global_data,
-	const char * const label,
-	const unsigned retry
-);
+typedef int (*gnutls_pkcs11_token_callback_t) (void *const global_data,
+					       const char *const label,
+					       const unsigned retry);
 
 /* flags */
 #define GNUTLS_PKCS11_PIN_FINAL_TRY (1<<0)
 #define GNUTLS_PKCS11_PIN_COUNT_LOW (1<<1)
 
-typedef int (*gnutls_pkcs11_pin_callback_t)(void *userdata, int attempt,
-		const char *token_url, const char *token_label,
-		unsigned int flags, char *pin, size_t pin_max);
+typedef int (*gnutls_pkcs11_pin_callback_t) (void *userdata, int attempt,
+					     const char *token_url,
+					     const char *token_label,
+					     unsigned int flags, char *pin,
+					     size_t pin_max);
 
 struct gnutls_pkcs11_obj_st;
-typedef struct gnutls_pkcs11_obj_st* gnutls_pkcs11_obj_t;
+typedef struct gnutls_pkcs11_obj_st *gnutls_pkcs11_obj_t;
 
 
-#define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */
-#define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
+#define GNUTLS_PKCS11_FLAG_MANUAL 0	/* Manual loading of libraries */
+#define GNUTLS_PKCS11_FLAG_AUTO 1	/* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
 
 /* pkcs11.conf format:
  * load = /lib/xxx-pkcs11.so
  * load = /lib/yyy-pkcs11.so
  */
 
-int gnutls_pkcs11_init (unsigned int flags, const char* configfile);
+int gnutls_pkcs11_init (unsigned int flags, const char *configfile);
 void gnutls_pkcs11_deinit (void);
-void gnutls_pkcs11_set_token_function(gnutls_pkcs11_token_callback_t fn, void *userdata);
-void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t callback, void * data);
-int gnutls_pkcs11_add_provider (const char * name, const char * params);
-int gnutls_pkcs11_obj_init ( gnutls_pkcs11_obj_t *certificate);
-
-#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token for the operation */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1) /* object marked as trusted */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2) /* object marked as sensitive (unexportable) */
-
-typedef enum {
-  GNUTLS_PKCS11_URL_GENERIC, /* URL specifies the object on token level */
-  GNUTLS_PKCS11_URL_LIB, /* URL specifies the object on module level */
-  GNUTLS_PKCS11_URL_LIB_VERSION /* URL specifies the object on module and version level */
+void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn,
+				       void *userdata);
+void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t callback,
+				     void *data);
+int gnutls_pkcs11_add_provider (const char *name, const char *params);
+int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * certificate);
+
+#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0)	/* force login in the token for the operation */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1)	/* object marked as trusted */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2)	/* object marked as sensitive (unexportable) */
+
+typedef enum
+{
+  GNUTLS_PKCS11_URL_GENERIC,	/* URL specifies the object on token level */
+  GNUTLS_PKCS11_URL_LIB,	/* URL specifies the object on module level */
+  GNUTLS_PKCS11_URL_LIB_VERSION	/* URL specifies the object on module and version level */
 } gnutls_pkcs11_url_type_t;
 
-int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t, const char * url,
-	unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
-int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t, gnutls_pkcs11_url_type_t detailed, char** url);
-void gnutls_pkcs11_obj_deinit ( gnutls_pkcs11_obj_t);
-
-int gnutls_pkcs11_obj_export(gnutls_pkcs11_obj_t obj,
-		     void *output_data, size_t * output_data_size);
-
-
-int gnutls_pkcs11_copy_x509_crt(const char* token_url, gnutls_x509_crt_t crt, 
-	const char* label, unsigned int flags /* GNUTLS_PKCS11_OBJ_FLAG_* */);
-int gnutls_pkcs11_copy_x509_privkey(const char* token_url, 
-	gnutls_x509_privkey_t crt, const char* label, unsigned int key_usage /*GNUTLS_KEY_* */,
-	unsigned int flags /* GNUTLS_PKCS11_OBJ_FLAG_* */);
-int gnutls_pkcs11_delete_url(const char* object_url, 
-	unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
-
-typedef enum {
-  GNUTLS_PKCS11_OBJ_ID_HEX=1,
+int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t, const char *url,
+				  unsigned int flags
+				  /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t,
+				  gnutls_pkcs11_url_type_t detailed,
+				  char **url);
+void gnutls_pkcs11_obj_deinit (gnutls_pkcs11_obj_t);
+
+int gnutls_pkcs11_obj_export (gnutls_pkcs11_obj_t obj,
+			      void *output_data, size_t * output_data_size);
+
+
+int gnutls_pkcs11_copy_x509_crt (const char *token_url, gnutls_x509_crt_t crt,
+				 const char *label, unsigned int flags
+				 /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_copy_x509_privkey (const char *token_url, gnutls_x509_privkey_t crt, const char *label, unsigned int key_usage	/*GNUTLS_KEY_* */
+				     , unsigned int flags
+				     /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_delete_url (const char *object_url, unsigned int flags
+			      /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+
+typedef enum
+{
+  GNUTLS_PKCS11_OBJ_ID_HEX = 1,
   GNUTLS_PKCS11_OBJ_LABEL,
   GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
   GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
@@ -89,26 +97,31 @@ typedef enum {
   GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER
 } gnutls_pkcs11_obj_info_t;
 
-int gnutls_pkcs11_obj_get_info(gnutls_pkcs11_obj_t crt, gnutls_pkcs11_obj_info_t itype, void* output, size_t* output_size);
-
-typedef enum {
-  GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL=1, /* all certificates */
-  GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED, /* certificates marked as trusted */
-  GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY, /* certificates with corresponding private key */
-  GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
-  GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
-  GNUTLS_PKCS11_OBJ_ATTR_ALL /* everything! */
+int gnutls_pkcs11_obj_get_info (gnutls_pkcs11_obj_t crt,
+				gnutls_pkcs11_obj_info_t itype, void *output,
+				size_t * output_size);
+
+typedef enum
+{
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL = 1,	/* all certificates */
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED,	/* certificates marked as trusted */
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY,	/* certificates with corresponding private key */
+  GNUTLS_PKCS11_OBJ_ATTR_PUBKEY,	/* public keys */
+  GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY,	/* private keys */
+  GNUTLS_PKCS11_OBJ_ATTR_ALL	/* everything! */
 } gnutls_pkcs11_obj_attr_t;
 
 /* token info */
-typedef enum {
+typedef enum
+{
   GNUTLS_PKCS11_TOKEN_LABEL,
   GNUTLS_PKCS11_TOKEN_SERIAL,
   GNUTLS_PKCS11_TOKEN_MANUFACTURER,
   GNUTLS_PKCS11_TOKEN_MODEL
 } gnutls_pkcs11_token_info_t;
 
-typedef enum {
+typedef enum
+{
   GNUTLS_PKCS11_OBJ_UNKNOWN,
   GNUTLS_PKCS11_OBJ_X509_CRT,
   GNUTLS_PKCS11_OBJ_PUBKEY,
@@ -117,52 +130,64 @@ typedef enum {
   GNUTLS_PKCS11_OBJ_DATA
 } gnutls_pkcs11_obj_type_t;
 
-int gnutls_pkcs11_token_get_url (unsigned int seq, gnutls_pkcs11_url_type_t detailed, char** url);
-int gnutls_pkcs11_token_get_info(const char* url, gnutls_pkcs11_token_info_t, void* output, size_t *output_size);
+int gnutls_pkcs11_token_get_url (unsigned int seq,
+				 gnutls_pkcs11_url_type_t detailed,
+				 char **url);
+int gnutls_pkcs11_token_get_info (const char *url, gnutls_pkcs11_token_info_t,
+				  void *output, size_t * output_size);
 
 #define GNUTLS_PKCS11_TOKEN_HW 1
-int gnutls_pkcs11_token_get_flags(const char* url, unsigned int *flags);
+int gnutls_pkcs11_token_get_flags (const char *url, unsigned int *flags);
 
-int gnutls_pkcs11_obj_list_import_url (gnutls_pkcs11_obj_t * p_list, 
-	unsigned int *const n_list, const char* url, 
-	gnutls_pkcs11_obj_attr_t attrs, 
-	unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
+int gnutls_pkcs11_obj_list_import_url (gnutls_pkcs11_obj_t * p_list,
+				       unsigned int *const n_list,
+				       const char *url,
+				       gnutls_pkcs11_obj_attr_t attrs,
+				       unsigned int flags
+				       /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
 
-int gnutls_x509_crt_import_pkcs11( gnutls_x509_crt_t crt, gnutls_pkcs11_obj_t pkcs11_crt);
-int gnutls_x509_crt_import_pkcs11_url( gnutls_x509_crt_t crt, const char* url, 
-	unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
+int gnutls_x509_crt_import_pkcs11 (gnutls_x509_crt_t crt,
+				   gnutls_pkcs11_obj_t pkcs11_crt);
+int gnutls_x509_crt_import_pkcs11_url (gnutls_x509_crt_t crt, const char *url,
+				       unsigned int flags
+				       /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
 
-gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type (gnutls_pkcs11_obj_t certificate);
-const char* gnutls_pkcs11_type_get_name (gnutls_pkcs11_obj_type_t);
+gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type (gnutls_pkcs11_obj_t
+						     certificate);
+const char *gnutls_pkcs11_type_get_name (gnutls_pkcs11_obj_type_t);
 
-int gnutls_x509_crt_list_import_pkcs11 (gnutls_x509_crt_t * certs,
-                                   unsigned int cert_max,
-                                   gnutls_pkcs11_obj_t * const pkcs11_certs,
-                                   unsigned int flags/* must be zero */);
+int gnutls_x509_crt_list_import_pkcs11 (gnutls_x509_crt_t * certs, unsigned int cert_max, gnutls_pkcs11_obj_t * const pkcs11_certs, unsigned int flags	/* must be zero */
+  );
 
 
 /* private key functions...*/
 int gnutls_pkcs11_privkey_init (gnutls_pkcs11_privkey_t * key);
 void gnutls_pkcs11_privkey_deinit (gnutls_pkcs11_privkey_t key);
-int gnutls_pkcs11_privkey_get_pk_algorithm (gnutls_pkcs11_privkey_t key, unsigned int* bits);
-int gnutls_pkcs11_privkey_get_info(gnutls_pkcs11_privkey_t crt, gnutls_pkcs11_obj_info_t itype, void* output, size_t* output_size);
+int gnutls_pkcs11_privkey_get_pk_algorithm (gnutls_pkcs11_privkey_t key,
+					    unsigned int *bits);
+int gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t crt,
+				    gnutls_pkcs11_obj_info_t itype,
+				    void *output, size_t * output_size);
 
 int gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t key,
-				  const char* url, unsigned int flags);
+				      const char *url, unsigned int flags);
 
-int gnutls_pkcs11_privkey_sign_data(gnutls_pkcs11_privkey_t signer,
-				gnutls_digest_algorithm_t hash,
-				unsigned int flags,
-				const gnutls_datum_t * data,
-				gnutls_datum_t * signature);
+int gnutls_pkcs11_privkey_sign_data (gnutls_pkcs11_privkey_t signer,
+				     gnutls_digest_algorithm_t hash,
+				     unsigned int flags,
+				     const gnutls_datum_t * data,
+				     gnutls_datum_t * signature);
 int gnutls_pkcs11_privkey_sign_hash (gnutls_pkcs11_privkey_t key,
-				 const gnutls_datum_t * hash,
-				 gnutls_datum_t * signature);
+				     const gnutls_datum_t * hash,
+				     gnutls_datum_t * signature);
 int
-gnutls_pkcs11_privkey_decrypt_data(gnutls_pkcs11_privkey_t key,
-				unsigned int flags, const gnutls_datum_t * ciphertext,
-				gnutls_datum_t * plaintext);
-int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key, gnutls_pkcs11_url_type_t detailed, char ** url);
+gnutls_pkcs11_privkey_decrypt_data (gnutls_pkcs11_privkey_t key,
+				    unsigned int flags,
+				    const gnutls_datum_t * ciphertext,
+				    gnutls_datum_t * plaintext);
+int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key,
+				      gnutls_pkcs11_url_type_t detailed,
+				      char **url);
 
 /** @} */
 
diff --git a/lib/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index 8c132fe9ad..6b146218d2 100644
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -24,14 +24,14 @@
  */
 
 #ifndef GNUTLS_PKCS12_H
-# define GNUTLS_PKCS12_H
+#define GNUTLS_PKCS12_H
 
-# include <gnutls/x509.h>
+#include <gnutls/x509.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C"
 {
-# endif
+#endif
 
   /* PKCS12 structures handling
    */
@@ -116,8 +116,8 @@ extern "C"
   int gnutls_pkcs12_bag_set_friendly_name (gnutls_pkcs12_bag_t bag, int indx,
 					   const char *name);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif				/* GNUTLS_PKCS12_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 11f8ec9ba8..d9a7e61f6a 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -28,14 +28,14 @@
  */
 
 #ifndef GNUTLS_X509_H
-# define GNUTLS_X509_H
+#define GNUTLS_X509_H
 
-# include <gnutls/gnutls.h>
+#include <gnutls/gnutls.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C"
 {
-# endif
+#endif
 
 /* Some OIDs usually found in Distinguished names, or
  * in Subject Directory Attribute extensions.
@@ -141,7 +141,9 @@ extern "C"
 				  unsigned char *output_data,
 				  size_t * output_data_size);
   int gnutls_x509_crt_get_preferred_hash_algorithm (gnutls_x509_crt_t crt,
-				      gnutls_digest_algorithm_t * hash, unsigned int *mand);
+						    gnutls_digest_algorithm_t
+						    * hash,
+						    unsigned int *mand);
 
   int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert,
 					    const void *id, size_t id_size);
@@ -625,7 +627,8 @@ extern "C"
 
   int gnutls_x509_privkey_init (gnutls_x509_privkey_t * key);
   void gnutls_x509_privkey_deinit (gnutls_x509_privkey_t key);
-  gnutls_sec_param_t gnutls_x509_privkey_sec_param (gnutls_x509_privkey_t key);
+  gnutls_sec_param_t gnutls_x509_privkey_sec_param (gnutls_x509_privkey_t
+						    key);
   int gnutls_x509_privkey_cpy (gnutls_x509_privkey_t dst,
 			       gnutls_x509_privkey_t src);
   int gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
@@ -644,14 +647,14 @@ extern "C"
 					  const gnutls_datum_t * q,
 					  const gnutls_datum_t * u);
   int gnutls_x509_privkey_import_rsa_raw2 (gnutls_x509_privkey_t key,
-					  const gnutls_datum_t * m,
-					  const gnutls_datum_t * e,
-					  const gnutls_datum_t * d,
-					  const gnutls_datum_t * p,
-					  const gnutls_datum_t * q,
-					  const gnutls_datum_t * u,
-					  const gnutls_datum_t *exp1,
-					  const gnutls_datum_t *exp2);
+					   const gnutls_datum_t * m,
+					   const gnutls_datum_t * e,
+					   const gnutls_datum_t * d,
+					   const gnutls_datum_t * p,
+					   const gnutls_datum_t * q,
+					   const gnutls_datum_t * u,
+					   const gnutls_datum_t * exp1,
+					   const gnutls_datum_t * exp2);
   int gnutls_x509_privkey_fix (gnutls_x509_privkey_t key);
 
   int gnutls_x509_privkey_export_dsa_raw (gnutls_x509_privkey_t key,
@@ -688,10 +691,14 @@ extern "C"
 					void *output_data,
 					size_t * output_data_size);
   int gnutls_x509_privkey_export_rsa_raw2 (gnutls_x509_privkey_t key,
-        gnutls_datum_t * m, gnutls_datum_t * e,
-        gnutls_datum_t * d, gnutls_datum_t * p,
-        gnutls_datum_t * q, gnutls_datum_t * u,
-        gnutls_datum_t* e1, gnutls_datum_t* e2);
+					   gnutls_datum_t * m,
+					   gnutls_datum_t * e,
+					   gnutls_datum_t * d,
+					   gnutls_datum_t * p,
+					   gnutls_datum_t * q,
+					   gnutls_datum_t * u,
+					   gnutls_datum_t * e1,
+					   gnutls_datum_t * e2);
   int gnutls_x509_privkey_export_rsa_raw (gnutls_x509_privkey_t key,
 					  gnutls_datum_t * m,
 					  gnutls_datum_t * e,
@@ -709,10 +716,10 @@ extern "C"
 				     void *signature,
 				     size_t * signature_size);
   int gnutls_x509_privkey_sign_data2 (gnutls_x509_privkey_t key,
-				     gnutls_digest_algorithm_t digest,
-				     unsigned int flags,
-				     const gnutls_datum_t * data,
-				     gnutls_datum_t *signature);
+				      gnutls_digest_algorithm_t digest,
+				      unsigned int flags,
+				      const gnutls_datum_t * data,
+				      gnutls_datum_t * signature);
   int gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
 				       unsigned int flags,
 				       const gnutls_datum_t * data,
@@ -750,7 +757,9 @@ extern "C"
 			      const gnutls_datum_t * data,
 			      gnutls_x509_crt_fmt_t format);
   int gnutls_x509_crq_get_preferred_hash_algorithm (gnutls_x509_crq_t crq,
-			      gnutls_digest_algorithm_t * hash, unsigned int* mand);
+						    gnutls_digest_algorithm_t
+						    * hash,
+						    unsigned int *mand);
 
   int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf,
 			      size_t * sizeof_buf);
@@ -858,8 +867,8 @@ extern "C"
 					    void *buf, size_t * sizeof_buf,
 					    unsigned int *critical);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif				/* GNUTLS_X509_H */