last pgg adjustment before migrating to epg.
authorKen Manheimer <ken.manheimer@gmail.com>
Thu, 16 Dec 2010 22:33:13 +0000 (17:33 -0500)
committerKen Manheimer <ken.manheimer@gmail.com>
Thu, 16 Dec 2010 22:33:13 +0000 (17:33 -0500)
(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.

lisp/allout.el

index b497c82..93d6544 100644 (file)
@@ -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)