Allow all ciphersuites in SSL3.0 when they are available in TLS1.0

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index bfb35dab45ef9ac00cea04dd6cc1c638625a8307..593e7eff0593ee1b22ea9af66bbbd86aeda0eda2 100644 (file)
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -313,7 +313,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_NULL_SHA256,
              GNUTLS_CIPHER_NULL,
-             GNUTLS_KX_RSA, GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_KX_RSA, GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        /* RSA */
@@ -340,27 +340,27 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 
        ENTRY(GNUTLS_RSA_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_CAMELLIA_256_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_CAMELLIA_128_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_CAMELLIA_256_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_AES_256_CBC_SHA256,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 /* GCM */
        ENTRY(GNUTLS_RSA_AES_128_GCM_SHA256,
@@ -395,7 +395,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 #ifdef ENABLE_DHE
        ENTRY(GNUTLS_DHE_DSS_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_DHE_DSS_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_DSS,
@@ -412,31 +412,31 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
        ENTRY(GNUTLS_DHE_DSS_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_DSS_CAMELLIA_256_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_DHE_DSS_CAMELLIA_128_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_DSS_CAMELLIA_256_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_DSS_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_DSS_AES_256_CBC_SHA256,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_DSS,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 /* GCM */
        ENTRY(GNUTLS_DHE_DSS_AES_128_GCM_SHA256,
@@ -472,30 +472,30 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
        ENTRY(GNUTLS_DHE_RSA_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_RSA_CAMELLIA_256_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_RSA_CAMELLIA_128_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_RSA_CAMELLIA_256_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_RSA_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_RSA_AES_256_CBC_SHA256,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 /* GCM */
        ENTRY(GNUTLS_DHE_RSA_AES_128_GCM_SHA256,
@@ -535,7 +535,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_RSA_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_RSA,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY(GNUTLS_ECDHE_RSA_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_ECDHE_RSA,
@@ -543,11 +543,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_ECDHE_RSA_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_ECDHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_RSA,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
        /* ECDHE-ECDSA */
@@ -573,22 +573,22 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_ECDHE_ECDSA_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_ECDSA,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
        /* More ECC */
 
        ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_ECDHE_RSA_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ECDHE_RSA,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_ECDHE_ECDSA_CAMELLIA_128_GCM_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_ECDHE_ECDSA,
@@ -616,7 +616,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                  GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_ECDHE_ECDSA_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_ECDSA,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
        ENTRY(GNUTLS_ECDHE_RSA_CAMELLIA_128_GCM_SHA256,
@@ -663,11 +663,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_ECDHE_PSK_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ECDHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_PSK_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384),
        ENTRY(GNUTLS_ECDHE_PSK_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_ECDHE_PSK,
@@ -675,19 +675,19 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_ECDHE_PSK_NULL_SHA256,
              GNUTLS_CIPHER_NULL, GNUTLS_KX_ECDHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_PSK_NULL_SHA384,
                  GNUTLS_CIPHER_NULL, GNUTLS_KX_ECDHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384),
        ENTRY(GNUTLS_ECDHE_PSK_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_ECDHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_ECDHE_PSK_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384),
 
        ENTRY(GNUTLS_ECDHE_PSK_SALSA20_256_SHA1,
@@ -703,23 +703,23 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
        /* PSK */
        ENTRY(GNUTLS_PSK_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_PSK_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_PSK_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_PSK_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_PSK_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_PSK_AES_256_GCM_SHA384,
                  GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_PSK,
@@ -741,15 +741,15 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS1_2),
        ENTRY(GNUTLS_PSK_NULL_SHA256,
              GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_PSK_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_PSK_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
        ENTRY(GNUTLS_PSK_SALSA20_256_SHA1,
@@ -763,29 +763,29 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_PSK_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_PSK_NULL_SHA384,
                  GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
        /* RSA-PSK */
        ENTRY(GNUTLS_RSA_PSK_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_RSA_PSK_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_PSK_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_PSK_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_PSK_CAMELLIA_128_GCM_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_RSA_PSK,
@@ -803,11 +803,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS1_2),
        ENTRY(GNUTLS_RSA_PSK_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_RSA_PSK_NULL_SHA256,
              GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_RSA_PSK_AES_256_GCM_SHA384,
                  GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_RSA_PSK,
@@ -815,42 +815,42 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                  GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_RSA_PSK_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_RSA_PSK_NULL_SHA384,
                  GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY(GNUTLS_RSA_PSK_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_RSA_PSK_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
 
        /* DHE-PSK */
        ENTRY(GNUTLS_DHE_PSK_ARCFOUR_128_SHA1,
              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_VERSION_UNKNOWN),
        ENTRY(GNUTLS_DHE_PSK_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_PSK_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_PSK_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_PSK_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DHE_PSK_AES_128_GCM_SHA256,
              GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_DHE_PSK,
@@ -858,15 +858,15 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
              GNUTLS_DTLS1_2),
        ENTRY(GNUTLS_DHE_PSK_NULL_SHA256,
              GNUTLS_CIPHER_NULL, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_DHE_PSK_NULL_SHA384,
                  GNUTLS_CIPHER_NULL, GNUTLS_KX_DHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_DHE_PSK_AES_256_CBC_SHA384,
                  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY_PRF(GNUTLS_DHE_PSK_AES_256_GCM_SHA384,
                  GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_PSK,
@@ -874,11 +874,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                  GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384),
        ENTRY(GNUTLS_DHE_PSK_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_DHE_PSK,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY_PRF(GNUTLS_DHE_PSK_CAMELLIA_256_CBC_SHA384,
                  GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_DHE_PSK,
-                 GNUTLS_MAC_SHA384, GNUTLS_TLS1,
+                 GNUTLS_MAC_SHA384, GNUTLS_SSL3,
                  GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
        ENTRY(GNUTLS_DHE_PSK_CAMELLIA_128_GCM_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_DHE_PSK,
@@ -910,30 +910,30 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
        ENTRY(GNUTLS_DH_ANON_CAMELLIA_128_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_CAMELLIA_256_CBC_SHA256,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_CAMELLIA_128_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_128_CBC,
              GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_CAMELLIA_256_CBC_SHA1,
              GNUTLS_CIPHER_CAMELLIA_256_CBC,
              GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_AES_128_CBC_SHA256,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_AES_256_CBC_SHA256,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ANON_DH,
-             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA256, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_DH_ANON_AES_128_GCM_SHA256,
              GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ANON_DH,
@@ -978,45 +978,45 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
        /* SRP */
        ENTRY(GNUTLS_SRP_SHA_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_SRP,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_SRP_SHA_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
        ENTRY(GNUTLS_SRP_SHA_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_DSS_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_SRP_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_RSA_3DES_EDE_CBC_SHA1,
              GNUTLS_CIPHER_3DES_CBC, GNUTLS_KX_SRP_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_DSS_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_RSA_AES_128_CBC_SHA1,
              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_SRP_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_DSS_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP_DSS,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 
        ENTRY(GNUTLS_SRP_SHA_RSA_AES_256_CBC_SHA1,
              GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_SRP_RSA,
-             GNUTLS_MAC_SHA1, GNUTLS_TLS1,
+             GNUTLS_MAC_SHA1, GNUTLS_SSL3,
              GNUTLS_DTLS_VERSION_MIN),
 #endif
        {0, {0, 0}, 0, 0, 0, 0, 0, 0}