* semi-setup.el (mime-setup-enable-inline-image): Remove checking

[elisp/semi.git] / mime-pgp.el

diff --git a/mime-pgp.el b/mime-pgp.el
index 6d055d7..d3d66e1 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996,1997,1998,1999 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;         Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;;     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
@@ -57,6 +57,12 @@
   "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
@@ -102,24 +108,20 @@
            (point-max))
           (goto-char (point-min))
           (while (re-search-forward "^- -" nil t)
-            (replace-match "-")
-            )
+            (replace-match "-"))
           (setq representation-type (if (mime-entity-cooked-p entity)
-                                        'cooked))
-          )
+                                        'cooked)))
          ((progn
             (goto-char (point-min))
             (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
           (pgg-decrypt-region (point-min)(point-max))
           (delete-region (point-min)(point-max))
           (insert-buffer pgg-output-buffer)
-          (setq representation-type 'binary)
-          ))
+          (setq representation-type 'binary)))
     (setq major-mode 'mime-show-message-mode)
     (save-window-excursion (mime-view-buffer nil preview-buffer mother
                                             nil representation-type))
-    (set-window-buffer p-win preview-buffer)
-    ))
+    (set-window-buffer p-win preview-buffer)))
 
 
 ;;; @ Internal method for application/pgp-signature
@@ -144,8 +146,7 @@
       (set-buffer mime-echo-buffer-name)
       (set-window-start 
        (get-buffer-window mime-echo-buffer-name)
-       (point-max))
-      )
+       (point-max)))
     (mime-write-entity-content entity sig-file)
     (unwind-protect
        (with-temp-buffer
@@ -160,8 +161,7 @@
            (set-buffer mime-echo-buffer-name)
            (insert-buffer-substring (if status pgg-output-buffer
                                       pgg-errors-buffer))))
-      (delete-file sig-file))
-    ))
+      (delete-file sig-file))))
 
 
 ;;; @ Internal method for application/pgp-encrypted
@@ -177,8 +177,7 @@
                   (1- knum)
                 (1+ knum)))
         (orig-entity (nth onum (mime-entity-children mother))))
-    (mime-view-application/pgp orig-entity situation)
-    ))
+    (mime-view-application/pgp orig-entity situation)))
 
 
 ;;; @ Internal method for application/pgp-keys
@@ -192,8 +191,7 @@
     (set-buffer mime-echo-buffer-name)
     (set-window-start 
      (get-buffer-window mime-echo-buffer-name)
-     (point-max))
-    )
+     (point-max)))
   (with-temp-buffer
     (mime-insert-entity-content entity)
     (mime-decode-region (point-min) (point-max)
@@ -202,8 +200,73 @@
       (save-excursion 
        (set-buffer mime-echo-buffer-name)
        (insert-buffer-substring (if status pgg-output-buffer
-                                  pgg-errors-buffer)))
-      )))
+                                  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)))
+        (basename (expand-file-name "tm" temporary-file-directory))
+        (sig-file (concat (make-temp-name basename) ".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) "*")))
+    (when (memq (or (cdr (assq 'smime-type situation)) 'enveloped-data)
+               '(enveloped-data signed-data))
+      (set-buffer (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))
+      (set-window-buffer p-win preview-buffer))))
 
 
 ;;; @ end