tm 7.37.

[elisp/tm.git] / tm-pgp.el

diff --git a/tm-pgp.el b/tm-pgp.el
index 1d2c1f0..33cdda5 100644 (file)
--- a/tm-pgp.el
+++ b/tm-pgp.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/7
 ;;; Version:
-;;;    $Id: tm-pgp.el,v 7.2 1995/12/17 14:29:17 morioka Exp $
+;;;    $Id: tm-pgp.el,v 7.4 1995/12/19 18:06:49 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, PGP, security
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -29,9 +29,9 @@
 ;;;
 ;;; Commentary:
 ;;;    This module is based on 2 drafts about PGP MIME integration:
-;;;    - draft-elkins-pem-pgp-01.txt
+;;;    - draft-elkins-pem-pgp-02.txt
 ;;;            ``MIME Security with Pretty Good Privacy (PGP)''
-;;;            by Michael Elkins <elkins@aero.org> (1995/9)
+;;;            by Michael Elkins <elkins@aero.org> (1995/11)
 ;;;    - draft-kazu-pgp-mime-00.txt
 ;;;            ``PGP MIME Integration''
 ;;;            by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp> (1995/10)
@@ -115,7 +115,8 @@
 ;;; It is based on draft-elkins-pem-pgp-01.txt
 
 (defun mime-article/check-pgp-signature (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((encoding (cdr (assq 'encoding cal)))
+        (cnum (mime-article/point-content-number beg))
         (rcnum (reverse cnum))
         (rmcnum (cdr rcnum))
         (knum (car rcnum))
@@ -152,7 +153,7 @@
                 end))
       (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name)))
       (insert str)
-      (base64-decode-region (point-min)(point-max))
+      (mime/decode-region encoding (point-min)(point-max))
       (let ((mc-flag nil)                   ; for Mule
            (file-coding-system
             (if (featurep 'mule) *noconv*))