-;;;
;;; 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 <morioka@jaist.ac.jp>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Created: 1995/12/7
-;;; Version:
-;;; $Id: tm-pgp.el,v 7.19 1996/07/18 12:20:32 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 <morioka@jaist.ac.jp>
+;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1995/12/7
+;; Version: $Id: tm-pgp.el,v 7.23 1996/10/03 07:52:09 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 <elkins@aero.org> (1995/11)
-;;; - draft-kazu-pgp-mime-00.txt
-;;; ``PGP MIME Integration''
-;;; by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp> (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 <elkins@aero.org> (1996/6)
+;;
+;; - draft-kazu-pgp-mime-00.txt
+;; ``PGP MIME Integration''
+;; by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp> (1995/10)
+;;
+;; These drafts may be contrary to each other. You should decide
+;; which you support.
+
;;; Code:
(require 'mailcrypt)
;;;
;;; 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::good-signature-regexp-alist
+ '((en . "Good signature from user.*$"))
+ "Alist of language vs regexp to detect ``Good signature''.")
-(defvar tm-pgp::key-expected-regexp
- "Key matching expected Key ID \\(\\S +\\) not found")
+(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)
(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)
projects / elisp / tm.git / blobdiff