X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-pgp.el;h=4e8635e850d6f052ddcccbc5a9faf1d0219c4ba4;hb=cd47eed235f4258380f6d9b401c2fb1fc884931c;hp=1d2c1f0a80044c10eb69ea48544f093bfe7d31e7;hpb=dd258a793c3c7c88ad91d59192ab55bbf1082a8f;p=elisp%2Ftm.git diff --git a/tm-pgp.el b/tm-pgp.el index 1d2c1f0..4e8635e 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -2,13 +2,13 @@ ;;; tm-pgp.el --- tm-view internal methods for PGP. ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; Copyright (C) 1995,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/7 ;;; Version: -;;; $Id: tm-pgp.el,v 7.2 1995/12/17 14:29:17 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.18 1996/07/15 14:03:34 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -29,9 +29,9 @@ ;;; ;;; Commentary: ;;; This module is based on 2 drafts about PGP MIME integration: -;;; - draft-elkins-pem-pgp-01.txt +;;; - draft-elkins-pem-pgp-02.txt ;;; ``MIME Security with Pretty Good Privacy (PGP)'' -;;; by Michael Elkins (1995/9) +;;; by Michael Elkins (1995/11) ;;; - draft-kazu-pgp-mime-00.txt ;;; ``PGP MIME Integration'' ;;; by Kazuhiko Yamamoto (1995/10) @@ -53,10 +53,8 @@ (cur-buf (current-buffer)) (new-name (format "%s-%s" (buffer-name) cnum)) (mother mime::article/preview-buffer) - (code-converter - (or (cdr (assq major-mode mime-viewer/code-converter-alist)) - 'mime-viewer/default-code-convert-region)) - str) + (mode major-mode) + code-converter str) (setq str (buffer-substring beg end)) (switch-to-buffer new-name) (erase-buffer) @@ -82,17 +80,22 @@ (while (re-search-forward "^- -" nil t) (replace-match "-") ) + (setq code-converter + (or + (cdr (assq mode mime-viewer/code-converter-alist)) + (function mime-viewer/default-code-convert-region))) ) ((progn (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t) ) - (mc-decrypt) + (as-binary-process (mc-decrypt)) (goto-char (point-min)) (delete-region (point-min) (and (search-forward "\n\n") (match-end 0))) + (setq code-converter (function mime-charset-decode-region)) )) (setq major-mode 'mime/show-message-mode) (setq mime::article/code-converter code-converter) @@ -112,10 +115,35 @@ ;;; @ Internal method for application/pgp-signature ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt + +(defvar tm-pgp::good-signature-regexp "Good signature from user.*$") + +(defvar tm-pgp::key-expected-regexp + "Key matching expected Key ID \\(\\S +\\) not found") + +(defun mime::article/call-pgp-to-check-signature (output-buffer orig-file) + (save-excursion + (set-buffer output-buffer) + (erase-buffer) + ) + (let ((status + (call-process-region (point-min)(point-max) + "pgp" nil output-buffer nil orig-file))) + (if (= status 0) + (save-excursion + (set-buffer output-buffer) + (goto-char (point-min)) + (message + (if (re-search-forward tm-pgp::good-signature-regexp nil t) + (buffer-substring (match-beginning 0) (match-end 0)) + "Bad signature" + )) + )))) (defun mime-article/check-pgp-signature (beg end cal) - (let* ((cnum (mime-article/point-content-number beg)) + (let* ((encoding (cdr (assq 'encoding cal))) + (cnum (mime-article/point-content-number beg)) (rcnum (reverse cnum)) (rmcnum (cdr rcnum)) (knum (car rcnum)) @@ -140,10 +168,21 @@ (while (re-search-forward "\n" nil t) (replace-match "\r\n") ) - (write-file orig-file) + (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) + ) (kill-buffer (current-buffer)) ) (save-excursion + (mime-article/show-output-buffer) + ) + (save-excursion (setq str (buffer-substring (save-excursion (goto-char beg) @@ -152,10 +191,9 @@ end)) (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name))) (insert str) - (base64-decode-region (point-min)(point-max)) + (mime-decode-region (point-min)(point-max) encoding) (let ((mc-flag nil) ; for Mule - (file-coding-system - (if (featurep 'mule) *noconv*)) + (file-coding-system *noconv*) kanji-flag ; for NEmacs (emx-binary-mode t) ; for OS/2 jka-compr-compression-info-list ; for jka-compr @@ -163,21 +201,29 @@ require-final-newline) (write-file sig-file) ) - ;;(define-program-coding-system (current-buffer) "pgp" *noconv*) - (mime-article/show-output-buffer) - (setq status - (call-process-region (point-min)(point-max) - "pgp" - nil mime/output-buffer-name nil - orig-file)) - (kill-buffer kbuf) + ;;(get-buffer-create mime/output-buffer-name) + (or (mime::article/call-pgp-to-check-signature + mime/output-buffer-name orig-file) + (let (pgp-id) + (save-excursion + (set-buffer mime/output-buffer-name) + (goto-char (point-min)) + (if (re-search-forward tm-pgp::key-expected-regexp nil t) + (setq pgp-id + (concat "0x" (buffer-substring-no-properties + (match-beginning 1) + (match-end 1)))) + )) + (y-or-n-p + (format "Key %s not found; attempt to fetch? " pgp-id)) + (mc-pgp-fetch-key (cons nil pgp-id)) + (mime::article/call-pgp-to-check-signature + mime/output-buffer-name orig-file) + )) (let ((other-window-scroll-buffer mime/output-buffer-name)) (scroll-other-window 8) ) - ;; (if (= status 0) - ;; (message "Good signature!") - ;; (message "Bad signature!") - ;; ) + (kill-buffer kbuf) (delete-file orig-file) (delete-file sig-file) ))) @@ -190,7 +236,7 @@ ;;; @ Internal method for application/pgp-encrypted ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt (defun mime-article/decrypt-pgp (beg end cal) (let* ((cnum (mime-article/point-content-number beg)) @@ -216,7 +262,7 @@ ;;; @ Internal method for application/pgp-keys ;;; -;;; It is based on draft-elkins-pem-pgp-01.txt +;;; It is based on draft-elkins-pem-pgp-02.txt (autoload 'mc-snarf-keys "mc-toplev") @@ -238,7 +284,7 @@ (if (re-search-forward "^\n" nil t) (delete-region (point-min) (match-end 0)) ) - (mime/decode-region encoding (point-min)(point-max)) + (mime-decode-region (point-min)(point-max) encoding) (mc-snarf-keys) (kill-buffer (current-buffer)) )) @@ -253,3 +299,5 @@ ;;; (provide 'tm-pgp) + +;;; tm-pgp.el ends here