Modify comments.

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

diff --git a/mime-pgp.el b/mime-pgp.el
index 3fe6f0d..58215e1 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -26,17 +26,23 @@
 
 ;;; Commentary:
 
-;;    This module is based on 2 drafts about PGP MIME integration:
-
-;;     - RFC 2015: "MIME Security with Pretty Good Privacy (PGP)"
-;;             by Michael Elkins <elkins@aero.org> (1996/6)
-;;
-;;     - draft-kazu-pgp-mime-00.txt: "PGP MIME Integration"
-;;             by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp>
-;;                     (1995/10; expired)
-;;
-;;    These drafts may be contrary to each other.  You should decide
-;;  which you support.  (Maybe you should use PGP/MIME)
+;;    This module is based on
+
+;;     [security-multipart] RFC 1847: "Security Multiparts for MIME:
+;;         Multipart/Signed and Multipart/Encrypted" by
+;;          Jim Galvin <galvin@tis.com>, Sandy Murphy <sandy@tis.com>,
+;;         Steve Crocker <crocker@cybercash.com> and
+;;          Ned Freed <ned@innosoft.com> (1995/10)
+
+;;     [PGP/MIME] RFC 2015: "MIME Security with Pretty Good Privacy
+;;         (PGP)" by Michael Elkins <elkins@aero.org> (1996/6)
+
+;;     [PGP-kazu] draft-kazu-pgp-mime-00.txt: "PGP MIME Integration"
+;;         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).
 
 ;;; Code:
 
@@ -45,10 +51,10 @@
 
 ;;; @ internal method for application/pgp
 ;;;
-;;; It is based on draft-kazu-pgp-mime-00.txt
+;;; It is based on draft-kazu-pgp-mime-00.txt (PGP-kazu).
 
 (defun mime-method-for-application/pgp (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-to-entity-number beg))
         (p-win (or (get-buffer-window mime-preview-buffer)
                    (get-largest-window)))
         (new-name (format "%s-%s" (buffer-name) cnum))
@@ -115,15 +121,18 @@
 
 ;;; @ Internal method for multipart/signed
 ;;;
-
-(defun mime-method-to-verify-multipart/signed (beg end cal)
-  "Internal method to check multipart/signed."
-  (let* ((rcnum (reverse (mime-article/point-content-number beg)))
-        (oinfo (mime-article/rcnum-to-cinfo (cons '1 rcnum)
-                                            mime-raw-entity-info))
-        )
-    (mime-playback-entity oinfo (cdr (assq 'mode cal)))
-    ))
+;;; 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-reversed-entity-number-to-entity-info
+    ;; reversed-entity-number of signature
+    (cons 1 (reverse (mime-raw-point-to-entity-number start)))
+    mime-raw-message-info)
+   (cdr (assq 'mode cal)) ; play-mode
+   ))
 
 (set-atype 'mime-acting-condition
           '((type . multipart)(subtype . signed)
@@ -133,7 +142,7 @@
 
 ;;; @ Internal method for application/pgp-signature
 ;;;
-;;; It is based on RFC 2015.
+;;; It is based on RFC 2015 (PGP/MIME).
 
 (defvar mime-pgp-command "pgp"
   "*Name of the PGP command.")
@@ -175,7 +184,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 (defun mime-method-to-verify-application/pgp-signature (beg end cal)
   "Internal method to check PGP/MIME signature."
   (let* ((encoding (cdr (assq 'encoding cal)))
-        (cnum (mime-article/point-content-number beg))
+        (cnum (mime-raw-point-to-entity-number beg))
         (rcnum (reverse cnum))
         (rmcnum (cdr rcnum))
         (knum (car rcnum))
@@ -183,8 +192,8 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (raw-buf (current-buffer))
-        (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
-                                            mime-raw-entity-info))
+        (oinfo (mime-raw-reversed-entity-number-to-entity-info
+                (cons onum rmcnum) mime-raw-message-info))
         kbuf
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
@@ -258,18 +267,18 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 ;;; @ Internal method for application/pgp-encrypted
 ;;;
-;;; It is based on RFC 2015.
+;;; It is based on RFC 2015 (PGP/MIME).
 
 (defun mime-method-to-decrypt-application/pgp-encrypted (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-to-entity-number beg))
         (rcnum (reverse cnum))
         (rmcnum (cdr rcnum))
         (knum (car rcnum))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
-                                            mime-raw-entity-info))
+        (oinfo (mime-raw-reversed-entity-number-to-entity-info
+                (cons onum rmcnum) mime-raw-message-info))
         (obeg (mime-entity-info-point-min oinfo))
         (oend (mime-entity-info-point-max oinfo))
         )
@@ -284,10 +293,10 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 ;;; @ Internal method for application/pgp-keys
 ;;;
-;;; It is based on RFC 2015.
+;;; It is based on RFC 2015 (PGP/MIME).
 
 (defun mime-method-to-add-application/pgp-keys (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-to-entity-number beg))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (encoding (cdr (assq 'encoding cal)))
         str)