[mutt] 01/01: upstream/741213-dsa-elgamal-keys-length.patch: to correctly extract the length of DSA and Elgamal keys (Closes: 741213).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit b5e43e15fba6aa863c4ad9792d2a0d6f69188936
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Sep 4 21:31:06 2016 +0100

    upstream/741213-dsa-elgamal-keys-length.patch: to correctly extract the length of DSA and Elgamal keys (Closes: 741213).
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 .../upstream/741213-dsa-elgamal-keys-length.patch  | 33 ++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8ae3acd..1ae7a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
       (Closes: 757141).
     + upstream/644992-ipv6-literal.patch: to parse ipv6 literal addresses
       properly (Closes: 644992).
+    + upstream/741213-dsa-elgamal-keys-length.patch: to correctly extract the
+      length of DSA and Elgamal keys (Closes: 741213).
   * debian/extra/rc/notmuch.rc: restored the notmuch keybindings
     (Closes: 836148).
 
diff --git a/debian/patches/series b/debian/patches/series
index 425826f..6ad8356 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ upstream/833192-preserve-messageid-for-postponed-emails.patch
 upstream/819196-disable-X-in-message-scoring.patch
 upstream/757141-date-format-length.patch
 upstream/644992-ipv6-literal.patch
+upstream/741213-dsa-elgamal-keys-length.patch
diff --git a/debian/patches/upstream/741213-dsa-elgamal-keys-length.patch b/debian/patches/upstream/741213-dsa-elgamal-keys-length.patch
new file mode 100644
index 0000000..00474fc
--- /dev/null
+++ b/debian/patches/upstream/741213-dsa-elgamal-keys-length.patch
@@ -0,0 +1,33 @@
+Patch provided by Guilhem Moulin <<guilhem at guilhem.org>> from an original idea
+of Fabrizio Tarizzo, this allow mutt to at the proper field to determine the key
+length of DSA and Elgamal keys.
+
+Debian bug: http://bugs.debian.org/741213
+Mutt bug: http://bugs.mutt.org/3867
+
+--- a/pgppubring.c
++++ b/pgppubring.c
+@@ -341,19 +341,15 @@
+   p->algorithm = pgp_pkalgbytype (alg);
+   p->flags |= pgp_get_abilities (alg);
+ 
+-  if (alg == 17)
+-    skip_bignum (buff, l, j, &j, 3);
+-  else if (alg == 16 || alg == 20)
+-    skip_bignum (buff, l, j, &j, 2);
+-
+   len = (buff[j] << 8) + buff[j + 1];
+   p->keylen = len;
+ 
+-
+   if (alg >= 1 && alg <= 3)
+     skip_bignum (buff, l, j, &j, 2);
+-  else if (alg == 17 || alg == 16 || alg == 20)
+-    skip_bignum (buff, l, j, &j, 1);
++  else if (alg == 16 || alg == 20)
++    skip_bignum (buff, l, j, &j, 3);
++  else if (alg == 17)
++    skip_bignum (buff, l, j, &j, 4);
+ 
+   pgp_make_pgp3_fingerprint (buff, j, digest);
+   if (dump_fingerprints)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git