ciphersuites: moved CCM ciphersuites in the appropriate ifdefs

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 94a5b6879c854b6ffb53787c3b0061f4f5ea582c..1ca98f7d523833321b43ded1c31db35ff5d003d4 100644 (file)
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -418,23 +418,7 @@ static const gnutls_cipher_suite_entry_st cs_algorithms[] = {
              GNUTLS_CIPHER_AES_256_CCM, GNUTLS_KX_RSA,
              GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
              GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_DHE_RSA_AES_128_CCM,
-             GNUTLS_CIPHER_AES_128_CCM, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_DHE_RSA_AES_256_CCM,
-             GNUTLS_CIPHER_AES_256_CCM, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
 
-       ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_CCM,
-             GNUTLS_CIPHER_AES_128_CCM, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_ECDHE_ECDSA_AES_256_CCM,
-             GNUTLS_CIPHER_AES_256_CCM, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
 
 /* CCM_8 */
        ENTRY(GNUTLS_RSA_AES_128_CCM_8,
@@ -445,23 +429,7 @@ static const gnutls_cipher_suite_entry_st cs_algorithms[] = {
              GNUTLS_CIPHER_AES_256_CCM_8, GNUTLS_KX_RSA,
              GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
              GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_DHE_RSA_AES_128_CCM_8,
-             GNUTLS_CIPHER_AES_128_CCM_8, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_DHE_RSA_AES_256_CCM_8,
-             GNUTLS_CIPHER_AES_256_CCM_8, GNUTLS_KX_DHE_RSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
 
-       ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_CCM_8,
-             GNUTLS_CIPHER_AES_128_CCM_8, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
-       ENTRY(GNUTLS_ECDHE_ECDSA_AES_256_CCM_8,
-             GNUTLS_CIPHER_AES_256_CCM_8, GNUTLS_KX_ECDHE_ECDSA,
-             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
-             GNUTLS_DTLS1_2),
 
        /* DHE_DSS */
 #ifdef ENABLE_DHE
@@ -591,6 +559,24 @@ static const gnutls_cipher_suite_entry_st cs_algorithms[] = {
              GNUTLS_CIPHER_CHACHA20_POLY1305, GNUTLS_KX_DHE_RSA,
              GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, GNUTLS_DTLS1_2),
 
+/* CCM */
+       ENTRY(GNUTLS_DHE_RSA_AES_128_CCM,
+             GNUTLS_CIPHER_AES_128_CCM, GNUTLS_KX_DHE_RSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_DHE_RSA_AES_256_CCM,
+             GNUTLS_CIPHER_AES_256_CCM, GNUTLS_KX_DHE_RSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_DHE_RSA_AES_128_CCM_8,
+             GNUTLS_CIPHER_AES_128_CCM_8, GNUTLS_KX_DHE_RSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_DHE_RSA_AES_256_CCM_8,
+             GNUTLS_CIPHER_AES_256_CCM_8, GNUTLS_KX_DHE_RSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+
 #endif                         /* DHE */
 #ifdef ENABLE_ECDHE
 /* ECC-RSA */
@@ -714,6 +700,23 @@ static const gnutls_cipher_suite_entry_st cs_algorithms[] = {
              GNUTLS_CIPHER_CHACHA20_POLY1305, GNUTLS_KX_ECDHE_ECDSA,
              GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
              GNUTLS_DTLS1_2),
+
+       ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_CCM,
+             GNUTLS_CIPHER_AES_128_CCM, GNUTLS_KX_ECDHE_ECDSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_ECDHE_ECDSA_AES_256_CCM,
+             GNUTLS_CIPHER_AES_256_CCM, GNUTLS_KX_ECDHE_ECDSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_CCM_8,
+             GNUTLS_CIPHER_AES_128_CCM_8, GNUTLS_KX_ECDHE_ECDSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
+       ENTRY(GNUTLS_ECDHE_ECDSA_AES_256_CCM_8,
+             GNUTLS_CIPHER_AES_256_CCM_8, GNUTLS_KX_ECDHE_ECDSA,
+             GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+             GNUTLS_DTLS1_2),
 #endif
 #ifdef ENABLE_PSK
        /* ECC - PSK */