Indent more.

6 files changed, 984 insertions, 798 deletions

diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index a3f166f72f..cc7b80c41a 100644
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -32,7 +32,8 @@
 #include <gnutls/gnutls.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
@@ -53,36 +54,46 @@ extern "C" {
  * gnutls_openpgp_set_recv_key_function().
  *
  */
-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);
-
-int gnutls_certificate_set_openpgp_key_file( gnutls_certificate_credentials_t res, 
-    const char *CERTFILE, const char* KEYFILE);
-int gnutls_certificate_set_openpgp_key_mem( gnutls_certificate_credentials_t res,
-    const gnutls_datum_t* CERT, const gnutls_datum_t* KEY);
-
-int gnutls_certificate_set_openpgp_keyserver(gnutls_certificate_credentials_t res,
-    const char* keyserver, int port);
-
-int gnutls_certificate_set_openpgp_trustdb(gnutls_certificate_credentials_t res,
-    const char* trustdb);
-
-int gnutls_certificate_set_openpgp_keyring_mem(
-    gnutls_certificate_credentials_t c,
-    const unsigned char *data, size_t dlen );
-
-int gnutls_certificate_set_openpgp_keyring_file( gnutls_certificate_credentials_t c,
-    const char *file);
+  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);
+
+  int
+    gnutls_certificate_set_openpgp_key_file (gnutls_certificate_credentials_t
+					     res, const char *CERTFILE,
+					     const char *KEYFILE);
+  int gnutls_certificate_set_openpgp_key_mem (gnutls_certificate_credentials_t
+					      res,
+					      const gnutls_datum_t * CERT,
+					      const gnutls_datum_t * KEY);
+
+  int
+    gnutls_certificate_set_openpgp_keyserver (gnutls_certificate_credentials_t
+					      res, const char *keyserver,
+					      int port);
+
+  int gnutls_certificate_set_openpgp_trustdb (gnutls_certificate_credentials_t
+					      res, const char *trustdb);
+
+  int
+    gnutls_certificate_set_openpgp_keyring_mem
+    (gnutls_certificate_credentials_t c, const unsigned char *data,
+     size_t dlen);
+
+  int
+    gnutls_certificate_set_openpgp_keyring_file
+    (gnutls_certificate_credentials_t c, const char *file);
 
   /* TLS/IA stuff
    */
 
-  typedef enum {
+  typedef enum
+  {
     GNUTLS_IA_APPLICATION_PAYLOAD = 0,
     GNUTLS_IA_INTERMEDIATE_PHASE_FINISHED = 1,
     GNUTLS_IA_FINAL_PHASE_FINISHED = 2
@@ -93,41 +104,45 @@ int gnutls_certificate_set_openpgp_keyring_file( gnutls_certificate_credentials_
 
   typedef int (*gnutls_ia_avp_func) (gnutls_session_t session, void *ptr,
 				     const char *last, size_t lastlen,
-				     char **new, size_t *newlen);
+				     char **new, size_t * newlen);
 
-  typedef struct gnutls_ia_server_credentials_st* gnutls_ia_server_credentials_t;
-  typedef struct gnutls_ia_client_credentials_st* gnutls_ia_client_credentials_t;
+  typedef struct gnutls_ia_server_credentials_st
+    *gnutls_ia_server_credentials_t;
+  typedef struct gnutls_ia_client_credentials_st
+    *gnutls_ia_client_credentials_t;
 
   /* Allocate and free TLS/IA credentials. */
   extern void
-  gnutls_ia_free_client_credentials(gnutls_ia_client_credentials_t sc);
+    gnutls_ia_free_client_credentials (gnutls_ia_client_credentials_t sc);
   extern int
-  gnutls_ia_allocate_client_credentials(gnutls_ia_client_credentials_t * sc);
+    gnutls_ia_allocate_client_credentials (gnutls_ia_client_credentials_t *
+					   sc);
 
   extern void
-  gnutls_ia_free_server_credentials(gnutls_ia_server_credentials_t sc);
+    gnutls_ia_free_server_credentials (gnutls_ia_server_credentials_t sc);
   extern int
-  gnutls_ia_allocate_server_credentials(gnutls_ia_server_credentials_t * sc);
+    gnutls_ia_allocate_server_credentials (gnutls_ia_server_credentials_t *
+					   sc);
 
   /* Client TLS/IA credential functions. */
   extern void
-  gnutls_ia_set_client_avp_function(gnutls_ia_client_credentials_t cred,
-				    gnutls_ia_avp_func avp_func);
+    gnutls_ia_set_client_avp_function (gnutls_ia_client_credentials_t cred,
+				       gnutls_ia_avp_func avp_func);
   extern void
-  gnutls_ia_set_client_avp_ptr (gnutls_ia_client_credentials_t cred,
-				void *ptr);
-  extern void *
-  gnutls_ia_get_client_avp_ptr (gnutls_ia_client_credentials_t cred);
+    gnutls_ia_set_client_avp_ptr (gnutls_ia_client_credentials_t cred,
+				  void *ptr);
+  extern void *gnutls_ia_get_client_avp_ptr (gnutls_ia_client_credentials_t
+					     cred);
 
   /* Server TLS/IA credential functions. */
   extern void
-  gnutls_ia_set_server_avp_function(gnutls_ia_server_credentials_t cred,
-				    gnutls_ia_avp_func avp_func);
+    gnutls_ia_set_server_avp_function (gnutls_ia_server_credentials_t cred,
+				       gnutls_ia_avp_func avp_func);
   extern void
-  gnutls_ia_set_server_avp_ptr (gnutls_ia_server_credentials_t cred,
-				void *ptr);
-  extern void *
-  gnutls_ia_get_server_avp_ptr (gnutls_ia_server_credentials_t cred);
+    gnutls_ia_set_server_avp_ptr (gnutls_ia_server_credentials_t cred,
+				  void *ptr);
+  extern void *gnutls_ia_get_server_avp_ptr (gnutls_ia_server_credentials_t
+					     cred);
 
   /* TLS/IA handshake. */
   extern int gnutls_ia_handshake_p (gnutls_session_t session);
@@ -136,35 +151,32 @@ int gnutls_certificate_set_openpgp_keyring_file( gnutls_certificate_credentials_
 
   /* TLS/IA low level interface. */
   extern int
-  gnutls_ia_permute_inner_secret (gnutls_session_t session,
-				  size_t session_keys_size,
-				  const char *session_keys);
-  extern int
-  gnutls_ia_endphase_send(gnutls_session_t session, int final_p);
+    gnutls_ia_permute_inner_secret (gnutls_session_t session,
+				    size_t session_keys_size,
+				    const char *session_keys);
+  extern int gnutls_ia_endphase_send (gnutls_session_t session, int final_p);
 
   extern ssize_t
-  gnutls_ia_send(gnutls_session_t session, char *data, size_t datal);
+    gnutls_ia_send (gnutls_session_t session, char *data, size_t datal);
   extern ssize_t
-  gnutls_ia_recv(gnutls_session_t session, char *data, size_t datal);
+    gnutls_ia_recv (gnutls_session_t session, char *data, size_t datal);
 
   /* Utility stuff. */
   extern int
-  gnutls_ia_generate_challenge (gnutls_session_t session,
-				size_t buffer_size,
-				char *buffer);
+    gnutls_ia_generate_challenge (gnutls_session_t session,
+				  size_t buffer_size, char *buffer);
   extern void
-  gnutls_ia_extract_inner_secret (gnutls_session_t session,
-				  char *buffer);
+    gnutls_ia_extract_inner_secret (gnutls_session_t session, char *buffer);
 
   /* Toggle whether inner phases are required. */
   extern void
-  gnutls_ia_require_inner_phase (gnutls_session_t session, int require);
+    gnutls_ia_require_inner_phase (gnutls_session_t session, int require);
 
-int gnutls_global_init_extra(void);
+  int gnutls_global_init_extra (void);
 
 /* returns libgnutls-extra version (call it with a NULL argument) 
  */
-const char* gnutls_extra_check_version( const char *req_version);
+  const char *gnutls_extra_check_version (const char *req_version);
 
 #ifdef __cplusplus
 }
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 7c752cfc7d..5c6607f21e 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -37,7 +37,8 @@
 # define GNUTLS_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #define LIBGNUTLS_VERSION "@VERSION@"
@@ -48,72 +49,72 @@ extern "C" {
 
 #define LIBGNUTLS_VERSION_NUMBER @NUMBER_VERSION@
 
-@POSSIBLY_WARN_ABOUT_MISSING_FEATURES@
-
+  @POSSIBLY_WARN_ABOUT_MISSING_FEATURES @
 /* Get size_t. */
 #include <stddef.h>
-
 /* Get ssize_t. */
 #ifndef HAVE_SSIZE_T
 # define HAVE_SSIZE_T
-@DEFINE_SSIZE_T@
+  @DEFINE_SSIZE_T @
 #endif
-
 /* Get time_t. */
 #include <time.h>
-
 #include <gnutls/compat.h>
-
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
-
-typedef enum gnutls_cipher_algorithm { GNUTLS_CIPHER_NULL = 1,
+    typedef enum gnutls_cipher_algorithm
+  { GNUTLS_CIPHER_NULL = 1,
     GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC,
     GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC,
     GNUTLS_CIPHER_ARCFOUR_40,
     GNUTLS_CIPHER_RC2_40_CBC = 90, GNUTLS_CIPHER_DES_CBC
-} gnutls_cipher_algorithm_t;
+  } gnutls_cipher_algorithm_t;
 
-typedef enum { GNUTLS_KX_RSA=1, GNUTLS_KX_DHE_DSS, 
+  typedef enum
+  { GNUTLS_KX_RSA = 1, GNUTLS_KX_DHE_DSS,
     GNUTLS_KX_DHE_RSA, GNUTLS_KX_ANON_DH, GNUTLS_KX_SRP,
     GNUTLS_KX_RSA_EXPORT, GNUTLS_KX_SRP_RSA, GNUTLS_KX_SRP_DSS,
     GNUTLS_KX_PSK, GNUTLS_KX_DHE_PSK
-} gnutls_kx_algorithm_t;
-
-typedef enum { GNUTLS_PARAMS_RSA_EXPORT=1,
-    GNUTLS_PARAMS_DH 
-} gnutls_params_type_t;
-
-typedef enum {
-  GNUTLS_CRD_CERTIFICATE=1,
-  GNUTLS_CRD_ANON,
-  GNUTLS_CRD_SRP,
-  GNUTLS_CRD_PSK,
-  GNUTLS_CRD_IA
-} gnutls_credentials_type_t;
+  } gnutls_kx_algorithm_t;
+
+  typedef enum
+  { GNUTLS_PARAMS_RSA_EXPORT = 1,
+    GNUTLS_PARAMS_DH
+  } gnutls_params_type_t;
+
+  typedef enum
+  {
+    GNUTLS_CRD_CERTIFICATE = 1,
+    GNUTLS_CRD_ANON,
+    GNUTLS_CRD_SRP,
+    GNUTLS_CRD_PSK,
+    GNUTLS_CRD_IA
+  } gnutls_credentials_type_t;
 
 #define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
 #define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
-typedef enum {
-  GNUTLS_MAC_UNKNOWN = 0,
-  GNUTLS_MAC_NULL = 1,
-  GNUTLS_MAC_MD5,
-  GNUTLS_MAC_SHA1,
-  GNUTLS_MAC_RMD160,
-  GNUTLS_MAC_MD2
-} gnutls_mac_algorithm_t;
+  typedef enum
+  {
+    GNUTLS_MAC_UNKNOWN = 0,
+    GNUTLS_MAC_NULL = 1,
+    GNUTLS_MAC_MD5,
+    GNUTLS_MAC_SHA1,
+    GNUTLS_MAC_RMD160,
+    GNUTLS_MAC_MD2
+  } gnutls_mac_algorithm_t;
 
 /* The enumerations here should have the same value with gnutls_mac_algorithm_t.
  */
-typedef enum {
-  GNUTLS_DIG_NULL=1,
-  GNUTLS_DIG_MD5,
-  GNUTLS_DIG_SHA1,
-  GNUTLS_DIG_RMD160,
-  GNUTLS_DIG_MD2
-} gnutls_digest_algorithm_t;
+  typedef enum
+  {
+    GNUTLS_DIG_NULL = 1,
+    GNUTLS_DIG_MD5,
+    GNUTLS_DIG_SHA1,
+    GNUTLS_DIG_RMD160,
+    GNUTLS_DIG_MD2
+  } gnutls_digest_algorithm_t;
 
 /* exported for other gnutls headers. This is the maximum number
  * of algorithms (ciphers, kx or macs). 
@@ -121,559 +122,697 @@ typedef enum {
 #define GNUTLS_MAX_ALGORITHM_NUM 16
 
 #define GNUTLS_COMP_ZLIB GNUTLS_COMP_DEFLATE
-typedef enum { GNUTLS_COMP_NULL=1, 
-    GNUTLS_COMP_DEFLATE, 
-    GNUTLS_COMP_LZO /* only available if gnutls-extra has been initialized 
-                         */
-} gnutls_compression_method_t;
-
-typedef enum { GNUTLS_SERVER=1, GNUTLS_CLIENT } gnutls_connection_end_t;
-
-typedef enum { GNUTLS_AL_WARNING=1, GNUTLS_AL_FATAL } gnutls_alert_level_t;
-
-typedef enum { GNUTLS_A_CLOSE_NOTIFY, 
-    GNUTLS_A_UNEXPECTED_MESSAGE=10, GNUTLS_A_BAD_RECORD_MAC=20,
-    GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_RECORD_OVERFLOW, GNUTLS_A_DECOMPRESSION_FAILURE=30,
-    GNUTLS_A_HANDSHAKE_FAILURE=40, GNUTLS_A_SSL3_NO_CERTIFICATE=41,
-    GNUTLS_A_BAD_CERTIFICATE=42, GNUTLS_A_UNSUPPORTED_CERTIFICATE,
-    GNUTLS_A_CERTIFICATE_REVOKED, GNUTLS_A_CERTIFICATE_EXPIRED, GNUTLS_A_CERTIFICATE_UNKNOWN,
-    GNUTLS_A_ILLEGAL_PARAMETER, GNUTLS_A_UNKNOWN_CA, GNUTLS_A_ACCESS_DENIED, GNUTLS_A_DECODE_ERROR=50,
-    GNUTLS_A_DECRYPT_ERROR, GNUTLS_A_EXPORT_RESTRICTION=60, GNUTLS_A_PROTOCOL_VERSION=70,
-    GNUTLS_A_INSUFFICIENT_SECURITY, GNUTLS_A_INTERNAL_ERROR=80, GNUTLS_A_USER_CANCELED=90,
-    GNUTLS_A_NO_RENEGOTIATION=100, GNUTLS_A_UNSUPPORTED_EXTENSION=110,
-    GNUTLS_A_CERTIFICATE_UNOBTAINABLE=111, GNUTLS_A_UNRECOGNIZED_NAME=112,
-    GNUTLS_A_UNKNOWN_SRP_USERNAME=120, GNUTLS_A_MISSING_SRP_USERNAME=121,
-    GNUTLS_A_INNER_APPLICATION_FAILURE=208,
-    GNUTLS_A_INNER_APPLICATION_VERIFICATION=209
-} gnutls_alert_description_t;
-
-typedef enum { GNUTLS_HANDSHAKE_HELLO_REQUEST, 
+  typedef enum
+  { GNUTLS_COMP_NULL = 1,
+    GNUTLS_COMP_DEFLATE,
+    GNUTLS_COMP_LZO		/* only available if gnutls-extra has been initialized 
+				 */
+  } gnutls_compression_method_t;
+
+  typedef enum
+  { GNUTLS_SERVER = 1, GNUTLS_CLIENT } gnutls_connection_end_t;
+
+  typedef enum
+  { GNUTLS_AL_WARNING = 1, GNUTLS_AL_FATAL } gnutls_alert_level_t;
+
+  typedef enum
+  { GNUTLS_A_CLOSE_NOTIFY,
+    GNUTLS_A_UNEXPECTED_MESSAGE = 10, GNUTLS_A_BAD_RECORD_MAC = 20,
+    GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_RECORD_OVERFLOW,
+    GNUTLS_A_DECOMPRESSION_FAILURE = 30,
+    GNUTLS_A_HANDSHAKE_FAILURE = 40, GNUTLS_A_SSL3_NO_CERTIFICATE = 41,
+    GNUTLS_A_BAD_CERTIFICATE = 42, GNUTLS_A_UNSUPPORTED_CERTIFICATE,
+    GNUTLS_A_CERTIFICATE_REVOKED, GNUTLS_A_CERTIFICATE_EXPIRED,
+    GNUTLS_A_CERTIFICATE_UNKNOWN,
+    GNUTLS_A_ILLEGAL_PARAMETER, GNUTLS_A_UNKNOWN_CA, GNUTLS_A_ACCESS_DENIED,
+    GNUTLS_A_DECODE_ERROR = 50,
+    GNUTLS_A_DECRYPT_ERROR, GNUTLS_A_EXPORT_RESTRICTION =
+      60, GNUTLS_A_PROTOCOL_VERSION = 70,
+    GNUTLS_A_INSUFFICIENT_SECURITY, GNUTLS_A_INTERNAL_ERROR =
+      80, GNUTLS_A_USER_CANCELED = 90,
+    GNUTLS_A_NO_RENEGOTIATION = 100, GNUTLS_A_UNSUPPORTED_EXTENSION = 110,
+    GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111, GNUTLS_A_UNRECOGNIZED_NAME = 112,
+    GNUTLS_A_UNKNOWN_SRP_USERNAME = 120, GNUTLS_A_MISSING_SRP_USERNAME = 121,
+    GNUTLS_A_INNER_APPLICATION_FAILURE = 208,
+    GNUTLS_A_INNER_APPLICATION_VERIFICATION = 209
+  } gnutls_alert_description_t;
+
+  typedef enum
+  { GNUTLS_HANDSHAKE_HELLO_REQUEST,
     GNUTLS_HANDSHAKE_CLIENT_HELLO, GNUTLS_HANDSHAKE_SERVER_HELLO,
-    GNUTLS_HANDSHAKE_CERTIFICATE_PKT=11, GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE,
+    GNUTLS_HANDSHAKE_CERTIFICATE_PKT =
+      11, GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE,
     GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST, GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
     GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY, GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE,
-    GNUTLS_HANDSHAKE_FINISHED=20 
-} gnutls_handshake_description_t;
+    GNUTLS_HANDSHAKE_FINISHED = 20
+  } gnutls_handshake_description_t;
 
 /* Note that the status bits have different meanings
  * in openpgp keys and x.509 certificate verification.
  */
-typedef enum { 
-    GNUTLS_CERT_INVALID=2, /* will be set if the certificate
-                * was not verified.
-                */
-    GNUTLS_CERT_REVOKED=32, /* in X.509 this will be set only if CRLs are checked
-                 */
+  typedef enum
+  {
+    GNUTLS_CERT_INVALID = 2,	/* will be set if the certificate
+				 * was not verified.
+				 */
+    GNUTLS_CERT_REVOKED = 32,	/* in X.509 this will be set only if CRLs are checked
+				 */
 
     /* Those are extra information about the verification
      * process. Will be set only if the certificate was 
      * not verified.
      */
-    GNUTLS_CERT_SIGNER_NOT_FOUND=64,
-    GNUTLS_CERT_SIGNER_NOT_CA=128,
-    GNUTLS_CERT_INSECURE_ALGORITHM=256
-} gnutls_certificate_status_t;
+    GNUTLS_CERT_SIGNER_NOT_FOUND = 64,
+    GNUTLS_CERT_SIGNER_NOT_CA = 128,
+    GNUTLS_CERT_INSECURE_ALGORITHM = 256
+  } gnutls_certificate_status_t;
 
-typedef enum { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST=1, GNUTLS_CERT_REQUIRE } gnutls_certificate_request_t;
+  typedef enum
+  { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST = 1, GNUTLS_CERT_REQUIRE
+  } gnutls_certificate_request_t;
 
-typedef enum { GNUTLS_OPENPGP_KEY, 
+  typedef enum
+  { GNUTLS_OPENPGP_KEY,
     GNUTLS_OPENPGP_KEY_FINGERPRINT
-} gnutls_openpgp_key_status_t;
+  } gnutls_openpgp_key_status_t;
 
-typedef enum { GNUTLS_SHUT_RDWR=0, GNUTLS_SHUT_WR=1 } gnutls_close_request_t;
+  typedef enum
+  { GNUTLS_SHUT_RDWR = 0, GNUTLS_SHUT_WR = 1 } gnutls_close_request_t;
 
 #define GNUTLS_TLS1 GNUTLS_TLS1_0
-typedef enum  {
-  GNUTLS_SSL3 = 1,
-  GNUTLS_TLS1_0,
-  GNUTLS_TLS1_1,
-  GNUTLS_VERSION_UNKNOWN = 0xff
-} gnutls_protocol_t;
+  typedef enum
+  {
+    GNUTLS_SSL3 = 1,
+    GNUTLS_TLS1_0,
+    GNUTLS_TLS1_1,
+    GNUTLS_VERSION_UNKNOWN = 0xff
+  } gnutls_protocol_t;
 
-typedef enum { GNUTLS_CRT_X509=1, GNUTLS_CRT_OPENPGP 
-} gnutls_certificate_type_t;
+  typedef enum
+  { GNUTLS_CRT_X509 = 1, GNUTLS_CRT_OPENPGP
+  } gnutls_certificate_type_t;
 
-typedef enum { GNUTLS_X509_FMT_DER, 
-    GNUTLS_X509_FMT_PEM } gnutls_x509_crt_fmt_t;
+  typedef enum
+  { GNUTLS_X509_FMT_DER,
+    GNUTLS_X509_FMT_PEM
+  } gnutls_x509_crt_fmt_t;
 
-typedef enum { GNUTLS_PK_UNKNOWN=0, GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA
-} gnutls_pk_algorithm_t;
+  typedef enum
+  { GNUTLS_PK_UNKNOWN = 0, GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA
+  } gnutls_pk_algorithm_t;
 
-const char *gnutls_pk_algorithm_get_name( gnutls_pk_algorithm_t algorithm);
+  const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm);
 
 #define GNUTLS_SIGN_RSA_SHA GNUTLS_SIGN_RSA_SHA1
 #define GNUTLS_SIGN_DSA_SHA GNUTLS_SIGN_DSA_SHA1
-typedef enum { GNUTLS_SIGN_UNKNOWN=0, GNUTLS_SIGN_RSA_SHA1 = 1, GNUTLS_SIGN_DSA_SHA1,
+  typedef enum
+  { GNUTLS_SIGN_UNKNOWN = 0, GNUTLS_SIGN_RSA_SHA1 = 1, GNUTLS_SIGN_DSA_SHA1,
     GNUTLS_SIGN_RSA_MD5, GNUTLS_SIGN_RSA_MD2, GNUTLS_SIGN_RSA_RMD160
-} gnutls_sign_algorithm_t;
+  } gnutls_sign_algorithm_t;
 
-const char *gnutls_sign_algorithm_get_name( gnutls_sign_algorithm_t algorithm);
+  const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t
+					      algorithm);
 
 /* If you want to change this, then also change the 
  * define in gnutls_int.h, and recompile.
  */
-typedef void * gnutls_transport_ptr_t;
+  typedef void *gnutls_transport_ptr_t;
 
-struct gnutls_session_int;
-typedef struct gnutls_session_int* gnutls_session_t;
+  struct gnutls_session_int;
+  typedef struct gnutls_session_int *gnutls_session_t;
 
-struct gnutls_dh_params_int;
-typedef struct gnutls_dh_params_int* gnutls_dh_params_t;
+  struct gnutls_dh_params_int;
+  typedef struct gnutls_dh_params_int *gnutls_dh_params_t;
 
-struct gnutls_x509_privkey_int; /* XXX ugly. */
-typedef struct gnutls_x509_privkey_int* gnutls_rsa_params_t; /* XXX ugly. */
+  struct gnutls_x509_privkey_int;	/* XXX ugly. */
+  typedef struct gnutls_x509_privkey_int *gnutls_rsa_params_t;	/* XXX ugly. */
 
-typedef struct {
-    unsigned char * data;
+  typedef struct
+  {
+    unsigned char *data;
     unsigned int size;
-} gnutls_datum_t;
+  } gnutls_datum_t;
 
 
 /* internal functions */
 
-int gnutls_init(gnutls_session_t * session, gnutls_connection_end_t con_end);
-void gnutls_deinit(gnutls_session_t session);
+  int gnutls_init (gnutls_session_t * session,
+		   gnutls_connection_end_t con_end);
+  void gnutls_deinit (gnutls_session_t session);
 #define _gnutls_deinit(x) gnutls_deinit(x)
 
-int gnutls_bye( gnutls_session_t session, gnutls_close_request_t how);
+  int gnutls_bye (gnutls_session_t session, gnutls_close_request_t how);
 
-int gnutls_handshake( gnutls_session_t session);
-int gnutls_rehandshake( gnutls_session_t session);
+  int gnutls_handshake (gnutls_session_t session);
+  int gnutls_rehandshake (gnutls_session_t session);
 
-gnutls_alert_description_t gnutls_alert_get( gnutls_session_t session);
-int gnutls_alert_send( gnutls_session_t session,
-		       gnutls_alert_level_t level,
-		       gnutls_alert_description_t desc);
-int gnutls_alert_send_appropriate(  gnutls_session_t session, int err);
-const char*  gnutls_alert_get_name( gnutls_alert_description_t alert);
+  gnutls_alert_description_t gnutls_alert_get (gnutls_session_t session);
+  int gnutls_alert_send (gnutls_session_t session,
+			 gnutls_alert_level_t level,
+			 gnutls_alert_description_t desc);
+  int gnutls_alert_send_appropriate (gnutls_session_t session, int err);
+  const char *gnutls_alert_get_name (gnutls_alert_description_t alert);
 
 /* get information on the current session */
-gnutls_cipher_algorithm_t     gnutls_cipher_get( gnutls_session_t session);
-gnutls_kx_algorithm_t         gnutls_kx_get( gnutls_session_t session);
-gnutls_mac_algorithm_t        gnutls_mac_get( gnutls_session_t session);
-gnutls_compression_method_t   gnutls_compression_get( gnutls_session_t session);
-gnutls_certificate_type_t     gnutls_certificate_type_get( gnutls_session_t session);
+  gnutls_cipher_algorithm_t gnutls_cipher_get (gnutls_session_t session);
+  gnutls_kx_algorithm_t gnutls_kx_get (gnutls_session_t session);
+  gnutls_mac_algorithm_t gnutls_mac_get (gnutls_session_t session);
+  gnutls_compression_method_t gnutls_compression_get (gnutls_session_t
+						      session);
+  gnutls_certificate_type_t gnutls_certificate_type_get (gnutls_session_t
+							 session);
 
-size_t gnutls_cipher_get_key_size( gnutls_cipher_algorithm_t algorithm);
+  size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
 
 /* the name of the specified algorithms */
-const char *gnutls_cipher_get_name( gnutls_cipher_algorithm_t algorithm);
-const char *gnutls_mac_get_name( gnutls_mac_algorithm_t algorithm);
-const char *gnutls_compression_get_name( gnutls_compression_method_t algorithm);
-const char *gnutls_kx_get_name( gnutls_kx_algorithm_t algorithm);
-const char *gnutls_certificate_type_get_name( gnutls_certificate_type_t type);
+  const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm);
+  const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm);
+  const char *gnutls_compression_get_name (gnutls_compression_method_t
+					   algorithm);
+  const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm);
+  const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t
+						type);
 
 /* error functions */
-int gnutls_error_is_fatal( int error);
-int gnutls_error_to_alert( int err, int* level);
+  int gnutls_error_is_fatal (int error);
+  int gnutls_error_to_alert (int err, int *level);
 
-void gnutls_perror( int error);
-const char* gnutls_strerror( int error);
+  void gnutls_perror (int error);
+  const char *gnutls_strerror (int error);
 
 /* Semi-internal functions.
  */
-void gnutls_handshake_set_private_extensions(gnutls_session_t session, int allow);
-gnutls_handshake_description_t gnutls_handshake_get_last_out( gnutls_session_t session);
-gnutls_handshake_description_t gnutls_handshake_get_last_in( gnutls_session_t session);
+  void gnutls_handshake_set_private_extensions (gnutls_session_t session,
+						int allow);
+    gnutls_handshake_description_t
+    gnutls_handshake_get_last_out (gnutls_session_t session);
+    gnutls_handshake_description_t
+    gnutls_handshake_get_last_in (gnutls_session_t session);
 
 /* Record layer functions.
  */
-ssize_t gnutls_record_send( gnutls_session_t session, const void *data, size_t sizeofdata);
-ssize_t gnutls_record_recv( gnutls_session_t session, void *data, size_t sizeofdata);
+  ssize_t gnutls_record_send (gnutls_session_t session, const void *data,
+			      size_t sizeofdata);
+  ssize_t gnutls_record_recv (gnutls_session_t session, void *data,
+			      size_t sizeofdata);
 #define gnutls_read gnutls_record_recv
 #define gnutls_write gnutls_record_send
 
-int gnutls_record_get_direction(gnutls_session_t session);
+  int gnutls_record_get_direction (gnutls_session_t session);
 
-size_t gnutls_record_get_max_size( gnutls_session_t session);
-ssize_t gnutls_record_set_max_size( gnutls_session_t session, size_t size);
+  size_t gnutls_record_get_max_size (gnutls_session_t session);
+  ssize_t gnutls_record_set_max_size (gnutls_session_t session, size_t size);
 
-size_t gnutls_record_check_pending(gnutls_session_t session);
+  size_t gnutls_record_check_pending (gnutls_session_t session);
 
-int gnutls_prf (gnutls_session_t session,
-		size_t label_size, const char *label,
-		int server_random_first,
-		size_t extra_size, const char *extra,
-		size_t outsize, char *out);
+  int gnutls_prf (gnutls_session_t session,
+		  size_t label_size, const char *label,
+		  int server_random_first,
+		  size_t extra_size, const char *extra,
+		  size_t outsize, char *out);
 
-int gnutls_prf_raw (gnutls_session_t session,
-		    size_t label_size, const char *label,
-		    size_t seed_size, const char *seed,
-		    size_t outsize, char *out);
+  int gnutls_prf_raw (gnutls_session_t session,
+		      size_t label_size, const char *label,
+		      size_t seed_size, const char *seed,
+		      size_t outsize, char *out);
 
 /* TLS Extensions */
 
-typedef enum { GNUTLS_NAME_DNS=1 
-} gnutls_server_name_type_t;
+  typedef enum
+  { GNUTLS_NAME_DNS = 1
+  } gnutls_server_name_type_t;
 
-int gnutls_server_name_set(gnutls_session_t session,
-    gnutls_server_name_type_t type,
-    const void *name, size_t name_length);
+  int gnutls_server_name_set (gnutls_session_t session,
+			      gnutls_server_name_type_t type,
+			      const void *name, size_t name_length);
 
-int gnutls_server_name_get(gnutls_session_t session, 
-    void *data, size_t *data_length,
-    unsigned int * type, unsigned int indx);
+  int gnutls_server_name_get (gnutls_session_t session,
+			      void *data, size_t * data_length,
+			      unsigned int *type, unsigned int indx);
 
-typedef enum {
-  GNUTLS_IA_DISABLED = 0,
-  GNUTLS_IA_APP_PHASE_ON_RESUMPTION_NO = 1,
-  GNUTLS_IA_APP_PHASE_ON_RESUMPTION_YES = 2
-} gnutls_ia_mode_t;
+  typedef enum
+  {
+    GNUTLS_IA_DISABLED = 0,
+    GNUTLS_IA_APP_PHASE_ON_RESUMPTION_NO = 1,
+    GNUTLS_IA_APP_PHASE_ON_RESUMPTION_YES = 2
+  } gnutls_ia_mode_t;
 
 /* functions to set priority of cipher suites 
  */
-int gnutls_cipher_set_priority( gnutls_session_t session, const int *list);
-int gnutls_mac_set_priority( gnutls_session_t session, const int *list);
-int gnutls_compression_set_priority( gnutls_session_t session, const int *list);
-int gnutls_kx_set_priority( gnutls_session_t session, const int *list);
-int gnutls_protocol_set_priority( gnutls_session_t session, const int*list);
-int gnutls_certificate_type_set_priority( gnutls_session_t session,
-					  const int *list);
+  int gnutls_cipher_set_priority (gnutls_session_t session, const int *list);
+  int gnutls_mac_set_priority (gnutls_session_t session, const int *list);
+  int gnutls_compression_set_priority (gnutls_session_t session,
+				       const int *list);
+  int gnutls_kx_set_priority (gnutls_session_t session, const int *list);
+  int gnutls_protocol_set_priority (gnutls_session_t session,
+				    const int *list);
+  int gnutls_certificate_type_set_priority (gnutls_session_t session,
+					    const int *list);
 
 /* if you just want some defaults, use the following.
  */
-int gnutls_set_default_priority(gnutls_session_t session);
-int gnutls_set_default_export_priority(gnutls_session_t session);
+  int gnutls_set_default_priority (gnutls_session_t session);
+  int gnutls_set_default_export_priority (gnutls_session_t session);
 
 /* Returns the name of a cipher suite */
-const char *gnutls_cipher_suite_get_name(gnutls_kx_algorithm_t kx_algorithm,
-    gnutls_cipher_algorithm_t cipher_algorithm, gnutls_mac_algorithm_t mac_algorithm);
+  const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t
+					    kx_algorithm,
+					    gnutls_cipher_algorithm_t
+					    cipher_algorithm,
+					    gnutls_mac_algorithm_t
+					    mac_algorithm);
 
 /* get the currently used protocol version */
-gnutls_protocol_t gnutls_protocol_get_version(gnutls_session_t session);
+  gnutls_protocol_t gnutls_protocol_get_version (gnutls_session_t session);
 
-const char *gnutls_protocol_get_name(gnutls_protocol_t version);
+  const char *gnutls_protocol_get_name (gnutls_protocol_t version);
 
 
 /* get/set session 
  */
-int gnutls_session_set_data( gnutls_session_t session, const void* session_data, size_t session_data_size);
-int gnutls_session_get_data( gnutls_session_t session, void* session_data, size_t *session_data_size);
-int gnutls_session_get_data2( gnutls_session_t session, gnutls_datum* data);
+  int gnutls_session_set_data (gnutls_session_t session,
+			       const void *session_data,
+			       size_t session_data_size);
+  int gnutls_session_get_data (gnutls_session_t session, void *session_data,
+			       size_t * session_data_size);
+  int gnutls_session_get_data2 (gnutls_session_t session,
+				gnutls_datum * data);
 
 /* returns the session ID */
 #define GNUTLS_MAX_SESSION_ID 32
-int gnutls_session_get_id( gnutls_session_t session, void* session_id, size_t *session_id_size);
+  int gnutls_session_get_id (gnutls_session_t session, void *session_id,
+			     size_t * session_id_size);
 
 /* returns the client/server random fields. */
-const char *gnutls_session_get_server_random (gnutls_session_t session);
-const char *gnutls_session_get_client_random (gnutls_session_t session);
+  const char *gnutls_session_get_server_random (gnutls_session_t session);
+  const char *gnutls_session_get_client_random (gnutls_session_t session);
 
 /* checks if this session is a resumed one 
  */
-int gnutls_session_is_resumed(gnutls_session_t session);
-
-typedef int (*gnutls_db_store_func)(void*, gnutls_datum_t key, gnutls_datum_t data);
-typedef int (*gnutls_db_remove_func)(void*, gnutls_datum_t key);
-typedef gnutls_datum_t (*gnutls_db_retr_func)(void*, gnutls_datum_t key);
-
-void gnutls_db_set_cache_expiration( gnutls_session_t session, int seconds);
-
-void gnutls_db_remove_session( gnutls_session_t session);
-void gnutls_db_set_retrieve_function( gnutls_session_t session, gnutls_db_retr_func retr_func);
-void gnutls_db_set_remove_function( gnutls_session_t session, gnutls_db_remove_func rem_func);
-void gnutls_db_set_store_function( gnutls_session_t session, gnutls_db_store_func store_func);
-void gnutls_db_set_ptr( gnutls_session_t session, void* ptr);
-void* gnutls_db_get_ptr( gnutls_session_t session);
-int  gnutls_db_check_entry( gnutls_session_t session, gnutls_datum_t session_entry);
-
-void gnutls_handshake_set_max_packet_length( gnutls_session_t session, int max);
+  int gnutls_session_is_resumed (gnutls_session_t session);
+
+  typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key,
+				       gnutls_datum_t data);
+  typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key);
+  typedef gnutls_datum_t (*gnutls_db_retr_func) (void *, gnutls_datum_t key);
+
+  void gnutls_db_set_cache_expiration (gnutls_session_t session, int seconds);
+
+  void gnutls_db_remove_session (gnutls_session_t session);
+  void gnutls_db_set_retrieve_function (gnutls_session_t session,
+					gnutls_db_retr_func retr_func);
+  void gnutls_db_set_remove_function (gnutls_session_t session,
+				      gnutls_db_remove_func rem_func);
+  void gnutls_db_set_store_function (gnutls_session_t session,
+				     gnutls_db_store_func store_func);
+  void gnutls_db_set_ptr (gnutls_session_t session, void *ptr);
+  void *gnutls_db_get_ptr (gnutls_session_t session);
+  int gnutls_db_check_entry (gnutls_session_t session,
+			     gnutls_datum_t session_entry);
+
+  void gnutls_handshake_set_max_packet_length (gnutls_session_t session,
+					       int max);
 
 /* returns libgnutls version (call it with a NULL argument)
  */
-const char* gnutls_check_version( const char *req_version);
+  const char *gnutls_check_version (const char *req_version);
 
 /* Functions for setting/clearing credentials
  */
-void gnutls_credentials_clear( gnutls_session_t session);
+  void gnutls_credentials_clear (gnutls_session_t session);
 
 /* cred is a structure defined by the kx algorithm
  */
-int gnutls_credentials_set( gnutls_session_t session,
-			    gnutls_credentials_type_t type,
-			    void* cred);
+  int gnutls_credentials_set (gnutls_session_t session,
+			      gnutls_credentials_type_t type, void *cred);
 #define gnutls_cred_set	gnutls_credentials_set
 
 /* Credential structures for SRP - used in gnutls_credentials_set(); */
 
-struct gnutls_certificate_credentials_st;
-typedef struct gnutls_certificate_credentials_st *gnutls_certificate_credentials_t;
-typedef gnutls_certificate_credentials_t gnutls_certificate_server_credentials;
-typedef gnutls_certificate_credentials_t gnutls_certificate_client_credentials;
-
-typedef struct gnutls_anon_server_credentials_st* gnutls_anon_server_credentials_t;
-typedef struct gnutls_anon_client_credentials_st* gnutls_anon_client_credentials_t;
-
-void gnutls_anon_free_server_credentials( gnutls_anon_server_credentials_t sc);
-int gnutls_anon_allocate_server_credentials( gnutls_anon_server_credentials_t *sc);
-
-void gnutls_anon_set_server_dh_params( gnutls_anon_server_credentials_t res, gnutls_dh_params_t dh_params);
-
-void gnutls_anon_free_client_credentials( gnutls_anon_client_credentials_t sc);
-int gnutls_anon_allocate_client_credentials( gnutls_anon_client_credentials_t *sc);
+  struct gnutls_certificate_credentials_st;
+  typedef struct gnutls_certificate_credentials_st
+    *gnutls_certificate_credentials_t;
+  typedef gnutls_certificate_credentials_t
+    gnutls_certificate_server_credentials;
+  typedef gnutls_certificate_credentials_t
+    gnutls_certificate_client_credentials;
+
+  typedef struct gnutls_anon_server_credentials_st
+    *gnutls_anon_server_credentials_t;
+  typedef struct gnutls_anon_client_credentials_st
+    *gnutls_anon_client_credentials_t;
+
+  void gnutls_anon_free_server_credentials (gnutls_anon_server_credentials_t
+					    sc);
+  int
+    gnutls_anon_allocate_server_credentials (gnutls_anon_server_credentials_t
+					     * sc);
+
+  void gnutls_anon_set_server_dh_params (gnutls_anon_server_credentials_t res,
+					 gnutls_dh_params_t dh_params);
+
+  void gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t
+					    sc);
+  int
+    gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t
+					     * sc);
 
 /* CERTFILE is an x509 certificate in PEM form.
  * KEYFILE is a pkcs-1 private key in PEM form (for RSA keys).
  */
-void gnutls_certificate_free_credentials( gnutls_certificate_credentials_t sc);
-int gnutls_certificate_allocate_credentials( gnutls_certificate_credentials_t *res);
-
-void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc);
-void gnutls_certificate_free_cas(gnutls_certificate_credentials_t sc);
-void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc);
-void gnutls_certificate_free_crls(gnutls_certificate_credentials_t sc);
-
-void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res,
-				      gnutls_dh_params_t dh_params);
-void gnutls_certificate_set_rsa_export_params(gnutls_certificate_credentials_t res, gnutls_rsa_params_t rsa_params);
-void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t res, unsigned int flags);
-void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t res, unsigned int max_bits,
-    unsigned int max_depth);
-
-int gnutls_certificate_set_x509_trust_file( gnutls_certificate_credentials_t res, const char* CAFILE, 
-    gnutls_x509_crt_fmt_t type);
-int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials_t res, 
-    const gnutls_datum_t *CA, gnutls_x509_crt_fmt_t type);
-
-int gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials_t res, 
-    const char *crlfile, gnutls_x509_crt_fmt_t type);
-int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials_t res, 
-    const gnutls_datum_t *CRL, gnutls_x509_crt_fmt_t type);
-
-int gnutls_certificate_set_x509_key_file( gnutls_certificate_credentials_t res, 
-    const char *CERTFILE, const char* KEYFILE, gnutls_x509_crt_fmt_t type);
-int gnutls_certificate_set_x509_key_mem(gnutls_certificate_credentials_t res, 
-    const gnutls_datum_t* CERT, const gnutls_datum_t* KEY,
-    gnutls_x509_crt_fmt_t type);
-
-extern int
-gnutls_certificate_set_x509_simple_pkcs12_file (gnutls_certificate_credentials_t res,
-						const char *pkcs12file,
-						gnutls_x509_crt_fmt_t type,
-						const char *password);
+  void gnutls_certificate_free_credentials (gnutls_certificate_credentials_t
+					    sc);
+  int
+    gnutls_certificate_allocate_credentials (gnutls_certificate_credentials_t
+					     * res);
+
+  void gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc);
+  void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc);
+  void gnutls_certificate_free_ca_names (gnutls_certificate_credentials_t sc);
+  void gnutls_certificate_free_crls (gnutls_certificate_credentials_t sc);
+
+  void gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t res,
+					 gnutls_dh_params_t dh_params);
+  void
+    gnutls_certificate_set_rsa_export_params (gnutls_certificate_credentials_t
+					      res,
+					      gnutls_rsa_params_t rsa_params);
+  void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_t
+					    res, unsigned int flags);
+  void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials_t
+					     res, unsigned int max_bits,
+					     unsigned int max_depth);
+
+  int gnutls_certificate_set_x509_trust_file (gnutls_certificate_credentials_t
+					      res, const char *CAFILE,
+					      gnutls_x509_crt_fmt_t type);
+  int gnutls_certificate_set_x509_trust_mem (gnutls_certificate_credentials_t
+					     res, const gnutls_datum_t * CA,
+					     gnutls_x509_crt_fmt_t type);
+
+  int gnutls_certificate_set_x509_crl_file (gnutls_certificate_credentials_t
+					    res, const char *crlfile,
+					    gnutls_x509_crt_fmt_t type);
+  int gnutls_certificate_set_x509_crl_mem (gnutls_certificate_credentials_t
+					   res, const gnutls_datum_t * CRL,
+					   gnutls_x509_crt_fmt_t type);
+
+  int gnutls_certificate_set_x509_key_file (gnutls_certificate_credentials_t
+					    res, const char *CERTFILE,
+					    const char *KEYFILE,
+					    gnutls_x509_crt_fmt_t type);
+  int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t
+					   res, const gnutls_datum_t * CERT,
+					   const gnutls_datum_t * KEY,
+					   gnutls_x509_crt_fmt_t type);
+
+  extern int
+    gnutls_certificate_set_x509_simple_pkcs12_file
+    (gnutls_certificate_credentials_t res, const char *pkcs12file,
+     gnutls_x509_crt_fmt_t type, const char *password);
 
 /* New functions to allow setting already parsed X.509 stuff.
  */
-struct gnutls_x509_privkey_int;
-typedef struct gnutls_x509_privkey_int* gnutls_x509_privkey_t;
+  struct gnutls_x509_privkey_int;
+  typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey_t;
 
-struct gnutls_x509_crl_int;
-typedef struct gnutls_x509_crl_int* gnutls_x509_crl_t;
+  struct gnutls_x509_crl_int;
+  typedef struct gnutls_x509_crl_int *gnutls_x509_crl_t;
 
-struct gnutls_x509_crt_int;
-typedef struct gnutls_x509_crt_int* gnutls_x509_crt_t;
+  struct gnutls_x509_crt_int;
+  typedef struct gnutls_x509_crt_int *gnutls_x509_crt_t;
 
-int gnutls_certificate_set_x509_key(gnutls_certificate_credentials_t res, 
-    gnutls_x509_crt_t *cert_list, int cert_list_size,
-    gnutls_x509_privkey_t key);
-int gnutls_certificate_set_x509_trust(gnutls_certificate_credentials_t res, 
-    gnutls_x509_crt_t * ca_list, int ca_list_size);
-int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res, 
-    gnutls_x509_crl_t* crl_list, int crl_list_size);
+  int gnutls_certificate_set_x509_key (gnutls_certificate_credentials_t res,
+				       gnutls_x509_crt_t * cert_list,
+				       int cert_list_size,
+				       gnutls_x509_privkey_t key);
+  int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t res,
+					 gnutls_x509_crt_t * ca_list,
+					 int ca_list_size);
+  int gnutls_certificate_set_x509_crl (gnutls_certificate_credentials_t res,
+				       gnutls_x509_crl_t * crl_list,
+				       int crl_list_size);
 
 
 /* global state functions
  */
-int gnutls_global_init(void);
-void gnutls_global_deinit(void);
-
-typedef void* (*gnutls_alloc_function)(size_t);
-typedef void* (*gnutls_calloc_function)(size_t, size_t);
-typedef int (*gnutls_is_secure_function)(const void*);
-typedef void (*gnutls_free_function)(void*);
-typedef void* (*gnutls_realloc_function)(void*, size_t);
-
-extern void
-gnutls_global_set_mem_functions(gnutls_alloc_function gt_alloc_func,
-				gnutls_alloc_function gt_secure_alloc_func,
-				gnutls_is_secure_function gt_is_secure_func,
-				gnutls_realloc_function gt_realloc_func,
-				gnutls_free_function gt_free_func);
+  int gnutls_global_init (void);
+  void gnutls_global_deinit (void);
+
+  typedef void *(*gnutls_alloc_function) (size_t);
+  typedef void *(*gnutls_calloc_function) (size_t, size_t);
+  typedef int (*gnutls_is_secure_function) (const void *);
+  typedef void (*gnutls_free_function) (void *);
+  typedef void *(*gnutls_realloc_function) (void *, size_t);
+
+  extern void
+    gnutls_global_set_mem_functions (gnutls_alloc_function gt_alloc_func,
+				     gnutls_alloc_function
+				     gt_secure_alloc_func,
+				     gnutls_is_secure_function
+				     gt_is_secure_func,
+				     gnutls_realloc_function gt_realloc_func,
+				     gnutls_free_function gt_free_func);
 
 /* For use in callbacks */
-extern gnutls_alloc_function gnutls_malloc;
-extern gnutls_alloc_function gnutls_secure_malloc;
-extern gnutls_realloc_function gnutls_realloc;
-extern gnutls_calloc_function gnutls_calloc;
-extern gnutls_free_function gnutls_free;
+  extern gnutls_alloc_function gnutls_malloc;
+  extern gnutls_alloc_function gnutls_secure_malloc;
+  extern gnutls_realloc_function gnutls_realloc;
+  extern gnutls_calloc_function gnutls_calloc;
+  extern gnutls_free_function gnutls_free;
 
-extern char* (*gnutls_strdup)( const char*);
+  extern char *(*gnutls_strdup) (const char *);
 
-typedef void (*gnutls_log_func)( int, const char*);
-void gnutls_global_set_log_function( gnutls_log_func log_func);
-void gnutls_global_set_log_level( int level);
+  typedef void (*gnutls_log_func) (int, const char *);
+  void gnutls_global_set_log_function (gnutls_log_func log_func);
+  void gnutls_global_set_log_level (int level);
 
 /* Diffie Hellman parameter handling.
  */
-int gnutls_dh_params_init( gnutls_dh_params_t *dh_params);
-void gnutls_dh_params_deinit( gnutls_dh_params_t dh_params);
-int gnutls_dh_params_import_raw(gnutls_dh_params_t dh_params,
-				const gnutls_datum_t *prime,
-				const gnutls_datum_t* generator);
-int gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params,
-    const gnutls_datum_t * pkcs3_params, gnutls_x509_crt_fmt_t format);
-int gnutls_dh_params_generate2(gnutls_dh_params_t params, unsigned int bits);
-int gnutls_dh_params_export_pkcs3( gnutls_dh_params_t params,
-    gnutls_x509_crt_fmt_t format, unsigned char* params_data, size_t* params_data_size);
-int gnutls_dh_params_export_raw(gnutls_dh_params_t params,
-    gnutls_datum_t * prime, gnutls_datum_t * generator, unsigned int *bits);
-int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src);
+  int gnutls_dh_params_init (gnutls_dh_params_t * dh_params);
+  void gnutls_dh_params_deinit (gnutls_dh_params_t dh_params);
+  int gnutls_dh_params_import_raw (gnutls_dh_params_t dh_params,
+				   const gnutls_datum_t * prime,
+				   const gnutls_datum_t * generator);
+  int gnutls_dh_params_import_pkcs3 (gnutls_dh_params_t params,
+				     const gnutls_datum_t * pkcs3_params,
+				     gnutls_x509_crt_fmt_t format);
+  int gnutls_dh_params_generate2 (gnutls_dh_params_t params,
+				  unsigned int bits);
+  int gnutls_dh_params_export_pkcs3 (gnutls_dh_params_t params,
+				     gnutls_x509_crt_fmt_t format,
+				     unsigned char *params_data,
+				     size_t * params_data_size);
+  int gnutls_dh_params_export_raw (gnutls_dh_params_t params,
+				   gnutls_datum_t * prime,
+				   gnutls_datum_t * generator,
+				   unsigned int *bits);
+  int gnutls_dh_params_cpy (gnutls_dh_params_t dst, gnutls_dh_params_t src);
 
 
 /* RSA params 
  */
-int gnutls_rsa_params_init(gnutls_rsa_params_t * rsa_params);
-void gnutls_rsa_params_deinit(gnutls_rsa_params_t rsa_params);
-int gnutls_rsa_params_cpy(gnutls_rsa_params_t dst, gnutls_rsa_params_t src);
-int gnutls_rsa_params_import_raw(gnutls_rsa_params_t rsa_params, 
-    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);
-int gnutls_rsa_params_generate2(gnutls_rsa_params_t params, unsigned int bits);
-int gnutls_rsa_params_export_raw(gnutls_rsa_params_t params,
-    gnutls_datum_t * m, gnutls_datum_t *e,
-    gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t* q, 
-    gnutls_datum_t* u, unsigned int *bits);
-int gnutls_rsa_params_export_pkcs1( gnutls_rsa_params_t params,
-    gnutls_x509_crt_fmt_t format, unsigned char* params_data,
-    size_t* params_data_size);
-int gnutls_rsa_params_import_pkcs1(gnutls_rsa_params_t params,
-    const gnutls_datum_t * pkcs1_params, gnutls_x509_crt_fmt_t format);
+  int gnutls_rsa_params_init (gnutls_rsa_params_t * rsa_params);
+  void gnutls_rsa_params_deinit (gnutls_rsa_params_t rsa_params);
+  int gnutls_rsa_params_cpy (gnutls_rsa_params_t dst,
+			     gnutls_rsa_params_t src);
+  int gnutls_rsa_params_import_raw (gnutls_rsa_params_t rsa_params,
+				    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);
+  int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
+				   unsigned int bits);
+  int gnutls_rsa_params_export_raw (gnutls_rsa_params_t params,
+				    gnutls_datum_t * m, gnutls_datum_t * e,
+				    gnutls_datum_t * d, gnutls_datum_t * p,
+				    gnutls_datum_t * q, gnutls_datum_t * u,
+				    unsigned int *bits);
+  int gnutls_rsa_params_export_pkcs1 (gnutls_rsa_params_t params,
+				      gnutls_x509_crt_fmt_t format,
+				      unsigned char *params_data,
+				      size_t * params_data_size);
+  int gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t params,
+				      const gnutls_datum_t * pkcs1_params,
+				      gnutls_x509_crt_fmt_t format);
 
 /* Session stuff
  */
-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);
-void gnutls_transport_set_ptr(gnutls_session_t session, gnutls_transport_ptr_t ptr);
-void gnutls_transport_set_ptr2(gnutls_session_t session, gnutls_transport_ptr_t recv_ptr,
-    gnutls_transport_ptr_t send_ptr);
+  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);
+  void gnutls_transport_set_ptr (gnutls_session_t session,
+				 gnutls_transport_ptr_t ptr);
+  void gnutls_transport_set_ptr2 (gnutls_session_t session,
+				  gnutls_transport_ptr_t recv_ptr,
+				  gnutls_transport_ptr_t send_ptr);
 
-gnutls_transport_ptr_t gnutls_transport_get_ptr(gnutls_session_t session);
-void gnutls_transport_get_ptr2(gnutls_session_t session,
-    gnutls_transport_ptr_t *recv_ptr,
-    gnutls_transport_ptr_t *send_ptr);
+  gnutls_transport_ptr_t gnutls_transport_get_ptr (gnutls_session_t session);
+  void gnutls_transport_get_ptr2 (gnutls_session_t session,
+				  gnutls_transport_ptr_t * recv_ptr,
+				  gnutls_transport_ptr_t * send_ptr);
 
-void gnutls_transport_set_lowat( gnutls_session_t session, int num);
+  void gnutls_transport_set_lowat (gnutls_session_t session, int num);
 
 
-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_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);
 
 /* session specific 
  */
-void gnutls_session_set_ptr(gnutls_session_t session, void* ptr);
-void* gnutls_session_get_ptr(gnutls_session_t session);
+  void gnutls_session_set_ptr (gnutls_session_t session, void *ptr);
+  void *gnutls_session_get_ptr (gnutls_session_t session);
 
-void gnutls_openpgp_send_key(gnutls_session_t session, gnutls_openpgp_key_status_t status);
+  void gnutls_openpgp_send_key (gnutls_session_t session,
+				gnutls_openpgp_key_status_t status);
 
 /* fingerprint 
  * Actually this function returns the hash of the given data.
  */
-int gnutls_fingerprint(gnutls_digest_algorithm_t algo, const gnutls_datum_t* data, 
-    void* result, size_t* result_size);
+  int gnutls_fingerprint (gnutls_digest_algorithm_t algo,
+			  const gnutls_datum_t * data, void *result,
+			  size_t * result_size);
 
 
 /* SRP 
  */
 
-typedef struct gnutls_srp_server_credentials_st* gnutls_srp_server_credentials_t;
-typedef struct gnutls_srp_client_credentials_st* gnutls_srp_client_credentials_t;
-
-void gnutls_srp_free_client_credentials( gnutls_srp_client_credentials_t sc);
-int gnutls_srp_allocate_client_credentials( gnutls_srp_client_credentials_t *sc);
-int gnutls_srp_set_client_credentials( gnutls_srp_client_credentials_t res, char *username, char* password);
-
-void gnutls_srp_free_server_credentials( gnutls_srp_server_credentials_t sc);
-int gnutls_srp_allocate_server_credentials( gnutls_srp_server_credentials_t *sc);
-int gnutls_srp_set_server_credentials_file( gnutls_srp_server_credentials_t res, 
-    const char *password_file, const char* password_conf_file);
-
-const char* gnutls_srp_server_get_username( gnutls_session_t session);
-
-extern int gnutls_srp_verifier (const char* username,
-				const char* password,
-				const gnutls_datum_t *salt,
-				const gnutls_datum_t* generator,
-				const gnutls_datum_t* prime,
-				gnutls_datum_t * res);
+  typedef struct gnutls_srp_server_credentials_st
+    *gnutls_srp_server_credentials_t;
+  typedef struct gnutls_srp_client_credentials_st
+    *gnutls_srp_client_credentials_t;
+
+  void gnutls_srp_free_client_credentials (gnutls_srp_client_credentials_t
+					   sc);
+  int gnutls_srp_allocate_client_credentials (gnutls_srp_client_credentials_t
+					      * sc);
+  int gnutls_srp_set_client_credentials (gnutls_srp_client_credentials_t res,
+					 char *username, char *password);
+
+  void gnutls_srp_free_server_credentials (gnutls_srp_server_credentials_t
+					   sc);
+  int gnutls_srp_allocate_server_credentials (gnutls_srp_server_credentials_t
+					      * sc);
+  int gnutls_srp_set_server_credentials_file (gnutls_srp_server_credentials_t
+					      res, const char *password_file,
+					      const char *password_conf_file);
+
+  const char *gnutls_srp_server_get_username (gnutls_session_t session);
+
+  extern int gnutls_srp_verifier (const char *username,
+				  const char *password,
+				  const gnutls_datum_t * salt,
+				  const gnutls_datum_t * generator,
+				  const gnutls_datum_t * prime,
+				  gnutls_datum_t * res);
 
 /* The static parameters defined in draft-ietf-tls-srp-05
  * Those should be used as input to gnutls_srp_verifier().
  */
-extern const gnutls_datum_t gnutls_srp_2048_group_prime;
-extern const gnutls_datum_t gnutls_srp_2048_group_generator;
-
-extern const gnutls_datum_t gnutls_srp_1536_group_prime;
-extern const gnutls_datum_t gnutls_srp_1536_group_generator;
-
-extern const gnutls_datum_t gnutls_srp_1024_group_prime;
-extern const gnutls_datum_t gnutls_srp_1024_group_generator;
-
-typedef int gnutls_srp_server_credentials_function(
-    gnutls_session_t, 
-    const char* username, gnutls_datum_t* salt, 
-    gnutls_datum_t* verifier, gnutls_datum_t* generator,
-    gnutls_datum_t* prime
-);
-void gnutls_srp_set_server_credentials_function(
-    gnutls_srp_server_credentials_t cred,
-    gnutls_srp_server_credentials_function *func);
-
-typedef int gnutls_srp_client_credentials_function(gnutls_session_t, unsigned int,
-    char **, char**);
-void gnutls_srp_set_client_credentials_function( gnutls_srp_client_credentials_t cred,
-    gnutls_srp_client_credentials_function *func);
-
-int gnutls_srp_base64_encode( const gnutls_datum_t *data, char* result, size_t* result_size);
-int gnutls_srp_base64_encode_alloc( const gnutls_datum_t *data, gnutls_datum_t* result);
-
-int gnutls_srp_base64_decode( const gnutls_datum_t *b64_data, char* result, size_t* result_size);
-int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data,
-				      gnutls_datum_t* result);
+  extern const gnutls_datum_t gnutls_srp_2048_group_prime;
+  extern const gnutls_datum_t gnutls_srp_2048_group_generator;
+
+  extern const gnutls_datum_t gnutls_srp_1536_group_prime;
+  extern const gnutls_datum_t gnutls_srp_1536_group_generator;
+
+  extern const gnutls_datum_t gnutls_srp_1024_group_prime;
+  extern const gnutls_datum_t gnutls_srp_1024_group_generator;
+
+  typedef int gnutls_srp_server_credentials_function (gnutls_session_t,
+						      const char *username,
+						      gnutls_datum_t * salt,
+						      gnutls_datum_t *
+						      verifier,
+						      gnutls_datum_t *
+						      generator,
+						      gnutls_datum_t * prime);
+  void
+    gnutls_srp_set_server_credentials_function
+    (gnutls_srp_server_credentials_t cred,
+     gnutls_srp_server_credentials_function * func);
+
+  typedef int gnutls_srp_client_credentials_function (gnutls_session_t,
+						      unsigned int, char **,
+						      char **);
+  void
+    gnutls_srp_set_client_credentials_function
+    (gnutls_srp_client_credentials_t cred,
+     gnutls_srp_client_credentials_function * func);
+
+  int gnutls_srp_base64_encode (const gnutls_datum_t * data, char *result,
+				size_t * result_size);
+  int gnutls_srp_base64_encode_alloc (const gnutls_datum_t * data,
+				      gnutls_datum_t * result);
+
+  int gnutls_srp_base64_decode (const gnutls_datum_t * b64_data, char *result,
+				size_t * result_size);
+  int gnutls_srp_base64_decode_alloc (const gnutls_datum_t * b64_data,
+				      gnutls_datum_t * result);
 
 /* PSK stuff */
-typedef struct gnutls_psk_server_credentials_st* gnutls_psk_server_credentials_t;
-typedef struct gnutls_psk_client_credentials_st* gnutls_psk_client_credentials_t;
-
-void gnutls_psk_free_client_credentials( gnutls_psk_client_credentials_t sc);
-int gnutls_psk_allocate_client_credentials( gnutls_psk_client_credentials_t *sc);
-int gnutls_psk_set_client_credentials( gnutls_psk_client_credentials_t res,
-    const char *username, const gnutls_datum* key, unsigned int flags);
-typedef enum gnutls_psk_key_flags {
+  typedef struct gnutls_psk_server_credentials_st
+    *gnutls_psk_server_credentials_t;
+  typedef struct gnutls_psk_client_credentials_st
+    *gnutls_psk_client_credentials_t;
+
+  void gnutls_psk_free_client_credentials (gnutls_psk_client_credentials_t
+					   sc);
+  int gnutls_psk_allocate_client_credentials (gnutls_psk_client_credentials_t
+					      * sc);
+  int gnutls_psk_set_client_credentials (gnutls_psk_client_credentials_t res,
+					 const char *username,
+					 const gnutls_datum * key,
+					 unsigned int flags);
+  typedef enum gnutls_psk_key_flags
+  {
     GNUTLS_PSK_KEY_RAW = 0,
     GNUTLS_PSK_KEY_HEX
-} gnutls_psk_key_flags;
-
-void gnutls_psk_free_server_credentials( gnutls_psk_server_credentials_t sc);
-int gnutls_psk_allocate_server_credentials( gnutls_psk_server_credentials_t *sc);
-int gnutls_psk_set_server_credentials_file( gnutls_psk_server_credentials_t res,
-    const char *password_file);
-
-const char* gnutls_psk_server_get_username( gnutls_session_t session);
-
-typedef int gnutls_psk_server_credentials_function(
-    gnutls_session_t,
-    const char* username, gnutls_datum_t* key
-);
-void gnutls_psk_set_server_credentials_function(
-    gnutls_psk_server_credentials_t cred,
-    gnutls_psk_server_credentials_function *func);
-
-typedef int gnutls_psk_client_credentials_function(gnutls_session_t,
-    char **username, gnutls_datum* key);
-void gnutls_psk_set_client_credentials_function( gnutls_psk_client_credentials_t cred,
-    gnutls_psk_client_credentials_function *func);
-
-int gnutls_hex_encode( const gnutls_datum_t *data, char* result, size_t* result_size);
-int gnutls_hex_decode( const gnutls_datum_t *hex_data, char* result, size_t* result_size);
-
-void gnutls_psk_set_server_dh_params( gnutls_psk_server_credentials_t res, gnutls_dh_params_t dh_params);
+  } gnutls_psk_key_flags;
+
+  void gnutls_psk_free_server_credentials (gnutls_psk_server_credentials_t
+					   sc);
+  int gnutls_psk_allocate_server_credentials (gnutls_psk_server_credentials_t
+					      * sc);
+  int gnutls_psk_set_server_credentials_file (gnutls_psk_server_credentials_t
+					      res, const char *password_file);
+
+  const char *gnutls_psk_server_get_username (gnutls_session_t session);
+
+  typedef int gnutls_psk_server_credentials_function (gnutls_session_t,
+						      const char *username,
+						      gnutls_datum_t * key);
+  void
+    gnutls_psk_set_server_credentials_function
+    (gnutls_psk_server_credentials_t cred,
+     gnutls_psk_server_credentials_function * func);
+
+  typedef int gnutls_psk_client_credentials_function (gnutls_session_t,
+						      char **username,
+						      gnutls_datum * key);
+  void
+    gnutls_psk_set_client_credentials_function
+    (gnutls_psk_client_credentials_t cred,
+     gnutls_psk_client_credentials_function * func);
+
+  int gnutls_hex_encode (const gnutls_datum_t * data, char *result,
+			 size_t * result_size);
+  int gnutls_hex_decode (const gnutls_datum_t * hex_data, char *result,
+			 size_t * result_size);
+
+  void gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
+					gnutls_dh_params_t dh_params);
 
 
 #ifndef GNUTLS_UI_H
 # define GNUTLS_UI_H
 
-  typedef enum gnutls_x509_subject_alt_name_t {
+  typedef enum gnutls_x509_subject_alt_name_t
+  {
     GNUTLS_SAN_DNSNAME = 1, GNUTLS_SAN_RFC822NAME,
     GNUTLS_SAN_URI, GNUTLS_SAN_IPADDRESS
   } gnutls_x509_subject_alt_name_t;
@@ -686,15 +825,18 @@ void gnutls_psk_set_server_dh_params( gnutls_psk_server_credentials_t res, gnutl
   struct gnutls_openpgp_privkey_int;
   typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
 
-  typedef struct gnutls_retr_st {
+  typedef struct gnutls_retr_st
+  {
     gnutls_certificate_type_t type;
-    union cert {
+    union cert
+    {
       gnutls_x509_crt_t *x509;
       gnutls_openpgp_key_t pgp;
     } cert;
     unsigned int ncerts;	/* one for pgp keys */
 
-    union key {
+    union key
+    {
       gnutls_x509_privkey_t x509;
       gnutls_openpgp_privkey_t pgp;
     } key;
@@ -702,92 +844,94 @@ void gnutls_psk_set_server_dh_params( gnutls_psk_server_credentials_t res, gnutl
     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 *);
-  typedef int gnutls_certificate_server_retrieve_function(gnutls_session_t,
-							  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 *);
+  typedef int gnutls_certificate_server_retrieve_function (gnutls_session_t,
+							   gnutls_retr_st *);
 
 
   /* Functions that allow auth_info_t structures handling
    */
 
-  gnutls_credentials_type_t gnutls_auth_get_type(gnutls_session_t session);
-  gnutls_credentials_type_t
-  gnutls_auth_server_get_type(gnutls_session_t session);
-  gnutls_credentials_type_t
-  gnutls_auth_client_get_type(gnutls_session_t session);
+  gnutls_credentials_type_t gnutls_auth_get_type (gnutls_session_t session);
+    gnutls_credentials_type_t
+    gnutls_auth_server_get_type (gnutls_session_t session);
+    gnutls_credentials_type_t
+    gnutls_auth_client_get_type (gnutls_session_t session);
 
   /* DH */
 
-  void gnutls_dh_set_prime_bits(gnutls_session_t session, unsigned int bits);
-  int gnutls_dh_get_secret_bits(gnutls_session_t session);
-  int gnutls_dh_get_peers_public_bits(gnutls_session_t session);
-  int gnutls_dh_get_prime_bits(gnutls_session_t session);
+  void gnutls_dh_set_prime_bits (gnutls_session_t session, unsigned int bits);
+  int gnutls_dh_get_secret_bits (gnutls_session_t session);
+  int gnutls_dh_get_peers_public_bits (gnutls_session_t session);
+  int gnutls_dh_get_prime_bits (gnutls_session_t session);
 
-  int gnutls_dh_get_group(gnutls_session_t session, gnutls_datum_t * raw_gen,
-			  gnutls_datum_t * raw_prime);
-  int gnutls_dh_get_pubkey(gnutls_session_t session,
-			   gnutls_datum_t * raw_key);
+  int gnutls_dh_get_group (gnutls_session_t session, gnutls_datum_t * raw_gen,
+			   gnutls_datum_t * raw_prime);
+  int gnutls_dh_get_pubkey (gnutls_session_t session,
+			    gnutls_datum_t * raw_key);
 
   /* RSA */
-  int gnutls_rsa_export_get_pubkey(gnutls_session_t session,
-				   gnutls_datum_t * exponent,
-				   gnutls_datum_t * modulus);
-  int gnutls_rsa_export_get_modulus_bits(gnutls_session_t session);
+  int gnutls_rsa_export_get_pubkey (gnutls_session_t session,
+				    gnutls_datum_t * exponent,
+				    gnutls_datum_t * modulus);
+  int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session);
 
   /* X509PKI */
 
   /* These are set on the credentials structure.
    */
   void gnutls_certificate_client_set_retrieve_function
-  (gnutls_certificate_credentials_t cred,
-   gnutls_certificate_client_retrieve_function * func);
+    (gnutls_certificate_credentials_t cred,
+     gnutls_certificate_client_retrieve_function * func);
   void gnutls_certificate_server_set_retrieve_function
-  (gnutls_certificate_credentials_t cred,
-   gnutls_certificate_server_retrieve_function * func);
+    (gnutls_certificate_credentials_t cred,
+     gnutls_certificate_server_retrieve_function * func);
 
-  void gnutls_certificate_server_set_request(gnutls_session_t session,
-					     gnutls_certificate_request_t req);
+  void gnutls_certificate_server_set_request (gnutls_session_t session,
+					      gnutls_certificate_request_t
+					      req);
 
   /* get data from the session
    */
-  const gnutls_datum_t *
-  gnutls_certificate_get_peers(gnutls_session_t session,
-			       unsigned int *list_size);
-  const gnutls_datum_t *
-  gnutls_certificate_get_ours(gnutls_session_t session);
+  const gnutls_datum_t *gnutls_certificate_get_peers (gnutls_session_t
+						      session,
+						      unsigned int
+						      *list_size);
+  const gnutls_datum_t *gnutls_certificate_get_ours (gnutls_session_t
+						     session);
 
-  time_t gnutls_certificate_activation_time_peers(gnutls_session_t session);
-  time_t gnutls_certificate_expiration_time_peers(gnutls_session_t session);
+  time_t gnutls_certificate_activation_time_peers (gnutls_session_t session);
+  time_t gnutls_certificate_expiration_time_peers (gnutls_session_t session);
 
-  int gnutls_certificate_client_get_request_status(gnutls_session_t session);
-  int gnutls_certificate_verify_peers2(gnutls_session_t session,
-				       unsigned int *status);
+  int gnutls_certificate_client_get_request_status (gnutls_session_t session);
+  int gnutls_certificate_verify_peers2 (gnutls_session_t session,
+					unsigned int *status);
 
   /* this is obsolete (?). */
-  int gnutls_certificate_verify_peers(gnutls_session_t session);
+  int gnutls_certificate_verify_peers (gnutls_session_t session);
 
-  int gnutls_pem_base64_encode(const char *msg, const gnutls_datum_t * data,
-			       char *result, size_t * result_size);
-  int gnutls_pem_base64_decode(const char *header,
-			       const gnutls_datum_t * b64_data,
-			       unsigned char *result, size_t * result_size);
+  int gnutls_pem_base64_encode (const char *msg, const gnutls_datum_t * data,
+				char *result, size_t * result_size);
+  int gnutls_pem_base64_decode (const char *header,
+				const gnutls_datum_t * b64_data,
+				unsigned char *result, size_t * result_size);
 
-  int gnutls_pem_base64_encode_alloc(const char *msg,
-				     const gnutls_datum_t * data,
-				     gnutls_datum_t * result);
-  int gnutls_pem_base64_decode_alloc(const char *header,
-				     const gnutls_datum_t * b64_data,
-				     gnutls_datum_t * result);
+  int gnutls_pem_base64_encode_alloc (const char *msg,
+				      const gnutls_datum_t * data,
+				      gnutls_datum_t * result);
+  int gnutls_pem_base64_decode_alloc (const char *header,
+				      const gnutls_datum_t * b64_data,
+				      gnutls_datum_t * result);
 
   /* key_usage will be an OR of the following values:
    */
@@ -805,25 +949,28 @@ void gnutls_psk_set_server_dh_params( gnutls_psk_server_credentials_t res, gnutl
 #define GNUTLS_KEY_ENCIPHER_ONLY                1
 #define GNUTLS_KEY_DECIPHER_ONLY                32768
 
-typedef struct gnutls_params_st {
+  typedef struct gnutls_params_st
+  {
     gnutls_params_type_t type;
-    union params {
+    union params
+    {
       gnutls_dh_params_t dh;
       gnutls_rsa_params_t rsa_export;
     } params;
     int deinit;
-} gnutls_params_st;
+  } gnutls_params_st;
 
-typedef int gnutls_params_function(gnutls_session_t, gnutls_params_type_t,
-				     gnutls_params_st *);
+  typedef int gnutls_params_function (gnutls_session_t, gnutls_params_type_t,
+				      gnutls_params_st *);
 
-void
-  gnutls_certificate_set_params_function(gnutls_certificate_credentials_t res,
-					 gnutls_params_function * func);
-void gnutls_anon_set_params_function(gnutls_anon_server_credentials_t res,
-				       gnutls_params_function * func);
+  void
+    gnutls_certificate_set_params_function (gnutls_certificate_credentials_t
+					    res,
+					    gnutls_params_function * func);
+  void gnutls_anon_set_params_function (gnutls_anon_server_credentials_t res,
+					gnutls_params_function * func);
 
-void gnutls_psk_set_params_function(gnutls_psk_server_credentials_t res,
+  void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res,
 				       gnutls_params_function * func);
 
 
@@ -967,4 +1114,4 @@ void gnutls_psk_set_params_function(gnutls_psk_server_credentials_t res,
 }
 #endif
 
-#endif /* GNUTLS_H */
+#endif				/* GNUTLS_H */
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 7f31de617e..1c7412b4bb 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -30,7 +30,8 @@
 # define GNUTLS_OPENPGP_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <gnutls/gnutls.h>
@@ -39,101 +40,113 @@ extern "C" {
 /* gnutls_openpgp_key_t should be defined in gnutls.h
  */
 
-typedef enum gnutls_openpgp_key_fmt { GNUTLS_OPENPGP_FMT_RAW,
-        GNUTLS_OPENPGP_FMT_BASE64 } gnutls_openpgp_key_fmt;
+  typedef enum gnutls_openpgp_key_fmt
+  { GNUTLS_OPENPGP_FMT_RAW,
+    GNUTLS_OPENPGP_FMT_BASE64
+  } gnutls_openpgp_key_fmt;
 
-int gnutls_openpgp_key_init( gnutls_openpgp_key* key); /* initializes the memory for gnutls_openpgp_key_t struct */
-void gnutls_openpgp_key_deinit(gnutls_openpgp_key_t key); /* frees all memory */
+  int gnutls_openpgp_key_init (gnutls_openpgp_key * key);	/* initializes the memory for gnutls_openpgp_key_t struct */
+  void gnutls_openpgp_key_deinit (gnutls_openpgp_key_t key);	/* frees all memory */
 
-int gnutls_openpgp_key_import(gnutls_openpgp_key_t key,
-    const gnutls_datum_t* data, gnutls_openpgp_key_fmt format);
-int gnutls_openpgp_key_export (gnutls_openpgp_key_t key,
-			       gnutls_openpgp_key_fmt_t format,
-			       void *output_data, size_t * output_data_size);
+  int gnutls_openpgp_key_import (gnutls_openpgp_key_t key,
+				 const gnutls_datum_t * data,
+				 gnutls_openpgp_key_fmt format);
+  int gnutls_openpgp_key_export (gnutls_openpgp_key_t key,
+				 gnutls_openpgp_key_fmt_t format,
+				 void *output_data,
+				 size_t * output_data_size);
 
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
-int gnutls_openpgp_key_get_key_usage( gnutls_openpgp_key_t cert, unsigned int* key_usage);
-int gnutls_openpgp_key_get_fingerprint(gnutls_openpgp_key_t key,
-				       void *fpr, size_t * fprlen);
-    
-int gnutls_openpgp_key_get_name( gnutls_openpgp_key_t key,
-    int idx, char *buf, size_t *sizeof_buf);
+  int gnutls_openpgp_key_get_key_usage (gnutls_openpgp_key_t cert,
+					unsigned int *key_usage);
+  int gnutls_openpgp_key_get_fingerprint (gnutls_openpgp_key_t key, void *fpr,
+					  size_t * fprlen);
 
-int gnutls_openpgp_key_get_pk_algorithm(gnutls_openpgp_key_t key,
-                                            unsigned int *bits);
+  int gnutls_openpgp_key_get_name (gnutls_openpgp_key_t key,
+				   int idx, char *buf, size_t * sizeof_buf);
 
-int gnutls_openpgp_key_get_version( gnutls_openpgp_key_t key );
+  int gnutls_openpgp_key_get_pk_algorithm (gnutls_openpgp_key_t key,
+					   unsigned int *bits);
 
-time_t gnutls_openpgp_key_get_creation_time( gnutls_openpgp_key_t key );
-time_t gnutls_openpgp_key_get_expiration_time( gnutls_openpgp_key_t key );
+  int gnutls_openpgp_key_get_version (gnutls_openpgp_key_t key);
 
-int gnutls_openpgp_key_get_id( gnutls_openpgp_key_t key, unsigned char keyid[8]);
+  time_t gnutls_openpgp_key_get_creation_time (gnutls_openpgp_key_t key);
+  time_t gnutls_openpgp_key_get_expiration_time (gnutls_openpgp_key_t key);
 
-int gnutls_openpgp_key_check_hostname( gnutls_openpgp_key_t key, const char *hostname);
+  int gnutls_openpgp_key_get_id (gnutls_openpgp_key_t key,
+				 unsigned char keyid[8]);
 
-int gnutls_openpgp_key_to_xml( gnutls_openpgp_key_t key, gnutls_datum_t *xmlkey,
-    int ext);
+  int gnutls_openpgp_key_check_hostname (gnutls_openpgp_key_t key,
+					 const char *hostname);
+
+  int gnutls_openpgp_key_to_xml (gnutls_openpgp_key_t key,
+				 gnutls_datum_t * xmlkey, int ext);
 
 /* privkey stuff.
  */
-int gnutls_openpgp_privkey_init(gnutls_openpgp_privkey_t * key);
-void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey_t key);
-int gnutls_openpgp_privkey_get_pk_algorithm( gnutls_openpgp_privkey_t key, unsigned int *bits);
-int gnutls_openpgp_privkey_import(gnutls_openpgp_privkey_t key, 
-    const gnutls_datum_t * data, gnutls_openpgp_key_fmt format,
-    const char* pass, unsigned int flags);
+  int gnutls_openpgp_privkey_init (gnutls_openpgp_privkey_t * key);
+  void gnutls_openpgp_privkey_deinit (gnutls_openpgp_privkey_t key);
+  int gnutls_openpgp_privkey_get_pk_algorithm (gnutls_openpgp_privkey_t key,
+					       unsigned int *bits);
+  int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key,
+				     const gnutls_datum_t * data,
+				     gnutls_openpgp_key_fmt format,
+				     const char *pass, unsigned int flags);
 
 /* Keyring stuff.
  */
-struct gnutls_openpgp_keyring_int; /* object to hold (parsed) openpgp keyrings */
-typedef struct gnutls_openpgp_keyring_int* gnutls_openpgp_keyring;
+  struct gnutls_openpgp_keyring_int;	/* object to hold (parsed) openpgp keyrings */
+  typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring;
 
-int gnutls_openpgp_keyring_init( gnutls_openpgp_keyring* keyring);
-void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t keyring);
+  int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring * 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_key_fmt format);
+  int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
+				     const gnutls_datum_t * data,
+				     gnutls_openpgp_key_fmt format);
 
-int gnutls_openpgp_keyring_check_id( gnutls_openpgp_keyring_t ring,
-    const unsigned char keyid[8], unsigned int flags);
+  int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
+				       const unsigned char keyid[8],
+				       unsigned int flags);
 
 /* Trustdb functions.
  */
-struct gnutls_openpgp_trustdb_int; /* object to hold (parsed) openpgp trustdbs */
-typedef struct gnutls_openpgp_trustdb_int* gnutls_openpgp_trustdb;
+  struct gnutls_openpgp_trustdb_int;	/* object to hold (parsed) openpgp trustdbs */
+  typedef struct gnutls_openpgp_trustdb_int *gnutls_openpgp_trustdb;
 
-int gnutls_openpgp_trustdb_init( gnutls_openpgp_trustdb* trustdb);
-void gnutls_openpgp_trustdb_deinit(gnutls_openpgp_trustdb_t trustdb);
+  int gnutls_openpgp_trustdb_init (gnutls_openpgp_trustdb * trustdb);
+  void gnutls_openpgp_trustdb_deinit (gnutls_openpgp_trustdb_t trustdb);
 
-int gnutls_openpgp_trustdb_import(gnutls_openpgp_trustdb_t trustdb,
-				  const char* file);
+  int gnutls_openpgp_trustdb_import (gnutls_openpgp_trustdb_t trustdb,
+				     const char *file);
 
 
-int gnutls_openpgp_key_verify_ring(
-    gnutls_openpgp_key_t key,
-    gnutls_openpgp_keyring_t keyring,
-    unsigned int flags,
-    unsigned int * verify /* the output of the verification */);
+  int gnutls_openpgp_key_verify_ring (gnutls_openpgp_key_t key,
+				      gnutls_openpgp_keyring_t keyring,
+				      unsigned int flags, unsigned int *verify
+				      /* the output of the verification */ );
 
-int gnutls_openpgp_key_verify_self( gnutls_openpgp_key_t key,
-				    unsigned int flags, unsigned int *verify);
+  int gnutls_openpgp_key_verify_self (gnutls_openpgp_key_t key,
+				      unsigned int flags,
+				      unsigned int *verify);
 
-int gnutls_openpgp_key_verify_trustdb(
-    gnutls_openpgp_key_t key,
-    gnutls_openpgp_trustdb_t trustdb,
-    unsigned int flags,
-    unsigned int * verify /* the output of the verification */);
+  int gnutls_openpgp_key_verify_trustdb (gnutls_openpgp_key_t key,
+					 gnutls_openpgp_trustdb_t trustdb,
+					 unsigned int flags,
+					 unsigned int *verify
+					 /* the output of the verification */
+    );
 
 
 /* certificate authentication stuff.
  */
-int gnutls_certificate_set_openpgp_key(gnutls_certificate_credentials_t res,
-    gnutls_openpgp_key_t key, gnutls_openpgp_privkey_t pkey);
+  int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t
+					  res, gnutls_openpgp_key_t key,
+					  gnutls_openpgp_privkey_t pkey);
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* GNUTLS_OPENPGP_H */
-
+#endif				/* GNUTLS_OPENPGP_H */
diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index fb0dd82568..bf85e6e490 100644
--- a/includes/gnutls/openssl.h
+++ b/includes/gnutls/openssl.h
@@ -35,7 +35,8 @@
 #define GNUTLS_OPENSSL_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <gnutls/gnutls.h>
@@ -50,15 +51,16 @@ extern "C" {
 #define GNUTLS_X509_S_SIZE 256
 #define GNUTLS_X509_EMAIL_SIZE 256
 
-typedef struct {
-	char common_name[GNUTLS_X509_CN_SIZE];
-	char country[GNUTLS_X509_C_SIZE];
-	char organization[GNUTLS_X509_O_SIZE];
-	char organizational_unit_name[GNUTLS_X509_OU_SIZE];
-	char locality_name[GNUTLS_X509_L_SIZE];
-	char state_or_province_name[GNUTLS_X509_S_SIZE];
-	char email[GNUTLS_X509_EMAIL_SIZE];
-} gnutls_x509_dn;
+  typedef struct
+  {
+    char common_name[GNUTLS_X509_CN_SIZE];
+    char country[GNUTLS_X509_C_SIZE];
+    char organization[GNUTLS_X509_O_SIZE];
+    char organizational_unit_name[GNUTLS_X509_OU_SIZE];
+    char locality_name[GNUTLS_X509_L_SIZE];
+    char state_or_province_name[GNUTLS_X509_S_SIZE];
+    char email[GNUTLS_X509_EMAIL_SIZE];
+  } gnutls_x509_dn;
 
 
 #define OPENSSL_VERSION_NUMBER (0x0090604F)
@@ -89,48 +91,48 @@ typedef struct {
 #define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER (0x2)
 #define SSL_MODE_AUTO_RETRY (0x4)
 
-typedef gnutls_x509_dn X509_NAME;
-typedef gnutls_datum_t X509;
+  typedef gnutls_x509_dn X509_NAME;
+  typedef gnutls_datum_t X509;
 
-typedef struct _SSL SSL;
+  typedef struct _SSL SSL;
 
-typedef struct
-{
+  typedef struct
+  {
     int protocol_priority[GNUTLS_MAX_ALGORITHM_NUM];
     int cipher_priority[GNUTLS_MAX_ALGORITHM_NUM];
     int comp_priority[GNUTLS_MAX_ALGORITHM_NUM];
     int kx_priority[GNUTLS_MAX_ALGORITHM_NUM];
     int mac_priority[GNUTLS_MAX_ALGORITHM_NUM];
     gnutls_connection_end_t connend;
-} SSL_METHOD;
+  } SSL_METHOD;
 
-typedef struct
-{
+  typedef struct
+  {
     gnutls_protocol_t version;
     gnutls_cipher_algorithm_t cipher;
     gnutls_kx_algorithm_t kx;
     gnutls_mac_algorithm_t mac;
     gnutls_compression_method_t compression;
     gnutls_certificate_type_t cert;
-} SSL_CIPHER;
+  } SSL_CIPHER;
 
-typedef struct _BIO
-{
+  typedef struct _BIO
+  {
     gnutls_transport_ptr_t fd;
-} BIO;
+  } BIO;
 
-typedef struct
-{
+  typedef struct
+  {
     SSL *ssl;
     int error;
     const gnutls_datum_t *cert_list;
 #define current_cert cert_list
-} X509_STORE_CTX;
+  } X509_STORE_CTX;
 
 #define X509_STORE_CTX_get_current_cert(ctx) ((ctx)->current_cert)
 
-typedef struct _SSL_CTX
-{
+  typedef struct _SSL_CTX
+  {
     SSL_METHOD *method;
     char *certfile;
     int certfile_type;
@@ -138,13 +140,13 @@ typedef struct _SSL_CTX
     int keyfile_type;
     unsigned long options;
 
-    int (*verify_callback)(int, X509_STORE_CTX *);
+    int (*verify_callback) (int, X509_STORE_CTX *);
     int verify_mode;
 
-} SSL_CTX;
+  } SSL_CTX;
 
-struct _SSL
-{
+  struct _SSL
+  {
     gnutls_session_t gnutls_state;
 
     gnutls_certificate_client_credentials gnutls_cred;
@@ -157,22 +159,22 @@ struct _SSL
     int state;
     unsigned long options;
 
-    int (*verify_callback)(int, X509_STORE_CTX *);
+    int (*verify_callback) (int, X509_STORE_CTX *);
     int verify_mode;
-    
+
     gnutls_transport_ptr_t rfd;
     gnutls_transport_ptr_t wfd;
-};
+  };
 
 #define rbio gnutls_state
 
-typedef struct
-{
+  typedef struct
+  {
     void *handle;
-} MD_CTX;
+  } MD_CTX;
 
-struct RSA;
-typedef struct RSA RSA;
+  struct RSA;
+  typedef struct RSA RSA;
 
 #define MD5_CTX MD_CTX
 #define RIPEMD160_CTX MD_CTX
@@ -189,63 +191,65 @@ typedef struct RSA RSA;
 
 /* Library initialisation functions */
 
-int SSL_library_init(void);
-void OpenSSL_add_all_algorithms(void);
+  int SSL_library_init (void);
+  void OpenSSL_add_all_algorithms (void);
 
 
 /* SSL_CTX structure handling */
 
-SSL_CTX *SSL_CTX_new(SSL_METHOD *method);
-void SSL_CTX_free(SSL_CTX *ctx);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *certfile, int type);
-int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *keyfile, int type);
-void SSL_CTX_set_verify(SSL_CTX *ctx, int verify_mode,
-                        int (*verify_callback)(int, X509_STORE_CTX *));
-unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long options);
-long SSL_CTX_set_mode(SSL_CTX *ctx, long mode);
-int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *list);
+  SSL_CTX *SSL_CTX_new (SSL_METHOD * method);
+  void SSL_CTX_free (SSL_CTX * ctx);
+  int SSL_CTX_set_default_verify_paths (SSL_CTX * ctx);
+  int SSL_CTX_use_certificate_file (SSL_CTX * ctx, const char *certfile,
+				    int type);
+  int SSL_CTX_use_PrivateKey_file (SSL_CTX * ctx, const char *keyfile,
+				   int type);
+  void SSL_CTX_set_verify (SSL_CTX * ctx, int verify_mode,
+			   int (*verify_callback) (int, X509_STORE_CTX *));
+  unsigned long SSL_CTX_set_options (SSL_CTX * ctx, unsigned long options);
+  long SSL_CTX_set_mode (SSL_CTX * ctx, long mode);
+  int SSL_CTX_set_cipher_list (SSL_CTX * ctx, const char *list);
 
 
 /* SSL_CTX statistics */
 
-long SSL_CTX_sess_number(SSL_CTX *ctx);
-long SSL_CTX_sess_connect(SSL_CTX *ctx);
-long SSL_CTX_sess_connect_good(SSL_CTX *ctx);
-long SSL_CTX_sess_connect_renegotiate(SSL_CTX *ctx);
-long SSL_CTX_sess_accept(SSL_CTX *ctx);
-long SSL_CTX_sess_accept_good(SSL_CTX *ctx);
-long SSL_CTX_sess_accept_renegotiate(SSL_CTX *ctx);
-long SSL_CTX_sess_hits(SSL_CTX *ctx);
-long SSL_CTX_sess_misses(SSL_CTX *ctx);
-long SSL_CTX_sess_timeouts(SSL_CTX *ctx);
+  long SSL_CTX_sess_number (SSL_CTX * ctx);
+  long SSL_CTX_sess_connect (SSL_CTX * ctx);
+  long SSL_CTX_sess_connect_good (SSL_CTX * ctx);
+  long SSL_CTX_sess_connect_renegotiate (SSL_CTX * ctx);
+  long SSL_CTX_sess_accept (SSL_CTX * ctx);
+  long SSL_CTX_sess_accept_good (SSL_CTX * ctx);
+  long SSL_CTX_sess_accept_renegotiate (SSL_CTX * ctx);
+  long SSL_CTX_sess_hits (SSL_CTX * ctx);
+  long SSL_CTX_sess_misses (SSL_CTX * ctx);
+  long SSL_CTX_sess_timeouts (SSL_CTX * ctx);
 
 
 /* SSL structure handling */
 
-SSL *SSL_new(SSL_CTX *ctx);
-void SSL_free(SSL *ssl);
-void SSL_load_error_strings(void);
-int SSL_get_error(SSL *ssl, int ret);
-int SSL_set_fd(SSL *ssl, int fd);
-int SSL_set_rfd(SSL *ssl, int fd);
-int SSL_set_wfd(SSL *ssl, int fd);
-void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio);
-void SSL_set_connect_state(SSL *ssl);
-int SSL_pending(SSL *ssl);
-void SSL_set_verify(SSL *ssl, int verify_mode,
-                    int (*verify_callback)(int, X509_STORE_CTX *));
-const X509 *SSL_get_peer_certificate(SSL *ssl);
+  SSL *SSL_new (SSL_CTX * ctx);
+  void SSL_free (SSL * ssl);
+  void SSL_load_error_strings (void);
+  int SSL_get_error (SSL * ssl, int ret);
+  int SSL_set_fd (SSL * ssl, int fd);
+  int SSL_set_rfd (SSL * ssl, int fd);
+  int SSL_set_wfd (SSL * ssl, int fd);
+  void SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio);
+  void SSL_set_connect_state (SSL * ssl);
+  int SSL_pending (SSL * ssl);
+  void SSL_set_verify (SSL * ssl, int verify_mode,
+		       int (*verify_callback) (int, X509_STORE_CTX *));
+  const X509 *SSL_get_peer_certificate (SSL * ssl);
 
 /* SSL connection open/close/read/write functions */
 
-int SSL_connect(SSL *ssl);
-int SSL_accept(SSL *ssl);
-int SSL_shutdown(SSL *ssl);
-int SSL_read(SSL *ssl, void *buf, int len);
-int SSL_write(SSL *ssl, const void *buf, int len);
+  int SSL_connect (SSL * ssl);
+  int SSL_accept (SSL * ssl);
+  int SSL_shutdown (SSL * ssl);
+  int SSL_read (SSL * ssl, void *buf, int len);
+  int SSL_write (SSL * ssl, const void *buf, int len);
 
-int SSL_want(SSL *ssl);
+  int SSL_want (SSL * ssl);
 
 #define SSL_NOTHING (1)
 #define SSL_WRITING (2)
@@ -260,69 +264,69 @@ int SSL_want(SSL *ssl);
 
 /* SSL_METHOD functions */
 
-SSL_METHOD *SSLv23_client_method(void);
-SSL_METHOD *SSLv23_server_method(void);
-SSL_METHOD *SSLv3_client_method(void);
-SSL_METHOD *SSLv3_server_method(void);
-SSL_METHOD *TLSv1_client_method(void);
-SSL_METHOD *TLSv1_server_method(void);
+  SSL_METHOD *SSLv23_client_method (void);
+  SSL_METHOD *SSLv23_server_method (void);
+  SSL_METHOD *SSLv3_client_method (void);
+  SSL_METHOD *SSLv3_server_method (void);
+  SSL_METHOD *TLSv1_client_method (void);
+  SSL_METHOD *TLSv1_server_method (void);
 
 
 /* SSL_CIPHER functions */
 
-SSL_CIPHER *SSL_get_current_cipher(SSL *ssl);
-const char *SSL_CIPHER_get_name(SSL_CIPHER *cipher);
-int SSL_CIPHER_get_bits(SSL_CIPHER *cipher, int *bits);
-const char *SSL_CIPHER_get_version(SSL_CIPHER *cipher);
-char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int size);
+  SSL_CIPHER *SSL_get_current_cipher (SSL * ssl);
+  const char *SSL_CIPHER_get_name (SSL_CIPHER * cipher);
+  int SSL_CIPHER_get_bits (SSL_CIPHER * cipher, int *bits);
+  const char *SSL_CIPHER_get_version (SSL_CIPHER * cipher);
+  char *SSL_CIPHER_description (SSL_CIPHER * cipher, char *buf, int size);
 
 
 /* X509 functions */
 
-X509_NAME *X509_get_subject_name(const X509 *cert);
-X509_NAME *X509_get_issuer_name(const X509 *cert);
-char *X509_NAME_oneline(gnutls_x509_dn *name, char *buf, int len);
-void X509_free(const X509 *cert);
+  X509_NAME *X509_get_subject_name (const X509 * cert);
+  X509_NAME *X509_get_issuer_name (const X509 * cert);
+  char *X509_NAME_oneline (gnutls_x509_dn * name, char *buf, int len);
+  void X509_free (const X509 * cert);
 
 
 /* BIO functions */
 
-void BIO_get_fd(gnutls_session_t gnutls_state, int *fd);
-BIO *BIO_new_socket(int sock, int close_flag);
+  void BIO_get_fd (gnutls_session_t gnutls_state, int *fd);
+  BIO *BIO_new_socket (int sock, int close_flag);
 
 /* error handling */
 
-unsigned long ERR_get_error(void);
-const char *ERR_error_string(unsigned long e, char *buf);
+  unsigned long ERR_get_error (void);
+  const char *ERR_error_string (unsigned long e, char *buf);
 
 
 /* RAND functions */
 
-int RAND_status(void);
-void RAND_seed(const void *buf, int num);
-int RAND_bytes(unsigned char *buf, int num);
-const char *RAND_file_name(char *buf, size_t len);
-int RAND_load_file(const char *name, long maxbytes);
-int RAND_write_file(const char *name);
+  int RAND_status (void);
+  void RAND_seed (const void *buf, int num);
+  int RAND_bytes (unsigned char *buf, int num);
+  const char *RAND_file_name (char *buf, size_t len);
+  int RAND_load_file (const char *name, long maxbytes);
+  int RAND_write_file (const char *name);
 
-int RAND_egd_bytes(const char *path, int bytes);
+  int RAND_egd_bytes (const char *path, int bytes);
 #define RAND_egd(p) RAND_egd_bytes((p), 255)
 
 /* message digest functions */
 
 #define MD5_DIGEST_LENGTH 16
 
-void MD5_Init(MD5_CTX *ctx);
-void MD5_Update(MD5_CTX *ctx, const void *buf, int len);
-void MD5_Final(unsigned char *md, MD5_CTX *ctx);
-unsigned char *MD5(const unsigned char *buf, unsigned long len,
-                   unsigned char *md);
-
-void RIPEMD160_Init(RIPEMD160_CTX *ctx);
-void RIPEMD160_Update(RIPEMD160_CTX *ctx, const void *buf, int len);
-void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *ctx);
-unsigned char *RIPEMD160(const unsigned char *buf, unsigned long len,
-                         unsigned char *md);
+  void MD5_Init (MD5_CTX * ctx);
+  void MD5_Update (MD5_CTX * ctx, const void *buf, int len);
+  void MD5_Final (unsigned char *md, MD5_CTX * ctx);
+  unsigned char *MD5 (const unsigned char *buf, unsigned long len,
+		      unsigned char *md);
+
+  void RIPEMD160_Init (RIPEMD160_CTX * ctx);
+  void RIPEMD160_Update (RIPEMD160_CTX * ctx, const void *buf, int len);
+  void RIPEMD160_Final (unsigned char *md, RIPEMD160_CTX * ctx);
+  unsigned char *RIPEMD160 (const unsigned char *buf, unsigned long len,
+			    unsigned char *md);
 
 #ifdef __cplusplus
 }
diff --git a/includes/gnutls/pkcs12.h b/includes/gnutls/pkcs12.h
index dd0dbb39a9..c46da6f3bc 100644
--- a/includes/gnutls/pkcs12.h
+++ b/includes/gnutls/pkcs12.h
@@ -26,69 +26,79 @@
 # define GNUTLS_PKCS12_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <gnutls/x509.h>
 
 /* PKCS12 structures handling 
  */
-struct gnutls_pkcs12_int;
-typedef struct gnutls_pkcs12_int* gnutls_pkcs12_t;
-
-struct gnutls_pkcs12_bag_int;
-typedef struct gnutls_pkcs12_bag_int* gnutls_pkcs12_bag_t;
-
-int gnutls_pkcs12_init(gnutls_pkcs12_t * pkcs12);
-void gnutls_pkcs12_deinit(gnutls_pkcs12_t pkcs12);
-int gnutls_pkcs12_import(gnutls_pkcs12_t pkcs12, const gnutls_datum_t * data,
-    gnutls_x509_crt_fmt format, unsigned int flags);
-int gnutls_pkcs12_export( gnutls_pkcs12_t pkcs12,
-    gnutls_x509_crt_fmt format, void* output_data, size_t* output_data_size);
-
-int gnutls_pkcs12_get_bag(gnutls_pkcs12_t pkcs12, 
-    int indx, gnutls_pkcs12_bag_t bag);
-int gnutls_pkcs12_set_bag(gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag);
-
-int gnutls_pkcs12_generate_mac(gnutls_pkcs12_t pkcs12, const char* pass);
-int gnutls_pkcs12_verify_mac(gnutls_pkcs12_t pkcs12, const char* pass);
-
-int gnutls_pkcs12_bag_decrypt(gnutls_pkcs12_bag_t bag, const char* pass);
-int gnutls_pkcs12_bag_encrypt(gnutls_pkcs12_bag_t bag, const char* pass, unsigned int flags);
-
-typedef enum gnutls_pkcs12_bag_type_t {
+  struct gnutls_pkcs12_int;
+  typedef struct gnutls_pkcs12_int *gnutls_pkcs12_t;
+
+  struct gnutls_pkcs12_bag_int;
+  typedef struct gnutls_pkcs12_bag_int *gnutls_pkcs12_bag_t;
+
+  int gnutls_pkcs12_init (gnutls_pkcs12_t * pkcs12);
+  void gnutls_pkcs12_deinit (gnutls_pkcs12_t pkcs12);
+  int gnutls_pkcs12_import (gnutls_pkcs12_t pkcs12,
+			    const gnutls_datum_t * data,
+			    gnutls_x509_crt_fmt format, unsigned int flags);
+  int gnutls_pkcs12_export (gnutls_pkcs12_t pkcs12,
+			    gnutls_x509_crt_fmt format, void *output_data,
+			    size_t * output_data_size);
+
+  int gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12,
+			     int indx, gnutls_pkcs12_bag_t bag);
+  int gnutls_pkcs12_set_bag (gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag);
+
+  int gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass);
+  int gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass);
+
+  int gnutls_pkcs12_bag_decrypt (gnutls_pkcs12_bag_t bag, const char *pass);
+  int gnutls_pkcs12_bag_encrypt (gnutls_pkcs12_bag_t bag, const char *pass,
+				 unsigned int flags);
+
+  typedef enum gnutls_pkcs12_bag_type_t
+  {
     GNUTLS_BAG_EMPTY = 0,
 
-    GNUTLS_BAG_PKCS8_ENCRYPTED_KEY=1,
+    GNUTLS_BAG_PKCS8_ENCRYPTED_KEY = 1,
     GNUTLS_BAG_PKCS8_KEY,
     GNUTLS_BAG_CERTIFICATE,
     GNUTLS_BAG_CRL,
-    GNUTLS_BAG_ENCRYPTED=10,
-    GNUTLS_BAG_UNKNOWN=20
-} gnutls_pkcs12_bag_type_t;
-
-gnutls_pkcs12_bag_type_t gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, int indx);
-int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag_t bag, int indx, gnutls_datum_t* data);
-int gnutls_pkcs12_bag_set_data(gnutls_pkcs12_bag_t bag, gnutls_pkcs12_bag_type_t type,
-        const gnutls_datum_t* data);
-int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag_t bag, gnutls_x509_crl_t crl);
-int gnutls_pkcs12_bag_set_crt(gnutls_pkcs12_bag_t bag, gnutls_x509_crt_t crt);
-
-int gnutls_pkcs12_bag_init(gnutls_pkcs12_bag_t * bag);
-void gnutls_pkcs12_bag_deinit(gnutls_pkcs12_bag_t bag);
-int gnutls_pkcs12_bag_get_count(gnutls_pkcs12_bag_t bag);
-
-int gnutls_pkcs12_bag_get_key_id(gnutls_pkcs12_bag_t  bag, int indx, 
-    gnutls_datum_t* id);
-int gnutls_pkcs12_bag_set_key_id(gnutls_pkcs12_bag_t  bag, int indx, 
-    const gnutls_datum_t* id);
-
-int gnutls_pkcs12_bag_get_friendly_name(gnutls_pkcs12_bag_t  bag, int indx, 
-    char **name);
-int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t  bag, int indx, 
-    const char* name);
+    GNUTLS_BAG_ENCRYPTED = 10,
+    GNUTLS_BAG_UNKNOWN = 20
+  } gnutls_pkcs12_bag_type_t;
+
+  gnutls_pkcs12_bag_type_t gnutls_pkcs12_bag_get_type (gnutls_pkcs12_bag_t
+						       bag, int indx);
+  int gnutls_pkcs12_bag_get_data (gnutls_pkcs12_bag_t bag, int indx,
+				  gnutls_datum_t * data);
+  int gnutls_pkcs12_bag_set_data (gnutls_pkcs12_bag_t bag,
+				  gnutls_pkcs12_bag_type_t type,
+				  const gnutls_datum_t * data);
+  int gnutls_pkcs12_bag_set_crl (gnutls_pkcs12_bag_t bag,
+				 gnutls_x509_crl_t crl);
+  int gnutls_pkcs12_bag_set_crt (gnutls_pkcs12_bag_t bag,
+				 gnutls_x509_crt_t crt);
+
+  int gnutls_pkcs12_bag_init (gnutls_pkcs12_bag_t * bag);
+  void gnutls_pkcs12_bag_deinit (gnutls_pkcs12_bag_t bag);
+  int gnutls_pkcs12_bag_get_count (gnutls_pkcs12_bag_t bag);
+
+  int gnutls_pkcs12_bag_get_key_id (gnutls_pkcs12_bag_t bag, int indx,
+				    gnutls_datum_t * id);
+  int gnutls_pkcs12_bag_set_key_id (gnutls_pkcs12_bag_t bag, int indx,
+				    const gnutls_datum_t * id);
+
+  int gnutls_pkcs12_bag_get_friendly_name (gnutls_pkcs12_bag_t bag, int indx,
+					   char **name);
+  int gnutls_pkcs12_bag_set_friendly_name (gnutls_pkcs12_bag_t bag, int indx,
+					   const char *name);
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* GNUTLS_PKCS12_H */
+#endif				/* GNUTLS_PKCS12_H */
diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 8e6b9dc409..46b3f7dfcd 100644
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -395,13 +395,13 @@ extern "C"
   int gnutls_x509_crt_check_issuer (gnutls_x509_crt_t cert,
 				    gnutls_x509_crt_t issuer);
 
-  int gnutls_x509_crt_list_verify(const gnutls_x509_crt_t * cert_list,
-				  int cert_list_length,
-				  const gnutls_x509_crt_t * CA_list,
-				  int CA_list_length,
-				  const gnutls_x509_crl_t * CRL_list,
-				  int CRL_list_length,
-				  unsigned int flags, unsigned int *verify);
+  int gnutls_x509_crt_list_verify (const gnutls_x509_crt_t * cert_list,
+				   int cert_list_length,
+				   const gnutls_x509_crt_t * CA_list,
+				   int CA_list_length,
+				   const gnutls_x509_crl_t * CRL_list,
+				   int CRL_list_length,
+				   unsigned int flags, unsigned int *verify);
 
   int gnutls_x509_crt_verify (gnutls_x509_crt_t cert,
 			      const gnutls_x509_crt_t * CA_list,