Fix compiler warnings.

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 5d1b64ec68a1b98c6dfdb95b9558d7ce9e78dca3..5e8d6dfc1e7784515566e58d37cb04b4b3d8589e 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -168,15 +168,16 @@ typedef enum handshake_state_t
 #define MAX_CIPHERSUITES 256
 
 typedef enum extensions_t
-{ GNUTLS_EXTENSION_SERVER_NAME = 0,
-  GNUTLS_EXTENSION_MAX_RECORD_SIZE = 1,
-  GNUTLS_EXTENSION_CERT_TYPE = 9,
-  GNUTLS_EXTENSION_SRP = 12,
-  GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS = 13,
-  GNUTLS_EXTENSION_SESSION_TICKET = 35,
-  GNUTLS_EXTENSION_INNER_APPLICATION = 37703,
-  GNUTLS_EXTENSION_SAFE_RENEGOTIATION = 65281, /* aka: 0xff01 */
-} extensions_t;
+  {
+    GNUTLS_EXTENSION_SERVER_NAME = 0,
+    GNUTLS_EXTENSION_MAX_RECORD_SIZE = 1,
+    GNUTLS_EXTENSION_CERT_TYPE = 9,
+    GNUTLS_EXTENSION_SRP = 12,
+    GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS = 13,
+    GNUTLS_EXTENSION_SESSION_TICKET = 35,
+    GNUTLS_EXTENSION_INNER_APPLICATION = 37703,
+    GNUTLS_EXTENSION_SAFE_RENEGOTIATION = 65281        /* aka: 0xff01 */
+  } extensions_t;
 
 typedef enum
 { CIPHER_STREAM, CIPHER_BLOCK } cipher_type_t;
@@ -424,7 +425,7 @@ typedef enum {
   SR_DISABLED,
   SR_UNSAFE,
   SR_PARTIAL,
-  SR_SAFE,
+  SR_SAFE
 } safe_renegotiation_t;
 
 /* For the external api */

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 58053f5abd7a1ae57680f860d625db8ed6d9b01f..79bc595b3bd9b75ea3b8c7bef936358c862af212 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -585,21 +585,21 @@ extern "C"
    * Enumeration of different digital signature algorithms.
    */
   typedef enum
-  {
-    GNUTLS_SIGN_UNKNOWN = 0,
-    GNUTLS_SIGN_RSA_SHA1 = 1,
-    GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
-    GNUTLS_SIGN_DSA_SHA1 = 2,
-    GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
-    GNUTLS_SIGN_RSA_MD5 = 3,
-    GNUTLS_SIGN_RSA_MD2 = 4,
-    GNUTLS_SIGN_RSA_RMD160 = 5,
-    GNUTLS_SIGN_RSA_SHA256 = 6,
-    GNUTLS_SIGN_RSA_SHA384 = 7,
-    GNUTLS_SIGN_RSA_SHA512 = 8,
-    GNUTLS_SIGN_RSA_SHA224 = 9,
-    GNUTLS_SIGN_DSA_SHA224 = 10,
-    GNUTLS_SIGN_DSA_SHA256 = 11,
+    {
+      GNUTLS_SIGN_UNKNOWN = 0,
+      GNUTLS_SIGN_RSA_SHA1 = 1,
+      GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
+      GNUTLS_SIGN_DSA_SHA1 = 2,
+      GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
+      GNUTLS_SIGN_RSA_MD5 = 3,
+      GNUTLS_SIGN_RSA_MD2 = 4,
+      GNUTLS_SIGN_RSA_RMD160 = 5,
+      GNUTLS_SIGN_RSA_SHA256 = 6,
+      GNUTLS_SIGN_RSA_SHA384 = 7,
+      GNUTLS_SIGN_RSA_SHA512 = 8,
+      GNUTLS_SIGN_RSA_SHA224 = 9,
+      GNUTLS_SIGN_DSA_SHA224 = 10,
+      GNUTLS_SIGN_DSA_SHA256 = 11
   } gnutls_sign_algorithm_t;
 
   const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t sign);
@@ -616,14 +616,14 @@ extern "C"
    * Enumeration of security parameters for passive attacks
    */
   typedef enum
-  {
-    GNUTLS_SEC_PARAM_UNKNOWN,
-    GNUTLS_SEC_PARAM_WEAK,
-    GNUTLS_SEC_PARAM_LOW,
-    GNUTLS_SEC_PARAM_NORMAL,
-    GNUTLS_SEC_PARAM_HIGH,
-    GNUTLS_SEC_PARAM_ULTRA,
-  } gnutls_sec_param_t;
+    {
+      GNUTLS_SEC_PARAM_UNKNOWN,
+      GNUTLS_SEC_PARAM_WEAK,
+      GNUTLS_SEC_PARAM_LOW,
+      GNUTLS_SEC_PARAM_NORMAL,
+      GNUTLS_SEC_PARAM_HIGH,
+      GNUTLS_SEC_PARAM_ULTRA
+    } gnutls_sec_param_t;
 
 
 /* If you want to change this, then also change the define in
@@ -1463,9 +1463,9 @@ extern "C"
   typedef struct gnutls_pkcs11_privkey_st* gnutls_pkcs11_privkey_t;
 
   typedef enum {
-        GNUTLS_PRIVKEY_X509, /* gnutls_x509_privkey_t */
-       GNUTLS_PRIVKEY_OPENPGP, /* gnutls_openpgp_privkey_t */
-       GNUTLS_PRIVKEY_PKCS11, /* gnutls_pkcs11_privkey_t */
+    GNUTLS_PRIVKEY_X509, /* gnutls_x509_privkey_t */
+    GNUTLS_PRIVKEY_OPENPGP, /* gnutls_openpgp_privkey_t */
+    GNUTLS_PRIVKEY_PKCS11 /* gnutls_pkcs11_privkey_t */
   } gnutls_privkey_type_t;
 
   typedef struct gnutls_retr2_st

diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 470fe98a85a613d863a0b076b276911b3a2c0793..477c9ad22c1303f4120b24c5c471d3be53012805 100644 (file)
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -53,9 +53,9 @@ int gnutls_pkcs11_obj_init ( gnutls_pkcs11_obj_t *certificate);
 #define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2) /* object marked as sensitive (unexportable) */
 
 typedef enum {
-       GNUTLS_PKCS11_URL_GENERIC, /* URL specifies the object on token level */
-       GNUTLS_PKCS11_URL_LIB, /* URL specifies the object on module level */
-       GNUTLS_PKCS11_URL_LIB_VERSION, /* URL specifies the object on module and version level */
+  GNUTLS_PKCS11_URL_GENERIC, /* URL specifies the object on token level */
+  GNUTLS_PKCS11_URL_LIB, /* URL specifies the object on module level */
+  GNUTLS_PKCS11_URL_LIB_VERSION /* URL specifies the object on module and version level */
 } gnutls_pkcs11_url_type_t;
 
 int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t, const char * url,
@@ -76,45 +76,45 @@ int gnutls_pkcs11_delete_url(const char* object_url,
        unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
 
 typedef enum {
-       GNUTLS_PKCS11_OBJ_ID_HEX=1,
-       GNUTLS_PKCS11_OBJ_LABEL,
-       GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
-       GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
-       GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
-       GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
-       GNUTLS_PKCS11_OBJ_ID,
-       /* the pkcs11 provider library info  */
-       GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
-       GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
-       GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER,
+  GNUTLS_PKCS11_OBJ_ID_HEX=1,
+  GNUTLS_PKCS11_OBJ_LABEL,
+  GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
+  GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
+  GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
+  GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
+  GNUTLS_PKCS11_OBJ_ID,
+  /* the pkcs11 provider library info  */
+  GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
+  GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
+  GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER
 } gnutls_pkcs11_obj_info_t;
 
 int gnutls_pkcs11_obj_get_info(gnutls_pkcs11_obj_t crt, gnutls_pkcs11_obj_info_t itype, void* output, size_t* output_size);
 
 typedef enum {
-       GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL=1, /* all certificates */
-       GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED, /* certificates marked as trusted */
-       GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY, /* certificates with corresponding private key */
-       GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
-       GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
-       GNUTLS_PKCS11_OBJ_ATTR_ALL, /* everything! */
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL=1, /* all certificates */
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED, /* certificates marked as trusted */
+  GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY, /* certificates with corresponding private key */
+  GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
+  GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
+  GNUTLS_PKCS11_OBJ_ATTR_ALL /* everything! */
 } gnutls_pkcs11_obj_attr_t;
 
 /* token info */
 typedef enum {
-       GNUTLS_PKCS11_TOKEN_LABEL,
-       GNUTLS_PKCS11_TOKEN_SERIAL,
-       GNUTLS_PKCS11_TOKEN_MANUFACTURER,
-       GNUTLS_PKCS11_TOKEN_MODEL,
+  GNUTLS_PKCS11_TOKEN_LABEL,
+  GNUTLS_PKCS11_TOKEN_SERIAL,
+  GNUTLS_PKCS11_TOKEN_MANUFACTURER,
+  GNUTLS_PKCS11_TOKEN_MODEL
 } gnutls_pkcs11_token_info_t;
 
 typedef enum {
-       GNUTLS_PKCS11_OBJ_UNKNOWN,
-       GNUTLS_PKCS11_OBJ_X509_CRT,
-       GNUTLS_PKCS11_OBJ_PUBKEY,
-       GNUTLS_PKCS11_OBJ_PRIVKEY,
-       GNUTLS_PKCS11_OBJ_SECRET_KEY,
-       GNUTLS_PKCS11_OBJ_DATA,
+  GNUTLS_PKCS11_OBJ_UNKNOWN,
+  GNUTLS_PKCS11_OBJ_X509_CRT,
+  GNUTLS_PKCS11_OBJ_PUBKEY,
+  GNUTLS_PKCS11_OBJ_PRIVKEY,
+  GNUTLS_PKCS11_OBJ_SECRET_KEY,
+  GNUTLS_PKCS11_OBJ_DATA
 } gnutls_pkcs11_obj_type_t;
 
 int gnutls_pkcs11_token_get_url (unsigned int seq, gnutls_pkcs11_url_type_t detailed, char** url);