From: Nikos Mavrogiannopoulos Date: Tue, 22 Oct 2013 05:29:18 +0000 (+0200) Subject: rearrangement X-Git-Tag: gnutls_3_2_5~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9888cd89ac367f0d372a0e1e19631e7a9adbdca1;p=thirdparty%2Fgnutls.git rearrangement --- diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c index 4a22ac1dfe..d0ca400c6a 100644 --- a/lib/algorithms/ciphersuites.c +++ b/lib/algorithms/ciphersuites.c @@ -759,6 +759,10 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_PSK, GNUTLS_MAC_SHA256, GNUTLS_TLS1_2, GNUTLS_DTLS1_2), + 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 (GNUTLS_PSK_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -910,10 +914,6 @@ 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_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_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,