X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-pgp.el;h=8f49a2e11818ccb965461d5607d86865f3bdb48f;hb=a418e1c8b54f1dfb2e4f648b30107c0e9b5ae98b;hp=88b6e289b1c761e637cfe027748e6f692f8fa497;hpb=6b8f3373fd0d5eb3cd3a2190fa36aef9c39e29aa;p=elisp%2Fsemi.git

diff --git a/mime-pgp.el b/mime-pgp.el
index 88b6e28..8f49a2e 100644
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -1,8 +1,9 @@
 ;;; mime-pgp.el --- mime-view internal methods for PGP.
 
-;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
+;;	Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
 ;; Created: 1995/12/7
 ;;	Renamed: 1997/2/27 from tm-pgp.el
 ;; Keywords: PGP, security, MIME, multimedia, mail, news
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -41,34 +42,60 @@
 ;;	    by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp> (1995/10;
 ;;	    expired)
 
-;;  PGP/MIME and PGP-kazu may be contrary to each other.  You should
-;;  decide which you support (Maybe you should not use PGP-kazu).
+;;	[OpenPGP/MIME] draft-yamamoto-openpgp-mime-00.txt: "MIME
+;;	    Security with OpenPGP (OpenPGP/MIME)" by Kazuhiko YAMAMOTO
+;;	    <kazu@iijlab.net> (1998/1)
 
 ;;; Code:
 
 (require 'mime-play)
+(require 'pgg-def)
+
+(autoload 'pgg-decrypt-region "pgg"
+  "PGP decryption of current region." t)
+(autoload 'pgg-verify-region "pgg"
+  "PGP verification of current region." t)
+(autoload 'pgg-snarf-keys-region "pgg"
+  "Snarf PGP public keys in current region." t)
+(autoload 'smime-decrypt-region "smime"
+  "S/MIME decryption of current region.")
+(autoload 'smime-verify-region "smime"
+  "S/MIME verification of current region.")
+(defvar smime-output-buffer)
+(defvar smime-errors-buffer)
+
+
+;;; @ Internal method for multipart/signed
+;;;
+;;; It is based on RFC 1847 (security-multipart).
+
+(defun mime-verify-multipart/signed (entity situation)
+  "Internal method to verify multipart/signed."
+  (mime-play-entity
+   (nth 1 (mime-entity-children entity)) ; entity-info of signature
+   (list (assq 'mode situation)) ; play-mode
+   ))
 
 
 ;;; @ internal method for application/pgp
 ;;;
 ;;; It is based on draft-kazu-pgp-mime-00.txt (PGP-kazu).
 
-(defun mime-method-for-application/pgp (start end cal)
-  (let* ((entity-number (mime-raw-point-to-entity-number start))
-	 (p-win (or (get-buffer-window mime-preview-buffer)
+(defun mime-view-application/pgp (entity situation)
+  (let* ((p-win (or (get-buffer-window (current-buffer))
 		    (get-largest-window)))
-	 (new-name (format "%s-%s" (buffer-name) entity-number))
-	 (the-buf (current-buffer))
-	 (mother mime-preview-buffer)
-	 (mode major-mode)
-	 text-decoder)
-    (set-buffer (get-buffer-create new-name))
+	 (new-name
+	  (format "%s-%s" (buffer-name) (mime-entity-number entity)))
+	 (mother (current-buffer))
+	 (preview-buffer (concat "*Preview-" (buffer-name) "*"))
+	 representation-type message-buf)
+    (set-buffer (setq message-buf (get-buffer-create new-name)))
     (erase-buffer)
-    (insert-buffer-substring the-buf start end)
+    (mime-insert-entity entity)
     (cond ((progn
 	     (goto-char (point-min))
 	     (re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
-	   (funcall (pgp-function 'verify))
+	   (pgg-verify-region (match-beginning 0)(point-max) nil 'fetch)
 	   (goto-char (point-min))
 	   (delete-region
 	    (point-min)
@@ -81,231 +108,180 @@
 	    (point-max))
 	   (goto-char (point-min))
 	   (while (re-search-forward "^- -" nil t)
-	     (replace-match "-")
-	     )
-	   (setq text-decoder
-		 (cdr (or (assq mode mime-text-decoder-alist)
-			  (assq t    mime-text-decoder-alist))))
-	   )
+	     (replace-match "-"))
+	   (setq representation-type (if (mime-entity-cooked-p entity)
+					 'cooked)))
 	  ((progn
 	     (goto-char (point-min))
 	     (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
-	   (as-binary-process (funcall (pgp-function 'decrypt)))
-	   (goto-char (point-min))
-	   (delete-region (point-min)
-			  (and
-			   (search-forward "\n\n")
-			   (match-end 0)))
-	   (setq text-decoder (function mime-text-decode-buffer))
-	   ))
+	   (pgg-decrypt-region (point-min)(point-max))
+	   (delete-region (point-min)(point-max))
+	   (insert-buffer pgg-output-buffer)
+	   (setq representation-type 'binary)))
     (setq major-mode 'mime-show-message-mode)
-    (setq mime-text-decoder text-decoder)
-    (save-window-excursion (mime-view-mode mother))
-    (set-window-buffer p-win mime-preview-buffer)
-    ))
-
-(set-atype 'mime-acting-condition
-	   '((type . application)(subtype . pgp)
-	     (method . mime-method-for-application/pgp)))
-
-(set-atype 'mime-acting-condition
-	   '((type . text)(subtype . x-pgp)
-	     (method . mime-method-for-application/pgp)))
-
-
-;;; @ Internal method for multipart/signed
-;;;
-;;; It is based on RFC 1847 (security-multipart).
-
-(defun mime-method-to-verify-multipart/signed (start end cal)
-  "Internal method to verify multipart/signed."
-  (mime-raw-play-entity
-   ;; entity-info of signature
-   (mime-raw-entity-node-id-to-entity-info
-    ;; entity-node-id of signature
-    (cons 1 (mime-raw-point-to-entity-node-id start)))
-   (cdr (assq 'mode cal)) ; play-mode
-   ))
-
-(set-atype 'mime-acting-condition
-	   '((type . multipart)(subtype . signed)
-	     (method . mime-method-to-verify-multipart/signed)))
+    (save-window-excursion
+      (mime-view-buffer nil preview-buffer mother
+			nil representation-type)
+      (make-local-variable 'mime-view-temp-message-buffer)
+      (setq mime-view-temp-message-buffer message-buf))
+    (set-window-buffer p-win preview-buffer)))
 
 
 ;;; @ Internal method for application/pgp-signature
 ;;;
-;;; It is based on RFC 2015 (PGP/MIME).
-
-(defvar mime-pgp-command "pgp"
-  "*Name of the PGP command.")
-
-(defvar mime-pgp-default-language 'en
-  "*Symbol of language for pgp.
-It should be ISO 639 2 letter language code such as en, ja, ...")
-
-(defvar mime-pgp-good-signature-regexp-alist
-  '((en . "Good signature from user.*$"))
-  "Alist of language vs regexp to detect ``Good signature''.")
-
-(defvar mime-pgp-key-expected-regexp-alist
-  '((en . "Key matching expected Key ID \\(\\S +\\) not found"))
-  "Alist of language vs regexp to detect ``Key expected''.")
-
-(defun mime-pgp-check-signature (output-buffer orig-file)
-  (save-excursion
-    (set-buffer output-buffer)
-    (erase-buffer))
-  (let* ((lang (or mime-pgp-default-language 'en))
-	 (status (call-process-region (point-min)(point-max)
-				      mime-pgp-command
-				      nil output-buffer nil
-				      orig-file (format "+language=%s" lang)))
-	 (regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist))))
-    (if (= status 0)
-	(save-excursion
-	  (set-buffer output-buffer)
-	  (goto-char (point-min))
-	  (message
-	   (cond ((not (stringp regexp))
-		  "Please specify right regexp for specified language")
-		 ((re-search-forward regexp nil t)
-		  (buffer-substring (match-beginning 0) (match-end 0)))
-		 (t "Bad signature")))
-	  ))))
-
-(defun mime-method-to-verify-application/pgp-signature (start end cal)
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
+
+(defun mime-verify-application/pgp-signature (entity situation)
   "Internal method to check PGP/MIME signature."
-  (let* ((encoding (cdr (assq 'encoding cal)))
-	 (entity-node-id (mime-raw-point-to-entity-node-id start))
-	 (mother-node-id (cdr entity-node-id))
+  (let* ((entity-node-id (mime-entity-node-id entity))
+	 (mother (mime-entity-parent entity))
 	 (knum (car entity-node-id))
 	 (onum (if (> knum 0)
 		   (1- knum)
 		 (1+ knum)))
-	 (raw-buf (current-buffer))
-	 (oinfo (mime-raw-entity-node-id-to-entity-info
-		 (cons onum mother-node-id) mime-raw-message-info))
-	 kbuf
-	 (basename (expand-file-name "tm" mime-temp-directory))
-	 (orig-file (make-temp-name basename))
-	 (sig-file (concat orig-file ".sig"))
-	 )
-    (save-excursion
-      (let ((p-min (mime-entity-info-point-min oinfo))
-	    (p-max (mime-entity-info-point-max oinfo))
-	    )
-	(set-buffer (get-buffer-create mime-temp-buffer-name))
-	(insert-buffer-substring raw-buf p-min p-max)
-	)
-      (goto-char (point-min))
-      (while (re-search-forward "\n" nil t)
-	(replace-match "\r\n")
-	)
-      (write-region-as-binary (point-min)(point-max) orig-file)
-      (kill-buffer (current-buffer))
-      )
-    (save-excursion (mime-show-echo-buffer))
-    (save-excursion
-      (let ((p-min (save-excursion
-		     (goto-char start)
-		     (and (search-forward "\n\n")
-			  (match-end 0))
-		     )))
-	(set-buffer (setq kbuf (get-buffer-create mime-temp-buffer-name)))
-	(insert-buffer-substring raw-buf p-min end)
-	)
-      (mime-write-decoded-region (point-min)(point-max) sig-file encoding)
-      (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
-	  (let (pgp-id)
-	    (save-excursion
-	      (set-buffer mime-echo-buffer-name)
-	      (goto-char (point-min))
-	      (let ((regexp (cdr (assq (or mime-pgp-default-language 'en)
-				       mime-pgp-key-expected-regexp-alist))))
-		(cond ((not (stringp regexp))
-		       (message
-			"Please specify right regexp for specified language")
-		       )
-		      ((re-search-forward regexp nil t)
-		       (setq pgp-id
-			     (concat "0x" (buffer-substring-no-properties
-					   (match-beginning 1)
-					   (match-end 1))))
-		       ))))
-	    (if (and pgp-id
-		     (y-or-n-p
-		      (format "Key %s not found; attempt to fetch? " pgp-id))
-		     )
-		(progn
-		  (funcall (pgp-function 'fetch-key) (cons nil pgp-id))
-		  (mime-pgp-check-signature mime-echo-buffer-name orig-file)
-		  ))
-	    ))
-      (let ((other-window-scroll-buffer mime-echo-buffer-name))
-	(scroll-other-window 8)
-	)
-      (kill-buffer kbuf)
-      (delete-file orig-file)
-      (delete-file sig-file)
-      )))
-
-(set-atype 'mime-acting-condition
-	   '((type . application)(subtype . pgp-signature)
-	     (method . mime-method-to-verify-application/pgp-signature)))
+	 (orig-entity (nth onum (mime-entity-children mother)))
+	 (sig-file (make-temp-file "tm" nil ".asc")))
+    (save-excursion 
+      (mime-show-echo-buffer)
+      (set-buffer mime-echo-buffer-name)
+      (set-window-start 
+       (get-buffer-window mime-echo-buffer-name)
+       (point-max)))
+    (mime-write-entity-content entity sig-file)
+    (unwind-protect
+	(with-temp-buffer
+	  (mime-insert-entity orig-entity)
+	  (goto-char (point-min))
+	  (while (progn (end-of-line) (not (eobp)))
+	    (insert "\r")
+	    (forward-line 1))
+	  (pgg-verify-region (point-min)(point-max) 
+			     sig-file 'fetch)
+	  (save-excursion 
+	    (set-buffer mime-echo-buffer-name)
+	    (insert-buffer-substring pgg-errors-buffer)))
+      (delete-file sig-file))))
 
 
 ;;; @ Internal method for application/pgp-encrypted
 ;;;
-;;; It is based on RFC 2015 (PGP/MIME).
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
 
-(defun mime-method-to-decrypt-application/pgp-encrypted (start end cal)
-  (let* ((entity-node-id (mime-raw-point-to-entity-node-id start))
-	 (mother-node-id (cdr entity-node-id))
+(defun mime-decrypt-application/pgp-encrypted (entity situation)
+  (let* ((entity-node-id (mime-entity-node-id entity))
+	 (mother (mime-entity-parent entity))
 	 (knum (car entity-node-id))
 	 (onum (if (> knum 0)
 		   (1- knum)
 		 (1+ knum)))
-	 (oinfo (mime-raw-entity-node-id-to-entity-info
-		 (cons onum mother-node-id) mime-raw-message-info))
-	 (obeg (mime-entity-info-point-min oinfo))
-	 (oend (mime-entity-info-point-max oinfo))
-	 )
-    (mime-method-for-application/pgp obeg oend cal)
-    ))
-
-(set-atype 'mime-acting-condition
-	   '((type . application)(subtype . pgp-encrypted)
-	     (method . mime-method-to-decrypt-application/pgp-encrypted)))
+	 (orig-entity (nth onum (mime-entity-children mother))))
+    (mime-view-application/pgp orig-entity situation)))
 
 
 ;;; @ Internal method for application/pgp-keys
 ;;;
-;;; It is based on RFC 2015 (PGP/MIME).
-
-(defun mime-method-to-add-application/pgp-keys (start end cal)
-  (let* ((entity-number (mime-raw-point-to-entity-number start))
-	 (new-name (format "%s-%s" (buffer-name) entity-number))
-	 (encoding (cdr (assq 'encoding cal)))
-	 str)
-    (setq str (buffer-substring start end))
-    (switch-to-buffer new-name)
-    (setq buffer-read-only nil)
-    (erase-buffer)
-    (insert str)
-    (goto-char (point-min))
-    (if (re-search-forward "^\n" nil t)
-	(delete-region (point-min) (match-end 0))
-      )
-    (mime-decode-region (point-min)(point-max) encoding)
-    (funcall (pgp-function 'snarf-keys))
-    (kill-buffer (current-buffer))
-    ))
-
-(set-atype 'mime-acting-condition
-	   '((type . application)(subtype . pgp-keys)
-	     (method . mime-method-to-add-application/pgp-keys)))
-
-	 
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
+
+(defun mime-add-application/pgp-keys (entity situation)
+  (save-excursion 
+    (mime-show-echo-buffer)
+    (set-buffer mime-echo-buffer-name)
+    (set-window-start 
+     (get-buffer-window mime-echo-buffer-name)
+     (point-max)))
+  (with-temp-buffer
+    (mime-insert-entity-content entity)
+    (mime-decode-region (point-min) (point-max)
+                        (cdr (assq 'encoding situation)))
+    (pgg-snarf-keys-region (point-min)(point-max))
+    (save-excursion 
+      (set-buffer mime-echo-buffer-name)
+      (insert-buffer-substring pgg-errors-buffer))))
+
+
+;;; @ Internal method for application/pkcs7-signature
+;;;
+;;; It is based on RFC 2633 (S/MIME version 3).
+
+(defun mime-verify-application/pkcs7-signature (entity situation)
+  "Internal method to check S/MIME signature."
+  (let* ((entity-node-id (mime-entity-node-id entity))
+	 (mother (mime-entity-parent entity))
+	 (knum (car entity-node-id))
+	 (onum (if (> knum 0)
+		   (1- knum)
+		 (1+ knum)))
+	 (orig-entity (nth onum (mime-entity-children mother)))
+	 (sig-file (make-temp-file "tm" nil ".asc"))
+	 status)
+    (save-excursion 
+      (mime-show-echo-buffer)
+      (set-buffer mime-echo-buffer-name)
+      (set-window-start 
+       (get-buffer-window mime-echo-buffer-name)
+       (point-max)))
+    (mime-write-entity entity sig-file)
+    (unwind-protect
+	(with-temp-buffer
+	  (mime-insert-entity orig-entity)
+	  (goto-char (point-min))
+	  (while (progn (end-of-line) (not (eobp)))
+	    (insert "\r")
+	    (forward-line 1))
+	  (setq status (smime-verify-region (point-min)(point-max) 
+					    sig-file))
+	  (save-excursion 
+	    (set-buffer mime-echo-buffer-name)
+	    (insert-buffer-substring (if status smime-output-buffer
+				       smime-errors-buffer))))
+      (delete-file sig-file))))
+
+
+;;; @ Internal method for application/pkcs7-mime
+;;;
+;;; It is based on RFC 2633 (S/MIME version 3).
+
+(defun mime-view-application/pkcs7-mime (entity situation)
+  (let* ((p-win (or (get-buffer-window (current-buffer))
+		    (get-largest-window)))
+	 (new-name
+	  (format "%s-%s" (buffer-name) (mime-entity-number entity)))
+	 (mother (current-buffer))
+	 (preview-buffer (concat "*Preview-" (buffer-name) "*"))
+	 message-buf)
+    (when (memq (or (cdr (assq 'smime-type situation)) 'enveloped-data)
+		'(enveloped-data signed-data))
+      (set-buffer (setq message-buf (get-buffer-create new-name)))
+      (let ((inhibit-read-only t)
+	    buffer-read-only)
+	(erase-buffer)
+	(mime-insert-entity entity)
+	(smime-decrypt-region (point-min)(point-max))
+	(delete-region (point-min)(point-max))
+	(insert-buffer smime-output-buffer))
+      (setq major-mode 'mime-show-message-mode)
+      (save-window-excursion
+	(mime-view-buffer nil preview-buffer mother
+			  nil 'binary)
+	(make-local-variable 'mime-view-temp-message-buffer)
+	(setq mime-view-temp-message-buffer message-buf))
+      (set-window-buffer p-win preview-buffer))))
+
+(defun mime-display-multipart/pgp-encrypted (entity situation)
+   (if pgg-decrypt-automatically
+       (let ((pgp-begin (point)))
+	 (mime-insert-entity entity)
+	 (goto-char pgp-begin)
+	 (when (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
+	   (pgg-decrypt-region pgp-begin (point-max))
+	   (delete-region pgp-begin (point-max))
+	   (mime-display-entity
+	    (mime-parse-buffer pgg-output-buffer))))
+     (mime-display-multipart/mixed entity situation)))
+
 ;;; @ end
 ;;;