Fix sigcheck pgp/mime processing with gnupg 2

gnupg 2.1 in stretch doesn't like MD5.

diff --git a/debian/changelog b/debian/changelog
index dd18c0d..84928bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 userdir-ldap (0.3.92) UNRELEASED; urgency=medium
 
 userdir-ldap (0.3.92) UNRELEASED; urgency=medium
 

+  [ Héctor Orón Martínez ]

   * welcome-message-Debian: update SSL certificate authority info.
 
   * welcome-message-Debian: update SSL certificate authority info.
 

+  [ Julien Cristau ]
+  * Fix sigcheck pgp/mime processing with gnupg 2
+

  -- Héctor Orón Martínez <zumbi@debian.org>  Wed, 30 Aug 2017 11:49:25 +0200
 
 userdir-ldap (0.3.91) UNRELEASED; urgency=medium
  -- Héctor Orón Martínez <zumbi@debian.org>  Wed, 30 Aug 2017 11:49:25 +0200
 
 userdir-ldap (0.3.91) UNRELEASED; urgency=medium

diff --git a/userdir_gpg.py b/userdir_gpg.py
index c70b5c1..1b9732c 100644 (file)
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -119,7 +119,7 @@ def GetClearSig(Msg, Paranoid = 0, lax_multipart = False):
       Output = "-----BEGIN PGP SIGNED MESSAGE-----\r\n";
       # Semi-evil hack to get the proper hash type inserted in the message
       if Msg.get_param('micalg') != None:
       Output = "-----BEGIN PGP SIGNED MESSAGE-----\r\n";
       # Semi-evil hack to get the proper hash type inserted in the message
       if Msg.get_param('micalg') != None:

-          Output = Output + "Hash: MD5,SHA1,%s\r\n"%(Msg.get_param('micalg')[4:].upper())
+          Output = Output + "Hash: SHA1,%s\r\n"%(Msg.get_param('micalg')[4:].upper())

       Output = Output + "\r\n";
       Output = Output + Signed.as_string().replace("\n-","\n- -") + "\n" + Signature.get_payload(decode=True)
       return (Output,1);
       Output = Output + "\r\n";
       Output = Output + Signed.as_string().replace("\n-","\n- -") + "\n" + Signature.get_payload(decode=True)
       return (Output,1);