Cosmetic changes.

1 files changed, 79 insertions, 45 deletions

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index fa9b043572..14462b1eb3 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -49,24 +49,25 @@ 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
+
+  typedef enum gnutls_cipher_algorithm
   {
     GNUTLS_CIPHER_NULL = 1,
     GNUTLS_CIPHER_ARCFOUR_128,
@@ -162,34 +163,48 @@ extern "C"
   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_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_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_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_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_REQUEST, GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
-    GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY, GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE,
+    GNUTLS_HANDSHAKE_CLIENT_HELLO,
+    GNUTLS_HANDSHAKE_SERVER_HELLO,
+    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;
 
@@ -214,7 +229,10 @@ extern "C"
   } gnutls_certificate_status_t;
 
   typedef enum
-  { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST = 1, GNUTLS_CERT_REQUIRE
+  {
+    GNUTLS_CERT_IGNORE,
+    GNUTLS_CERT_REQUEST = 1,
+    GNUTLS_CERT_REQUIRE
   } gnutls_certificate_request_t;
 
   typedef enum
@@ -223,7 +241,10 @@ extern "C"
   } gnutls_openpgp_key_status_t;
 
   typedef enum
-  { GNUTLS_SHUT_RDWR = 0, GNUTLS_SHUT_WR = 1 } gnutls_close_request_t;
+  {
+    GNUTLS_SHUT_RDWR = 0,
+    GNUTLS_SHUT_WR = 1
+  } gnutls_close_request_t;
 
 #define GNUTLS_TLS1 GNUTLS_TLS1_0
   typedef enum
@@ -235,16 +256,22 @@ extern "C"
   } gnutls_protocol_t;
 
   typedef enum
-  { GNUTLS_CRT_X509 = 1, GNUTLS_CRT_OPENPGP
+  {
+    GNUTLS_CRT_X509 = 1,
+    GNUTLS_CRT_OPENPGP
   } gnutls_certificate_type_t;
 
   typedef enum
-  { GNUTLS_X509_FMT_DER,
+  {
+    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_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);
@@ -252,15 +279,20 @@ extern "C"
 #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,
-    GNUTLS_SIGN_RSA_MD5, GNUTLS_SIGN_RSA_MD2, GNUTLS_SIGN_RSA_RMD160
+  {
+    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;
 
   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.
+/* If you want to change this, then also change the define in
+ * gnutls_int.h, and recompile.
  */
   typedef void *gnutls_transport_ptr_t;
 
@@ -294,7 +326,6 @@ extern "C"
   typedef int gnutls_params_function (gnutls_session_t, gnutls_params_type_t,
 				      gnutls_params_st *);
 
-
 /* internal functions */
 
   int gnutls_init (gnutls_session_t * session,
@@ -345,10 +376,10 @@ extern "C"
  */
   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);
+  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.
  */
@@ -380,7 +411,8 @@ extern "C"
 /* TLS Extensions */
 
   typedef enum
-  { GNUTLS_NAME_DNS = 1
+  {
+    GNUTLS_NAME_DNS = 1
   } gnutls_server_name_type_t;
 
   int gnutls_server_name_set (gnutls_session_t session,
@@ -504,17 +536,16 @@ extern "C"
   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_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_set_server_params_function (gnutls_anon_server_credentials_t res,
-					gnutls_params_function * func);
+  void
+    gnutls_anon_set_server_params_function (gnutls_anon_server_credentials_t
+					    res,
+					    gnutls_params_function * func);
 
   void gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t
 					    sc);
@@ -852,8 +883,9 @@ extern "C"
   void gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
 					gnutls_dh_params_t dh_params);
 
-  void gnutls_psk_set_server_params_function (gnutls_psk_server_credentials_t res,
-				       gnutls_params_function * func);
+  void gnutls_psk_set_server_params_function (gnutls_psk_server_credentials_t
+					      res,
+					      gnutls_params_function * func);
 
 
 #ifndef GNUTLS_UI_H
@@ -861,8 +893,10 @@ extern "C"
 
   typedef enum gnutls_x509_subject_alt_name_t
   {
-    GNUTLS_SAN_DNSNAME = 1, GNUTLS_SAN_RFC822NAME,
-    GNUTLS_SAN_URI, GNUTLS_SAN_IPADDRESS
+    GNUTLS_SAN_DNSNAME = 1,
+    GNUTLS_SAN_RFC822NAME,
+    GNUTLS_SAN_URI,
+    GNUTLS_SAN_IPADDRESS
   } gnutls_x509_subject_alt_name_t;
 
 # ifdef LIBGNUTLS_VERSION	/* These are defined only in gnutls.h */