From 3b33fe3b910909486946426c78c200a386380b37 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 13 Apr 2013 17:57:43 +0200 Subject: Added priority string VERS-DTLS-ALL --- NEWS | 2 ++ doc/cha-gtls-app.texi | 3 ++- lib/gnutls_priority.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 26de9aefe2..9be1346387 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,8 @@ No changes since last version. ** libgnutls: Allow ECC when in SSL 3.0 to work-around a bug in certain openssl versions. +** libgnutls: Added priority string VERS-DTLS-ALL. + ** libgnutls: When in compatibility mode allow for a wrong version in the RSA PMS. diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi index 9cc50e7789..740e1becdc 100644 --- a/doc/cha-gtls-app.texi +++ b/doc/cha-gtls-app.texi @@ -907,7 +907,8 @@ COMP-NULL, COMP-DEFLATE. Catch all is COMP-ALL. @item TLS versions @tab VERS-SSL3.0, VERS-TLS1.0, VERS-TLS1.1, -VERS-TLS1.2, VERS-DTLS1.0. Catch all is VERS-TLS-ALL. +VERS-TLS1.2, VERS-DTLS1.0. +Catch all is VERS-TLS-ALL and VERS-DTLS-ALL. @item Signature algorithms @tab SIGN-RSA-SHA1, SIGN-RSA-SHA224, diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 178a49df00..701c3b6247 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -254,6 +254,11 @@ static const int protocol_priority[] = { 0 }; +static const int dtls_protocol_priority[] = { + GNUTLS_DTLS1_0, + 0 +}; + static const int protocol_priority_suiteb[] = { GNUTLS_TLS1_2, 0 @@ -812,6 +817,11 @@ gnutls_priority_init (gnutls_priority_t * priority_cache, bulk_fn (&(*priority_cache)->protocol, protocol_priority); } + else if (strncasecmp (&broken_list[i][1], "VERS-DTLS-ALL", 13) == 0) + { + bulk_fn (&(*priority_cache)->protocol, + dtls_protocol_priority); + } else { if ((algo = -- cgit v1.2.1