diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-08-24 09:20:24 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-08-24 10:27:49 +0200 |
| commit | 1e330817b7adce17db488935ca86fc7571a44f36 (patch) | |
| tree | 58c0823b2e6fd832a4ef13136452ee0173df02c0 | |
| parent | 6486c65749e4d5a818f6b575418043afb9fe2ab4 (diff) | |
| download | gnutls-1e330817b7adce17db488935ca86fc7571a44f36.tar.gz | |
introduced priority strings from later gnutls versions to enhance compatibility
This introduces VERS-ALL and KX-ALL strings, as well as the CURVE-ALL
as a no-op.
| -rw-r--r-- | lib/gnutls_priority.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 76c6b77a1c..91638c1a69 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -621,7 +621,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, fn (&(*priority_cache)->kx, algo); else if (strncasecmp (&broken_list[i][1], "VERS-", 5) == 0) { - if (strncasecmp (&broken_list[i][1], "VERS-TLS-ALL", 12) == 0) + if (strncasecmp (&broken_list[i][1], "VERS-TLS-ALL", 12) == 0 || strncasecmp (&broken_list[i][1], "VERS-ALL", 8) == 0) { bulk_fn (&(*priority_cache)->protocol, protocol_priority); @@ -693,11 +693,20 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, bulk_fn (&(*priority_cache)->mac, mac_priority_secure); } - else if (strncasecmp (&broken_list[i][1], "CIPHER-ALL", 7) == 0) + else if (strncasecmp (&broken_list[i][1], "CIPHER-ALL", 10) == 0) { bulk_fn (&(*priority_cache)->cipher, cipher_priority_normal); } + else if (strncasecmp (&broken_list[i][1], "KX-ALL", 6) == 0) + { + bulk_fn (&(*priority_cache)->kx, + kx_priority_secure); + } + else if (strncasecmp (&broken_list[i][1], "CURVE-ALL", 9) == 0) + { + continue; + } else goto error; } |