diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-07 10:53:54 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-07 10:53:54 +0200 |
| commit | ad4cac84dd32edf79827c48d549e0ddef7dbd669 (patch) | |
| tree | dc1ba80720a0723f326e6a419d15dd5d71c5fa2d | |
| parent | 66f96f95bc2b53846fd36f218f0339f379c10b62 (diff) | |
| download | gnutls-ad4cac84dd32edf79827c48d549e0ddef7dbd669.tar.gz | |
ciphersuites: moved CCM ciphersuites in the appropriate ifdefs
| -rw-r--r-- | lib/algorithms/ciphersuites.c | 67 |
1 files changed, 35 insertions, 32 deletions
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c index 94a5b6879c..1ca98f7d52 100644 --- 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 */ |