diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-01-21 12:00:33 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-19 10:58:45 +0200 |
| commit | 3b14b4a421bd0c409a084eaa1c10fdf90ccb1d20 (patch) | |
| tree | fd54f623ece3f53a8c4761045ce22f5565af82e2 | |
| parent | 4db167facb86c7e1209db5c56c6cd21d036435fc (diff) | |
| download | gnutls-3b14b4a421bd0c409a084eaa1c10fdf90ccb1d20.tar.gz | |
CHACHA20_POLY1305 was added to the default priority strings
That is the NORMAL and PERFORMANCE priority strings now will
enable CHACHA20-POLY1305 by default.
| -rw-r--r-- | lib/gnutls_priority.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 50d3d09b26..7ef8cea5d9 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -230,6 +230,7 @@ static const int* kx_priority_secure = _kx_priority_secure; static const int _cipher_priority_performance_default[] = { GNUTLS_CIPHER_AES_128_GCM, GNUTLS_CIPHER_AES_256_GCM, + GNUTLS_CIPHER_CHACHA20_POLY1305, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_CIPHER_AES_128_CBC, @@ -246,16 +247,20 @@ static const int _cipher_priority_performance_default[] = { * them over anything else. */ static const int _cipher_priority_normal_default[] = { - GNUTLS_CIPHER_AES_128_GCM, GNUTLS_CIPHER_AES_256_GCM, - GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_CIPHER_CAMELLIA_256_GCM, - GNUTLS_CIPHER_AES_128_CBC, + GNUTLS_CIPHER_CHACHA20_POLY1305, + GNUTLS_CIPHER_AES_256_CCM, + GNUTLS_CIPHER_AES_256_CBC, - GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_CIPHER_CAMELLIA_256_CBC, + + GNUTLS_CIPHER_AES_128_GCM, + GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_CIPHER_AES_128_CCM, - GNUTLS_CIPHER_AES_256_CCM, + GNUTLS_CIPHER_AES_128_CBC, + GNUTLS_CIPHER_CAMELLIA_128_CBC, + GNUTLS_CIPHER_3DES_CBC, 0 }; |