X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-pgp.el;h=bb9a422e9e8cba9e6df17633deeeb122c811bd8b;hb=ae1ded427f5277f562702498f45e1a96c372cca5;hp=6ebbd7225b49421eeee68e32c2797d5b82dcf6b9;hpb=ebd0dcfac7f3da06820141c0808072442aa8fda6;p=elisp%2Ftm.git diff --git a/tm-pgp.el b/tm-pgp.el index 6ebbd72..bb9a422 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -1,43 +1,45 @@ -;;; ;;; tm-pgp.el --- tm-view internal methods for PGP. -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995,1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1995/12/7 -;;; Version: -;;; $Id: tm-pgp.el,v 7.15 1996/05/27 08:16:38 morioka Exp $ -;;; Keywords: mail, news, MIME, multimedia, PGP, security -;;; -;;; This file is part of tm (Tools for MIME). -;;; -;;; This program is free software; you can redistribute it and/or -;;; modify it under the terms of the GNU General Public License as -;;; published by the Free Software Foundation; either version 2, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;; General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with This program. If not, write to the Free Software -;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; 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 $ +;; Keywords: mail, news, MIME, multimedia, PGP, security + +;; This file is part of tm (Tools for MIME). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + ;;; Commentary: -;;; This module is based on 2 drafts about PGP MIME integration: -;;; - draft-elkins-pem-pgp-02.txt -;;; ``MIME Security with Pretty Good Privacy (PGP)'' -;;; by Michael Elkins (1995/11) -;;; - draft-kazu-pgp-mime-00.txt -;;; ``PGP MIME Integration'' -;;; by Kazuhiko Yamamoto (1995/10) -;;; These drafts may be contrary to each other. You should decide -;;; which you support. -;;; + +;; This module is based on 2 drafts about PGP MIME integration: + +;; - draft-elkins-pem-pgp-04.txt +;; ``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) +;; +;; These drafts may be contrary to each other. You should decide +;; which you support. + ;;; Code: (require 'mailcrypt) @@ -89,19 +91,13 @@ (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t) ) - (let ((program-coding-system-alist - (if (boundp 'program-coding-system-alist) - (cons '((nil . ".*pgp.*") *noconv* . *noconv*) - program-coding-system-alist)) - )) - (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 code-converter (function mime-charset/decode-buffer)) )) (setq major-mode 'mime/show-message-mode) (setq mime::article/code-converter code-converter) @@ -123,28 +119,44 @@ ;;; ;;; It is based on draft-elkins-pem-pgp-02.txt -(defvar tm-pgp::good-signature-regexp "Good signature from user.*$") +(defvar tm-pgp::default-language 'en + "*Symbol of language for pgp. +It should be ISO 639 2 letter language code such as en, ja, ...") -(defvar tm-pgp::key-expected-regexp - "Key matching expected Key ID \\(\\S +\\) not found") +(defvar tm-pgp::good-signature-regexp-alist + '((en . "Good signature from user.*$")) + "Alist of language vs regexp to detect ``Good signature''.") + +(defvar tm-pgp::key-expected-regexp-alist + '((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) (save-excursion (set-buffer output-buffer) (erase-buffer) ) - (let ((status - (call-process-region (point-min)(point-max) - "pgp" nil output-buffer nil orig-file))) + (let* ((lang (or tm-pgp::default-language 'en)) + (status + (call-process-region (point-min)(point-max) + "pgp" nil output-buffer nil orig-file + (format "+language=%s" lang) + )) + (regexp (cdr (assq lang tm-pgp::good-signature-regexp-alist))) + ) (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" - )) + (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" + ))) )))) (defun mime-article/check-pgp-signature (beg end cal) @@ -175,8 +187,7 @@ (replace-match "\r\n") ) (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 @@ -187,6 +198,9 @@ (kill-buffer (current-buffer)) ) (save-excursion + (mime-article/show-output-buffer) + ) + (save-excursion (setq str (buffer-substring (save-excursion (goto-char beg) @@ -197,8 +211,7 @@ (insert str) (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 @@ -206,8 +219,6 @@ require-final-newline) (write-file sig-file) ) - ;;(define-program-coding-system (current-buffer) "pgp" *noconv*) - (mime-article/show-output-buffer) ;;(get-buffer-create mime/output-buffer-name) (or (mime::article/call-pgp-to-check-signature mime/output-buffer-name orig-file) @@ -215,17 +226,27 @@ (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 ((regexp (cdr (assq (or tm-pgp::default-language 'en) + tm-pgp::key-expected-regexp-alist)))) + (cond ((not (stringp regexp)) + (message + "Please specify right regexp for specified language") + ) + ((re-search-forward regexp nil t) + (setq pgp-id + (concat "0x" (buffer-substring-no-properties + (match-beginning 1) + (match-end 1)))) + )))) + (if (and pgp-id + (y-or-n-p + (format "Key %s not found; attempt to fetch? " pgp-id)) + ) + (progn + (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) @@ -307,4 +328,6 @@ (provide 'tm-pgp) +(run-hooks 'tm-pgp-load-hook) + ;;; tm-pgp.el ends here