diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-22 07:27:47 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-22 07:27:47 +0200 |
commit | 66e736922c2069136adb255edda1806bb5159195 (patch) | |
tree | b4a6650256b17005da0e29dd1cd4101d02b03528 | |
parent | 86f6ca696b6ccf868b3a668f31da938f1e98d0f9 (diff) | |
download | gnutls-66e736922c2069136adb255edda1806bb5159195.tar.gz |
Removed the _WITH_ from ciphersuites names.
-rw-r--r-- | lib/algorithms/ciphersuites.c | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c index e476b6cdd3..4a22ac1dfe 100644 --- a/lib/algorithms/ciphersuites.c +++ b/lib/algorithms/ciphersuites.c @@ -81,14 +81,14 @@ typedef struct #define GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384 { 0xC0,0x73 } #define GNUTLS_ECDHE_RSA_CAMELLIA_128_CBC_SHA256 { 0xC0,0x76 } #define GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384 { 0xC0,0x77 } -#define GNUTLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 { 0xC0,0x94 } -#define GNUTLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 { 0xC0,0x95 } -#define GNUTLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 { 0xC0,0x96 } -#define GNUTLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 { 0xC0,0x97 } -#define GNUTLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 { 0xC0,0x98 } -#define GNUTLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 { 0xC0,0x99 } -#define GNUTLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 { 0xC0,0x9A } -#define GNUTLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 { 0xC0,0x9B } +#define GNUTLS_PSK_CAMELLIA_128_CBC_SHA256 { 0xC0,0x94 } +#define GNUTLS_PSK_CAMELLIA_256_CBC_SHA384 { 0xC0,0x95 } +#define GNUTLS_DHE_PSK_CAMELLIA_128_CBC_SHA256 { 0xC0,0x96 } +#define GNUTLS_DHE_PSK_CAMELLIA_256_CBC_SHA384 { 0xC0,0x97 } +#define GNUTLS_RSA_PSK_CAMELLIA_128_CBC_SHA256 { 0xC0,0x98 } +#define GNUTLS_RSA_PSK_CAMELLIA_256_CBC_SHA384 { 0xC0,0x99 } +#define GNUTLS_ECDHE_PSK_CAMELLIA_128_CBC_SHA256 { 0xC0,0x9A } +#define GNUTLS_ECDHE_PSK_CAMELLIA_256_CBC_SHA384 { 0xC0,0x9B } #define GNUTLS_RSA_CAMELLIA_128_GCM_SHA256 { 0xC0, 0x7A } #define GNUTLS_RSA_CAMELLIA_256_GCM_SHA384 { 0xC0,0x7B } @@ -216,8 +216,8 @@ typedef struct /* GCM-PSK */ #define GNUTLS_PSK_AES_128_GCM_SHA256 { 0x00, 0xA8 } #define GNUTLS_DHE_PSK_AES_128_GCM_SHA256 { 0x00, 0xAA } -#define GNUTLS_PSK_WITH_AES_256_GCM_SHA384 { 0x00, 0xA9 } -#define GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384 { 0x00, 0xAB } +#define GNUTLS_PSK_AES_256_GCM_SHA384 { 0x00, 0xA9 } +#define GNUTLS_DHE_PSK_AES_256_GCM_SHA384 { 0x00, 0xAB } #define GNUTLS_PSK_AES_256_CBC_SHA384 { 0x00,0xAF } #define GNUTLS_PSK_NULL_SHA384 { 0x00,0xB1 } @@ -285,28 +285,28 @@ typedef struct #define GNUTLS_ECDHE_PSK_NULL_SHA384 { 0xC0, 0x3B } /* Salsa 20 */ -#define GNUTLS_RSA_WITH_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x10} -#define GNUTLS_RSA_WITH_SALSA20_256_SHA1 {0xE4, 0x11} -#define GNUTLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x12} -#define GNUTLS_ECDHE_RSA_WITH_SALSA20_256_SHA1 {0xE4, 0x13} -#define GNUTLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x14} -#define GNUTLS_ECDHE_ECDSA_WITH_SALSA20_256_SHA1 {0xE4, 0x15} -#define GNUTLS_PSK_WITH_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x16} -#define GNUTLS_PSK_WITH_SALSA20_256_SHA1 {0xE4, 0x17} -#define GNUTLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x18} -#define GNUTLS_ECDHE_PSK_WITH_SALSA20_256_SHA1 {0xE4, 0x19} - - -#define GNUTLS_RSA_WITH_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x30} -#define GNUTLS_RSA_WITH_SALSA20_256_UMAC96 {0xE4, 0x31} -#define GNUTLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x32} -#define GNUTLS_ECDHE_RSA_WITH_SALSA20_256_UMAC96 {0xE4, 0x33} -#define GNUTLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x34} -#define GNUTLS_ECDHE_ECDSA_WITH_SALSA20_256_UMAC96 {0xE4, 0x35} -#define GNUTLS_PSK_WITH_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x36} -#define GNUTLS_PSK_WITH_SALSA20_256_UMAC96 {0xE4, 0x37} -#define GNUTLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x38} -#define GNUTLS_ECDHE_PSK_WITH_SALSA20_256_UMAC96 {0xE4, 0x39} +#define GNUTLS_RSA_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x10} +#define GNUTLS_RSA_SALSA20_256_SHA1 {0xE4, 0x11} +#define GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x12} +#define GNUTLS_ECDHE_RSA_SALSA20_256_SHA1 {0xE4, 0x13} +#define GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x14} +#define GNUTLS_ECDHE_ECDSA_SALSA20_256_SHA1 {0xE4, 0x15} +#define GNUTLS_PSK_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x16} +#define GNUTLS_PSK_SALSA20_256_SHA1 {0xE4, 0x17} +#define GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x18} +#define GNUTLS_ECDHE_PSK_SALSA20_256_SHA1 {0xE4, 0x19} + + +#define GNUTLS_RSA_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x30} +#define GNUTLS_RSA_SALSA20_256_UMAC96 {0xE4, 0x31} +#define GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x32} +#define GNUTLS_ECDHE_RSA_SALSA20_256_UMAC96 {0xE4, 0x33} +#define GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x34} +#define GNUTLS_ECDHE_ECDSA_SALSA20_256_UMAC96 {0xE4, 0x35} +#define GNUTLS_PSK_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x36} +#define GNUTLS_PSK_SALSA20_256_UMAC96 {0xE4, 0x37} +#define GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x38} +#define GNUTLS_ECDHE_PSK_SALSA20_256_UMAC96 {0xE4, 0x39} #define CIPHER_SUITES_COUNT (sizeof(cs_algorithms)/sizeof(gnutls_cipher_suite_entry)-1) @@ -391,20 +391,20 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), /* Salsa20 */ - ENTRY (GNUTLS_RSA_WITH_SALSA20_256_SHA1, + ENTRY (GNUTLS_RSA_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_RSA_WITH_SALSA20_256_UMAC96, + ENTRY (GNUTLS_RSA_SALSA20_256_UMAC96, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_RSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_RSA_WITH_ESTREAM_SALSA20_256_SHA1, + ENTRY (GNUTLS_RSA_ESTREAM_SALSA20_256_SHA1, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_RSA_WITH_ESTREAM_SALSA20_256_UMAC96, + ENTRY (GNUTLS_RSA_ESTREAM_SALSA20_256_UMAC96, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_RSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), @@ -643,36 +643,36 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), /* Salsa20 */ - ENTRY (GNUTLS_ECDHE_RSA_WITH_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_RSA_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_RSA_WITH_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_RSA_SALSA20_256_UMAC96, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_ECDSA_WITH_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_ECDSA_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_ECDSA_WITH_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_ECDSA_SALSA20_256_UMAC96, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_SHA1, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_UMAC96, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_SHA1, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_UMAC96, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), @@ -711,29 +711,29 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_CIPHER_NULL, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_TLS1_2, GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), - ENTRY (GNUTLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256, + ENTRY (GNUTLS_ECDHE_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_SHA256, GNUTLS_TLS1_2, GNUTLS_DTLS1_2), - ENTRY_PRF (GNUTLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384, + ENTRY_PRF (GNUTLS_ECDHE_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_TLS1_2, GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), - ENTRY (GNUTLS_ECDHE_PSK_WITH_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_PSK_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_PSK_WITH_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_PSK_SALSA20_256_UMAC96, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_256_SHA1, + ENTRY (GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_SHA1, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_256_UMAC96, + ENTRY (GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_UMAC96, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_PSK, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), @@ -777,29 +777,29 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK, GNUTLS_MAC_SHA256, GNUTLS_TLS1_2, GNUTLS_DTLS1_2), - ENTRY (GNUTLS_PSK_WITH_CAMELLIA_128_CBC_SHA256, + ENTRY (GNUTLS_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_PSK, GNUTLS_MAC_SHA256, GNUTLS_TLS1, GNUTLS_DTLS_VERSION_MIN), - ENTRY_PRF (GNUTLS_PSK_WITH_CAMELLIA_256_CBC_SHA384, + ENTRY_PRF (GNUTLS_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_PSK, GNUTLS_MAC_SHA384, GNUTLS_TLS1, GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), - ENTRY (GNUTLS_PSK_WITH_SALSA20_256_SHA1, + ENTRY (GNUTLS_PSK_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_PSK, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_PSK_WITH_SALSA20_256_UMAC96, + ENTRY (GNUTLS_PSK_SALSA20_256_UMAC96, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_PSK, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_PSK_WITH_ESTREAM_SALSA20_256_SHA1, + ENTRY (GNUTLS_PSK_ESTREAM_SALSA20_256_SHA1, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_PSK, GNUTLS_MAC_SHA1, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY (GNUTLS_PSK_WITH_ESTREAM_SALSA20_256_UMAC96, + ENTRY (GNUTLS_PSK_ESTREAM_SALSA20_256_UMAC96, GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_PSK, GNUTLS_MAC_UMAC_96, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), @@ -863,11 +863,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), - ENTRY (GNUTLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256, + ENTRY (GNUTLS_RSA_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA256, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN), - ENTRY_PRF (GNUTLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384, + ENTRY_PRF (GNUTLS_RSA_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), @@ -910,19 +910,19 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), - ENTRY_PRF(GNUTLS_PSK_WITH_AES_256_GCM_SHA384, + ENTRY_PRF(GNUTLS_PSK_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), - ENTRY_PRF(GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384, + ENTRY_PRF(GNUTLS_DHE_PSK_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), - ENTRY (GNUTLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256, + ENTRY (GNUTLS_DHE_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA256, GNUTLS_TLS1, GNUTLS_DTLS_VERSION_MIN), - ENTRY_PRF (GNUTLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384, + ENTRY_PRF (GNUTLS_DHE_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_TLS1, GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), |