;;; mime-pgp.el --- mime-view internal methods for PGP.
-;; Copyright (C) 1995,1996,1997,1998 MORIOKA Tomohiko
+;; Copyright (C) 1995,1996,1997,1998,1999 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Created: 1995/12/7
;; 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:
(require 'mime-play)
+;;; @ 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)
+ (new-name
+ (format "%s-%s" (buffer-name) (mime-entity-number entity)))
+ (mother (current-buffer))
+ representation-type)
(set-buffer (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))
(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))))
+ (setq representation-type (if (mime-entity-cooked-p entity)
+ 'cooked))
)
((progn
(goto-char (point-min))
(and
(search-forward "\n\n")
(match-end 0)))
- (setq text-decoder (function mime-text-decode-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))
+ (save-window-excursion (mime-view-buffer nil nil mother
+ nil representation-type))
(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)))
-
;;; @ Internal method for application/pgp-signature
;;;
'((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)
+(defun mime-pgp-check-signature (output-buffer sig-file orig-file)
(save-excursion
(set-buffer output-buffer)
(erase-buffer))
(status (call-process-region (point-min)(point-max)
mime-pgp-command
nil output-buffer nil
- orig-file (format "+language=%s" lang)))
+ sig-file orig-file (format "+language=%s" lang)))
(regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist))))
(if (= status 0)
(save-excursion
(t "Bad signature")))
))))
-(defun mime-method-to-verify-application/pgp-signature (start end cal)
+(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))
- (basename (expand-file-name "tm" mime-temp-directory))
+ (orig-entity (nth onum (mime-entity-children mother)))
+ (basename (expand-file-name "tm" temporary-file-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))
- )
+ (mime-write-entity orig-entity orig-file)
(save-excursion (mime-show-echo-buffer))
- (let ((p-min (save-excursion
- (goto-char start)
- (and (search-forward "\n\n")
- (match-end 0))
- )))
- (mime-write-decoded-region p-min end sig-file encoding)
- )
- (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
+ (mime-write-entity-content entity sig-file)
+ (or (mime-pgp-check-signature mime-echo-buffer-name sig-file orig-file)
(let (pgp-id)
(save-excursion
(set-buffer mime-echo-buffer-name)
(delete-file sig-file)
))
-(set-atype 'mime-acting-condition
- '((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 (PGP/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)
+ (orig-entity (nth onum (mime-entity-children mother))))
+ (mime-view-application/pgp orig-entity situation)
))
-(set-atype 'mime-acting-condition
- '((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 (PGP/MIME).
-(defun mime-method-to-add-application/pgp-keys (start end cal)
- (let* ((entity-number (mime-raw-point-to-entity-number start))
+(defun mime-add-application/pgp-keys (entity situation)
+ (let* ((start (mime-entity-point-min entity))
+ (end (mime-entity-point-max entity))
+ (entity-number (mime-entity-number entity))
(new-name (format "%s-%s" (buffer-name) entity-number))
- (encoding (cdr (assq 'encoding cal)))
+ (encoding (cdr (assq 'encoding situation)))
str)
(setq str (buffer-substring start end))
(switch-to-buffer new-name)
(kill-buffer (current-buffer))
))
-(set-atype 'mime-acting-condition
- '((type . application)(subtype . pgp-keys)
- (method . mime-method-to-add-application/pgp-keys)))
-
;;; @ end
;;;
projects / elisp / semi.git / blobdiff