From: Ken Manheimer <ken.manheimer@gmail.com>
Date: Thu, 16 Dec 2010 22:33:13 +0000 (-0500)
Subject: last pgg adjustment before migrating to epg.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da420726395ea72464a331df07ad91ffea03f217;p=emacs.git

last pgg adjustment before migrating to epg.

(allout-encrypted-key-info): replace pgg-gpg-symmetric-key-p with explicit
examination of the parsed armoring structure.  pgg-gpg-symmetric-key-p
seems to have drifted, not recognizing parsed symmetric keys as being
symmetric.
---

diff --git a/lisp/allout.el b/lisp/allout.el
index b497c82f0b3..93d6544b18e 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -6544,7 +6544,8 @@ An error is raised if the text is not encrypted."
     (with-temp-buffer
       (insert text)
       (let* ((parsed-armor (pgg-parse-armor-region (point-min) (point-max)))
-             (type (if (pgg-gpg-symmetric-key-p parsed-armor)
+             ;; pgg-gpg-symmetric-key-p has lost track.
+             (type (if (assq 'symmetric-key-algorithm (car (cdr parsed-armor)))
                        'symmetric
                      'keypair))
              secret-keys first-secret-key for-key-owner)