;;; mime-pgp.el --- mime-view internal methods for PGP.
-;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Created: 1995/12/7
;; Renamed: 1997/2/27 from tm-pgp.el
-;; Version: $Id: mime-pgp.el,v 0.24 1997-11-20 12:52:34 morioka Exp $
;; Keywords: PGP, security, MIME, multimedia, mail, news
;; This file is part of SEMI (Secure Emacs MIME Interface).
;;; Commentary:
-;; This module is based on 2 drafts about PGP MIME integration:
+;; This module is based on
-;; - 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)
+;; [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:
;;; @ 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-process-application/pgp (beg end cal)
- (let* ((cnum (mime-article/point-content-number beg))
- (p-win (or (get-buffer-window mime-view-buffer)
+(defun mime-method-for-application/pgp (beg end cal)
+ (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))
(the-buf (current-buffer))
- (mother mime-view-buffer)
+ (mother mime-preview-buffer)
(mode major-mode)
text-decoder)
(set-buffer (get-buffer-create new-name))
(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-view-buffer)
+ (set-window-buffer p-win mime-preview-buffer)
))
(set-atype 'mime-acting-condition
- '((type . "application/pgp")
- (method . mime-process-application/pgp)
+ '((type . application)(subtype . pgp)
+ (method . mime-method-for-application/pgp)
))
(set-atype 'mime-acting-condition
- '((type . "text/x-pgp")
- (method . mime-process-application/pgp)
+ '((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-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)
+ (method . mime-method-to-verify-multipart/signed)
))
;;; @ 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.")
'((en . "Key matching expected Key ID \\(\\S +\\) not found"))
"Alist of language vs regexp to detect ``Key expected''.")
-(defun mime::article/call-pgp-to-check-signature (output-buffer orig-file)
+(defun mime-pgp-check-signature (output-buffer orig-file)
(save-excursion
(set-buffer output-buffer)
- (erase-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)))
- )
+ (regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist))))
(if (= status 0)
(save-excursion
(set-buffer output-buffer)
(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")))
+ (buffer-substring (match-beginning 0) (match-end 0)))
+ (t "Bad signature")))
))))
-(defun mime-article/check-pgp-signature (beg end cal)
+(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))
(1- knum)
(1+ knum)))
(raw-buf (current-buffer))
- (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
- mime-raw-content-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))
)
(mime-decode-region (point-min)(point-max) encoding)
(as-binary-output-file (write-region (point-min)(point-max) sig-file))
- (or (mime::article/call-pgp-to-check-signature
- mime-echo-buffer-name orig-file)
+ (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
(let (pgp-id)
(save-excursion
(set-buffer mime-echo-buffer-name)
)
(progn
(funcall (pgp-function 'fetch-key) (cons nil pgp-id))
- (mime::article/call-pgp-to-check-signature
- mime-echo-buffer-name orig-file)
+ (mime-pgp-check-signature mime-echo-buffer-name orig-file)
))
))
(let ((other-window-scroll-buffer mime-echo-buffer-name))
)))
(set-atype 'mime-acting-condition
- '((type . "application/pgp-signature")
- (method . mime-article/check-pgp-signature)
+ '((type . application)(subtype . pgp-signature)
+ (method . mime-method-to-verify-application/pgp-signature)
))
;;; @ Internal method for application/pgp-encrypted
;;;
-;;; It is based on RFC 2015.
+;;; It is based on RFC 2015 (PGP/MIME).
-(defun mime-article/decrypt-pgp (beg end cal)
- (let* ((cnum (mime-article/point-content-number beg))
+(defun mime-method-to-decrypt-application/pgp-encrypted (beg end cal)
+ (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-content-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))
)
- (mime-process-application/pgp obeg oend cal)
+ (mime-method-for-application/pgp obeg oend cal)
))
(set-atype 'mime-acting-condition
- '((type . "application/pgp-encrypted")
- (method . mime-article/decrypt-pgp)
+ '((type . application)(subtype . pgp-encrypted)
+ (method . mime-method-to-decrypt-application/pgp-encrypted)
))
;;; @ Internal method for application/pgp-keys
;;;
-;;; It is based on RFC 2015.
+;;; It is based on RFC 2015 (PGP/MIME).
-(defun mime-article/add-pgp-keys (beg end cal)
- (let* ((cnum (mime-article/point-content-number beg))
+(defun mime-method-to-add-application/pgp-keys (beg end cal)
+ (let* ((cnum (mime-raw-point-to-entity-number beg))
(new-name (format "%s-%s" (buffer-name) cnum))
(encoding (cdr (assq 'encoding cal)))
str)
))
(set-atype 'mime-acting-condition
- '((type . "application/pgp-keys")
- (method . mime-article/add-pgp-keys)
+ '((type . application)(subtype . pgp-keys)
+ (method . mime-method-to-add-application/pgp-keys)
))
projects / elisp / semi.git / blobdiff