Restored HMAC-MD5 for compatibility. Although considered weak, several sites require...

diff --git a/NEWS b/NEWS
index 2976d3c3657be4258286de3712fc2d6dd4ea5031..a64f086dc30ff3c4eadb35b9043124f64b610ce1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,12 @@ See the end for copying conditions.
 ** libgnutls: Added support for AES-NI if detected. Uses
 Andy Polyakov's AES-NI code.
 
+* libgnutls: Restored HMAC-MD5 for compatibility. Although considered 
+weak, several sites require it for connection. It is enabled for
+"NORMAL" and "PERFORMANCE" priority strings.
+
+* libgnutls: depend on libdl.
+
 ** libgnutls-extra: Dropped support of LZO compression via liblzo.
 
 ** libgnutls: gnutls_transport_set_global_errno() was removed. This

diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 505cf9e44084583e4597ea5cf9394e3bb1f5d093..ec3dee3a4cf3a619740314ae72f19899f5bc1b57 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -363,10 +363,11 @@ static const int sign_priority_secure256[] = {
   0
 };
 
-static const int mac_priority_performance[] = {
+static const int mac_priority_normal[] = {
   GNUTLS_MAC_SHA1,
   GNUTLS_MAC_SHA256,
   GNUTLS_MAC_AEAD,
+  GNUTLS_MAC_MD5,
   0
 };
 
@@ -583,7 +584,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
           _set_priority (&(*priority_cache)->cipher,
                          cipher_priority_performance);
           _set_priority (&(*priority_cache)->kx, kx_priority_performance);
-          _set_priority (&(*priority_cache)->mac, mac_priority_performance);
+          _set_priority (&(*priority_cache)->mac, mac_priority_normal);
           _set_priority (&(*priority_cache)->sign_algo,
                          sign_priority_default);
         }
@@ -591,7 +592,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
         {
           _set_priority (&(*priority_cache)->cipher, cipher_priority_normal);
           _set_priority (&(*priority_cache)->kx, kx_priority_secure);
-          _set_priority (&(*priority_cache)->mac, mac_priority_secure);
+          _set_priority (&(*priority_cache)->mac, mac_priority_normal);
           _set_priority (&(*priority_cache)->sign_algo,
                          sign_priority_default);
         }