X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-pgp.el;h=d6c198a1622806966f669cd44b0cebb2499b229d;hb=HEAD;hp=bb9a422e9e8cba9e6df17633deeeb122c811bd8b;hpb=38ef9edb7c1d450ae8e87fea8fded4912af43807;p=elisp%2Ftm.git diff --git a/tm-pgp.el b/tm-pgp.el index bb9a422..d6c198a 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -1,11 +1,10 @@ ;;; tm-pgp.el --- tm-view internal methods for PGP. -;; Copyright (C) 1995,1996 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997 MORIOKA Tomohiko ;; Author: MORIOKA Tomohiko -;; Maintainer: MORIOKA Tomohiko ;; Created: 1995/12/7 -;; Version: $Id: tm-pgp.el,v 7.24 1996/10/18 04:47:02 morioka Exp $ +;; Version: $Id: tm-pgp.el,v 7.33 1997/02/13 14:51:04 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, PGP, security ;; This file is part of tm (Tools for MIME). @@ -29,20 +28,18 @@ ;; This module is based on 2 drafts about PGP MIME integration: -;; - draft-elkins-pem-pgp-04.txt -;; ``MIME Security with Pretty Good Privacy (PGP)'' +;; - RFC 2015: "MIME Security with Pretty Good Privacy (PGP)" ;; by Michael Elkins (1996/6) ;; -;; - draft-kazu-pgp-mime-00.txt -;; ``PGP MIME Integration'' -;; by Kazuhiko Yamamoto (1995/10) +;; - draft-kazu-pgp-mime-00.txt: "PGP MIME Integration" +;; by Kazuhiko Yamamoto +;; (1995/10; expired) ;; -;; These drafts may be contrary to each other. You should decide -;; which you support. +;; These drafts may be contrary to each other. You should decide +;; which you support. (Maybe you should use PGP/MIME) ;;; Code: -(require 'mailcrypt) (require 'tm-play) @@ -53,19 +50,22 @@ (defun mime-article/view-application/pgp (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) (cur-buf (current-buffer)) + (p-win (or (get-buffer-window mime::article/preview-buffer) + (get-largest-window))) (new-name (format "%s-%s" (buffer-name) cnum)) (mother mime::article/preview-buffer) (mode major-mode) - code-converter str) - (setq str (buffer-substring beg end)) - (switch-to-buffer new-name) + code-converter + (str (buffer-substring beg end)) + ) + (set-buffer (get-buffer-create new-name)) (erase-buffer) (insert str) (cond ((progn (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t) ) - (mc-verify) + (funcall (pgp-function 'verify)) (goto-char (point-min)) (delete-region (point-min) @@ -91,7 +91,7 @@ (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t) ) - (as-binary-process (mc-decrypt)) + (as-binary-process (funcall (pgp-function 'decrypt))) (goto-char (point-min)) (delete-region (point-min) (and @@ -101,7 +101,8 @@ )) (setq major-mode 'mime/show-message-mode) (setq mime::article/code-converter code-converter) - (mime/viewer-mode mother) + (save-window-excursion (mime/viewer-mode mother)) + (set-window-buffer p-win mime::article/preview-buffer) )) (set-atype 'mime/content-decoding-condition @@ -117,7 +118,7 @@ ;;; @ Internal method for application/pgp-signature ;;; -;;; It is based on draft-elkins-pem-pgp-02.txt +;;; It is based on RFC 2015. (defvar tm-pgp::default-language 'en "*Symbol of language for pgp. @@ -186,15 +187,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (while (re-search-forward "\n" nil t) (replace-match "\r\n") ) - (let ((mc-flag nil) ; for Mule - (file-coding-system *noconv*) - kanji-flag ; for NEmacs - (emx-binary-mode t) ; for OS/2 - jka-compr-compression-info-list ; for jka-compr - jam-zcat-filename-list ; for jam-zcat - require-final-newline) - (write-file orig-file) - ) + (as-binary-output-file (write-file orig-file)) (kill-buffer (current-buffer)) ) (save-excursion @@ -210,16 +203,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name))) (insert str) (mime-decode-region (point-min)(point-max) encoding) - (let ((mc-flag nil) ; for Mule - (file-coding-system *noconv*) - kanji-flag ; for NEmacs - (emx-binary-mode t) ; for OS/2 - jka-compr-compression-info-list ; for jka-compr - jam-zcat-filename-list ; for jam-zcat - require-final-newline) - (write-file sig-file) - ) - ;;(get-buffer-create mime/output-buffer-name) + (as-binary-output-file (write-file sig-file)) (or (mime::article/call-pgp-to-check-signature mime/output-buffer-name orig-file) (let (pgp-id) @@ -243,7 +227,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (format "Key %s not found; attempt to fetch? " pgp-id)) ) (progn - (mc-pgp-fetch-key (cons nil pgp-id)) + (funcall (pgp-function 'fetch-key) (cons nil pgp-id)) (mime::article/call-pgp-to-check-signature mime/output-buffer-name orig-file) )) @@ -264,7 +248,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") ;;; @ Internal method for application/pgp-encrypted ;;; -;;; It is based on draft-elkins-pem-pgp-02.txt +;;; It is based on RFC 2015. (defun mime-article/decrypt-pgp (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) @@ -290,9 +274,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") ;;; @ Internal method for application/pgp-keys ;;; -;;; It is based on draft-elkins-pem-pgp-02.txt - -(autoload 'mc-snarf-keys "mc-toplev") +;;; It is based on RFC 2015. (defun mime-article/add-pgp-keys (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) @@ -313,7 +295,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (delete-region (point-min) (match-end 0)) ) (mime-decode-region (point-min)(point-max) encoding) - (mc-snarf-keys) + (funcall (pgp-function 'snarf-keys)) (kill-buffer (current-buffer)) ))