renumbered fields in gnutls.h

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 720743b20fe80cdc6deb3ecafee29ee6711e46b3..0abb0534e3e0316a533fcb47c40af6db81d2f3f3 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -116,16 +116,16 @@ typedef enum gnutls_cipher_algorithm {
        GNUTLS_CIPHER_ARCFOUR_40 = 6,
        GNUTLS_CIPHER_CAMELLIA_128_CBC = 7,
        GNUTLS_CIPHER_CAMELLIA_256_CBC = 8,
-       GNUTLS_CIPHER_RC2_40_CBC = 90,
-       GNUTLS_CIPHER_DES_CBC = 91,
-       GNUTLS_CIPHER_AES_192_CBC = 92,
-       GNUTLS_CIPHER_AES_128_GCM = 93,
-       GNUTLS_CIPHER_AES_256_GCM = 94,
-       GNUTLS_CIPHER_CAMELLIA_192_CBC = 95,
-       GNUTLS_CIPHER_SALSA20_256 = 96,
-       GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 97,
-       GNUTLS_CIPHER_CAMELLIA_128_GCM = 98,
-       GNUTLS_CIPHER_CAMELLIA_256_GCM = 99,
+       GNUTLS_CIPHER_AES_192_CBC = 9,
+       GNUTLS_CIPHER_AES_128_GCM = 10,
+       GNUTLS_CIPHER_AES_256_GCM = 11,
+       GNUTLS_CIPHER_CAMELLIA_192_CBC = 12,
+       GNUTLS_CIPHER_SALSA20_256 = 13,
+       GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 14,
+       GNUTLS_CIPHER_CAMELLIA_128_GCM = 15,
+       GNUTLS_CIPHER_CAMELLIA_256_GCM = 16,
+       GNUTLS_CIPHER_RC2_40_CBC = 17,
+       GNUTLS_CIPHER_DES_CBC = 18,
 
        /* used only for PGP internals. Ignored in TLS/SSL
         */
@@ -726,16 +726,16 @@ typedef enum {
  * Enumeration of security parameters for passive attacks.
  */
 typedef enum {
-       GNUTLS_SEC_PARAM_INSECURE = -20,
-       GNUTLS_SEC_PARAM_EXPORT = -15,
-       GNUTLS_SEC_PARAM_VERY_WEAK = -12,
-       GNUTLS_SEC_PARAM_WEAK = -10,
        GNUTLS_SEC_PARAM_UNKNOWN = 0,
-       GNUTLS_SEC_PARAM_LOW = 1,
-       GNUTLS_SEC_PARAM_LEGACY = 2,
-       GNUTLS_SEC_PARAM_MEDIUM = 3,
-       GNUTLS_SEC_PARAM_HIGH = 4,
-       GNUTLS_SEC_PARAM_ULTRA = 5
+       GNUTLS_SEC_PARAM_INSECURE = 5,
+       GNUTLS_SEC_PARAM_EXPORT = 10,
+       GNUTLS_SEC_PARAM_VERY_WEAK = 15,
+       GNUTLS_SEC_PARAM_WEAK = 20,
+       GNUTLS_SEC_PARAM_LOW = 25,
+       GNUTLS_SEC_PARAM_LEGACY = 30,
+       GNUTLS_SEC_PARAM_MEDIUM = 35,
+       GNUTLS_SEC_PARAM_HIGH = 40,
+       GNUTLS_SEC_PARAM_ULTRA = 45
 } gnutls_sec_param_t;
 
 /* old name */