;;; 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.15 1997-03-18 14:45:47 morioka Exp $
;; Keywords: PGP, security, MIME, multimedia, mail, news
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Secure Emacs MIME Interface).
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;;;
;;; It is based on draft-kazu-pgp-mime-00.txt
-(defun mime-article/view-application/pgp (beg end cal)
+(defun mime-method-for-application/pgp (beg end cal)
(let* ((cnum (mime-article/point-content-number beg))
- (p-win (or (get-buffer-window mime-view-buffer)
+ (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/content-decoding-condition
- '((type . "application/pgp")
- (method . mime-article/view-application/pgp)
+(set-atype 'mime-acting-condition
+ '((type . application)(subtype . pgp)
+ (method . mime-method-for-application/pgp)
))
-(set-atype 'mime/content-decoding-condition
- '((type . "text/x-pgp")
- (method . mime-article/view-application/pgp)
+(set-atype 'mime-acting-condition
+ '((type . text)(subtype . x-pgp)
+ (method . mime-method-for-application/pgp)
+ ))
+
+
+;;; @ 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)))
+ ))
+
+(set-atype 'mime-acting-condition
+ '((type . multipart)(subtype . signed)
+ (method . mime-method-to-verify-multipart/signed)
))
'((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))
(rcnum (reverse cnum))
(onum (if (> knum 0)
(1- knum)
(1+ knum)))
+ (raw-buf (current-buffer))
(oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
- mime::article/content-info))
- str kbuf
+ mime-raw-entity-info))
+ kbuf
(basename (expand-file-name "tm" mime-temp-directory))
(orig-file (make-temp-name basename))
(sig-file (concat orig-file ".sig"))
)
(save-excursion
- (setq str (buffer-substring
- (mime::content-info/point-min oinfo)
- (mime::content-info/point-max oinfo)
- ))
- (set-buffer (get-buffer-create mime/temp-buffer-name))
- (insert str)
+ (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")
)
- (as-binary-output-file (write-file orig-file))
+ (as-binary-output-file (write-region (point-min)(point-max) orig-file))
(kill-buffer (current-buffer))
)
+ (save-excursion (mime-show-echo-buffer))
(save-excursion
- (mime-article/show-output-buffer)
- )
- (save-excursion
- (setq str (buffer-substring
- (save-excursion
- (goto-char beg)
- (and (search-forward "\n\n")
- (match-end 0)))
- end))
- (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name)))
- (insert str)
+ (let ((p-min (save-excursion
+ (goto-char beg)
+ (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-decode-region (point-min)(point-max) encoding)
- (as-binary-output-file (write-file sig-file))
- (or (mime::article/call-pgp-to-check-signature
- mime/output-buffer-name orig-file)
+ (as-binary-output-file (write-region (point-min)(point-max) sig-file))
+ (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
(let (pgp-id)
(save-excursion
- (set-buffer mime/output-buffer-name)
+ (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))))
)
(progn
(funcall (pgp-function 'fetch-key) (cons nil pgp-id))
- (mime::article/call-pgp-to-check-signature
- mime/output-buffer-name orig-file)
+ (mime-pgp-check-signature mime-echo-buffer-name orig-file)
))
))
- (let ((other-window-scroll-buffer mime/output-buffer-name))
+ (let ((other-window-scroll-buffer mime-echo-buffer-name))
(scroll-other-window 8)
)
(kill-buffer kbuf)
(delete-file sig-file)
)))
-(set-atype 'mime/content-decoding-condition
- '((type . "application/pgp-signature")
- (method . mime-article/check-pgp-signature)
+(set-atype 'mime-acting-condition
+ '((type . application)(subtype . pgp-signature)
+ (method . mime-method-to-verify-application/pgp-signature)
))
;;;
;;; It is based on RFC 2015.
-(defun mime-article/decrypt-pgp (beg end cal)
+(defun mime-method-to-decrypt-application/pgp-encrypted (beg end cal)
(let* ((cnum (mime-article/point-content-number beg))
(rcnum (reverse cnum))
(rmcnum (cdr rcnum))
(1- knum)
(1+ knum)))
(oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
- mime::article/content-info))
- (obeg (mime::content-info/point-min oinfo))
- (oend (mime::content-info/point-max oinfo))
+ mime-raw-entity-info))
+ (obeg (mime-entity-info-point-min oinfo))
+ (oend (mime-entity-info-point-max oinfo))
)
- (mime-article/view-application/pgp obeg oend cal)
+ (mime-method-for-application/pgp obeg oend cal)
))
-(set-atype 'mime/content-decoding-condition
- '((type . "application/pgp-encrypted")
- (method . mime-article/decrypt-pgp)
+(set-atype 'mime-acting-condition
+ '((type . application)(subtype . pgp-encrypted)
+ (method . mime-method-to-decrypt-application/pgp-encrypted)
))
;;;
;;; It is based on RFC 2015.
-(defun mime-article/add-pgp-keys (beg end cal)
+(defun mime-method-to-add-application/pgp-keys (beg end cal)
(let* ((cnum (mime-article/point-content-number beg))
(new-name (format "%s-%s" (buffer-name) cnum))
(encoding (cdr (assq 'encoding cal)))
(kill-buffer (current-buffer))
))
-(set-atype 'mime/content-decoding-condition
- '((type . "application/pgp-keys")
- (method . mime-article/add-pgp-keys)
+(set-atype 'mime-acting-condition
+ '((type . application)(subtype . pgp-keys)
+ (method . mime-method-to-add-application/pgp-keys)
))
projects / elisp / semi.git / blobdiff