[Pkg-gnutls-commits] r1063 - in /packages/gnutls26/branches/branch2.11.x/debian: changelog patches/18_restoreHMAC-MD5.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Apr 17 13:48:31 2011
New Revision: 1063

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1063
Log:
add 18_restoreHMAC-MD5.diff restoring HMAC-MD5. #623001

Added:
    packages/gnutls26/branches/branch2.11.x/debian/patches/18_restoreHMAC-MD5.diff
Modified:
    packages/gnutls26/branches/branch2.11.x/debian/changelog
    packages/gnutls26/branches/branch2.11.x/debian/patches/series

Modified: packages/gnutls26/branches/branch2.11.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/changelog?rev=1063&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/changelog Sun Apr 17 13:48:31 2011
@@ -1,8 +1,9 @@
-gnutls26 (2.12.2-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Fri, 08 Apr 2011 19:46:23 +0200
+gnutls26 (2.12.2-2) experimental; urgency=low
+
+  * [18_restoreHMAC-MD5.diff], pulled from upstream git, restore HMAC-MD5
+    for compatibility. Closes: #623001
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 17 Apr 2011 15:44:30 +0200
 
 gnutls26 (2.12.2-1) experimental; urgency=low
 

Added: packages/gnutls26/branches/branch2.11.x/debian/patches/18_restoreHMAC-MD5.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/18_restoreHMAC-MD5.diff?rev=1063&op=file
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/18_restoreHMAC-MD5.diff (added)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/18_restoreHMAC-MD5.diff Sun Apr 17 13:48:31 2011
@@ -1,0 +1,43 @@
+From 6fffdf51ce25f68c8b7fb370b222d6f923f650b3 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sat, 16 Apr 2011 22:46:56 +0200
+Subject: [PATCH] Restored HMAC-MD5 for compatibility. Although considered weak, several sites require it for connection. It is enabled for "NORMAL" and "PERFORMANCE" priority strings.
+Bug-Debian: http://bugs.debian.org/623001
+
+diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
+index 2f35a84..8f59207 100644
+--- a/lib/gnutls_priority.c
++++ b/lib/gnutls_priority.c
+@@ -355,9 +355,10 @@ 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_MD5,
+   0
+ };
+ 
+@@ -573,7 +574,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);
+         }
+@@ -581,7 +582,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);
+         }
+-- 
+1.7.2.5
+

Modified: packages/gnutls26/branches/branch2.11.x/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/series?rev=1063&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/series (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/series Sun Apr 17 13:48:31 2011
@@ -1,2 +1,3 @@
 14_version_gettextcat.diff
 16_unnecessarydep.diff
+18_restoreHMAC-MD5.diff