From: yoichi <yoichi>
Date: Thu, 14 Nov 2002 07:52:02 +0000 (+0000)
Subject: * wl-mime.el (wl-message-verify-pgp-nonmime): Verify sign in the
X-Git-Tag: wl-2_11_1~42
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=175037272d38a22ce0e51c7eb76511ab8d0c01cd;p=elisp%2Fwanderlust.git

* wl-mime.el (wl-message-verify-pgp-nonmime): Verify sign in the
original contents.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 58818da..c884c74 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-14  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-mime.el (wl-message-verify-pgp-nonmime): Verify sign in the
+	original contents.
+
 2002-11-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-util.el (wl-biff-check-folder): Call elmo-pop3-get-session
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 824d11d..393ec98 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -317,23 +317,42 @@ It calls following-method selected from variable
   (require 'pgg)
   (save-excursion
     (beginning-of-line)
-    (if (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
-	    (re-search-backward "^-+END PGP SIGNATURE-+$" nil t))
-	(let (beg end status)
-	  (setq end (match-end 0))
-	  (if (setq beg (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
-	      (progn
-		(save-excursion
-		  (mime-show-echo-buffer)
-		  (set-buffer mime-echo-buffer-name)
-		  (set-window-start
-		   (get-buffer-window mime-echo-buffer-name)
-		   (point-max)))
-		(setq status (pgg-verify-region beg end nil 'fetch))
-		(set-buffer mime-echo-buffer-name)
-		(insert-buffer-substring
-		 (if status pgg-output-buffer pgg-errors-buffer)))
-	    (message "Cannot find pgp signed region")))
+    (if (and (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
+		 (re-search-backward "^-+END PGP SIGNATURE-+$" nil t))
+	     (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
+	(let (status m-beg)
+	  (let* ((beg (point))
+		 (situation (mime-preview-find-boundary-info))
+		 (p-end (aref situation 1))
+		 (entity (aref situation 2))
+		 (count 0))
+	    (goto-char p-end)
+	    (while (< beg (point))
+	      (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+		  (setq count (+ count 1))
+		(defbug)))
+	    (with-temp-buffer
+	      (set-buffer-multibyte nil)
+	      (insert (mime-entity-body entity))
+	      (goto-char (point-max))
+	      (while (> count 0)
+		(if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+		    (setq count (- count 1))
+		  (debug)))
+	      (let ((r-beg (point))
+		    (r-end (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)))
+		(if r-end
+		    (setq status (pgg-verify-region r-beg r-end nil 'fetch))
+		  (debug)))))
+	  (mime-show-echo-buffer)
+	  (set-buffer mime-echo-buffer-name)
+	  (set-window-start
+	   (get-buffer-window mime-echo-buffer-name)
+	   (point-max))
+	  (setq m-beg (point))
+	  (insert-buffer-substring
+	   (if status pgg-output-buffer pgg-errors-buffer))
+	  (decode-coding-region m-beg (point) wl-cs-autoconv))
       (message "Cannot find pgp signed region"))))
 
 ;; XXX: encrypted multipart isn't represented as multipart