;; Copyright (C) 1995,1996,1997,1998,1999 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;; Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
;; Created: 1995/12/7
;; Renamed: 1997/2/27 from tm-pgp.el
;; Keywords: PGP, security, MIME, multimedia, mail, news
;; by Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp> (1995/10;
;; expired)
+;; [OpenPGP/MIME] draft-yamamoto-openpgp-mime-00.txt: "MIME
+;; Security with OpenPGP (OpenPGP/MIME)" by Kazuhiko YAMAMOTO
+;; <kazu@iijlab.net> (1998/1)
+
;;; Code:
(require 'mime-play)
(require 'pgg-def)
-(require 'pgg-parse)
+
+(autoload 'pgg-decrypt-region "pgg"
+ "PGP decryption of current region." t)
+(autoload 'pgg-verify-region "pgg"
+ "PGP verification of current region." t)
+(autoload 'pgg-snarf-keys-region "pgg"
+ "Snarf PGP public keys in current region." t)
;;; @ Internal method for multipart/signed
(cond ((progn
(goto-char (point-min))
(re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
- (funcall (pgp-function 'verify)
- (point-min)(point-max))
+ (pgg-verify-region (match-beginning 0)(point-max) nil 'fetch)
(goto-char (point-min))
(delete-region
(point-min)
((progn
(goto-char (point-min))
(re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
- (funcall (pgp-function 'decrypt)
- (point-min)(point-max))
+ (pgg-decrypt-region (point-min)(point-max))
(delete-region (point-min)(point-max))
(insert-buffer pgg-output-buffer)
(setq representation-type 'binary)
;;; @ Internal method for application/pgp-signature
;;;
-;;; It is based on RFC 2015 (PGP/MIME).
-
-(defvar mime-pgp-command "pgp"
- "*Name of the PGP command.")
-
-(defvar mime-pgp-default-language 'en
- "*Symbol of language for pgp.
-It should be ISO 639 2 letter language code such as en, ja, ...")
-
-(defvar mime-pgp-good-signature-regexp-alist
- '((en . "Good signature from user.*$"))
- "Alist of language vs regexp to detect ``Good signature''.")
-
-(defvar mime-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-pgp-check-signature (output-buffer sig-file orig-file)
- (save-excursion
- (set-buffer output-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
- sig-file orig-file (format "+language=%s" lang)))
- (regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist))))
- (if (= status 0)
- (save-excursion
- (set-buffer output-buffer)
- (goto-char (point-min))
- (message
- (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")))
- ))))
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
(defun mime-verify-application/pgp-signature (entity situation)
"Internal method to check PGP/MIME signature."
(orig-entity (nth onum (mime-entity-children mother)))
(basename (expand-file-name "tm" temporary-file-directory))
(sig-file (concat (make-temp-name basename) ".asc"))
- )
- (save-excursion (mime-show-echo-buffer))
+ status)
+ (save-excursion
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (set-window-start
+ (get-buffer-window mime-echo-buffer-name)
+ (point-max))
+ )
(mime-write-entity-content entity sig-file)
- (with-temp-buffer
- (mime-insert-entity orig-entity)
- (goto-char (point-min))
- (while (progn (end-of-line) (not (eobp)))
- (insert "\r")
- (forward-line 1))
- (let ((pgg-output-buffer mime-echo-buffer-name))
- (funcall (pgp-function 'verify)
- (point-min)(point-max) sig-file)))
- (delete-file sig-file)
- ))
-
-(defun mime-display-application/pgp-signature (entity situation)
- (let ((packet
- (cdr (assq 2 (pgg-parse-armor (mime-entity-content entity)))))
- field)
- (insert
- "version: "
- (int-to-string (cdr (assq 'version packet)))
- "\n"
- "signature type: "
- (cdr (assq 'signature-type packet))
- "\n"
- (if (setq field (cdr (assq 'hash-algorithm packet)))
- (concat "hash algorithm: " (symbol-name field) "\n")
- "")
- (if (setq field (cdr (assq 'public-key-algorithm packet)))
- (concat "public key algorithm: " (symbol-name field) "\n")
- "")
- (if (setq field (cdr (assq 'key-identifier packet)))
- (concat "key identifier: " field "\n")
- "")
- (if (setq field (cdr (assq 'creation-time packet)))
- (concat "creation time: " (current-time-string field) "\n")
- "")
- (if (setq field (cdr (assq 'signature-expiry packet)))
- (concat "signature exipiration time: "
- (current-time-string field) "\n")
- "")
- (if (setq field (cdr (assq 'key-expiry packet)))
- (concat "key exipiration time: " (current-time-string field) "\n")
- "")
- (if (setq field (cdr (assq 'trust-level packet)))
- (concat "trust level: " (int-to-string field) "\n")
- "")
- (if (setq field (cdr (assq 'preferred-symmetric-key-algorithm packet)))
- (concat "preferred symmetric algorithm: "
- (symbol-name field) "\n")
- "")
- (if (setq field (cdr (assq 'preferred-hash-algorithm packet)))
- (concat "preferred hash algorithm: "
- (symbol-name field) "\n")
- "")
- (if (setq field (cdr (assq 'exportability packet)))
- (concat "signature exportable: "
- (if (< 0 field) "yes" "no") "\n")
- "")
- (if (setq field (cdr (assq 'revocability packet)))
- (concat "signature revocable: "
- (if (< 0 field) "yes" "no") "\n")
- "")
- (if (setq field (cdr (assq 'policy-url packet)))
- (concat "policy URL: " field "\n")
- "")
- (if (setq field
- (delq nil (mapcar
- (function (lambda (nn)
- (and (eq (car nn) 'notation) nn)))
- packet)))
- (concat "notations:\n"
- (mapconcat (lambda (nn)
- (concat " " (cadr nn) ": " (cddr nn)))
- field "\n")
- "\n")
- ""))
- (mime-add-url-buttons)
- (run-hooks 'mime-display-application/pgp-signature-hook)
+ (unwind-protect
+ (with-temp-buffer
+ (mime-insert-entity orig-entity)
+ (goto-char (point-min))
+ (while (progn (end-of-line) (not (eobp)))
+ (insert "\r")
+ (forward-line 1))
+ (setq status (pgg-verify-region (point-min)(point-max)
+ sig-file 'fetch))
+ (save-excursion
+ (set-buffer mime-echo-buffer-name)
+ (insert-buffer-substring (if status pgg-output-buffer
+ pgg-errors-buffer))))
+ (delete-file sig-file))
))
;;; @ Internal method for application/pgp-encrypted
;;;
-;;; It is based on RFC 2015 (PGP/MIME).
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
(defun mime-decrypt-application/pgp-encrypted (entity situation)
(let* ((entity-node-id (mime-entity-node-id entity))
(mime-view-application/pgp orig-entity situation)
))
-(defun mime-display-application/pgp-encrypted (entity situation)
- (let* ((entity-node-id (mime-entity-node-id entity))
- (mother (mime-entity-parent entity))
- (knum (car entity-node-id))
- (onum (if (> knum 0)
- (1- knum)
- (1+ knum)))
- (orig-entity (nth onum (mime-entity-children mother)))
- (packet (cdr (assq 1 (pgg-parse-armor
- (mime-entity-content orig-entity))))))
- (insert
- "version: "
- (int-to-string (cdr (assq 'version packet)))
- "\n"
- "public key identifier: "
- (cdr (assq 'public-key-identifier packet))
- "\n"
- "public key algorithm: "
- (symbol-name (cdr (assq 'public-key-algorithm packet)))
- "\n\n")
- (run-hooks 'mime-display-application/pgp-encrypted-hook)
- ))
;;; @ Internal method for application/pgp-keys
;;;
-;;; It is based on RFC 2015 (PGP/MIME).
+;;; It is based on RFC 2015 (PGP/MIME) and
+;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
(defun mime-add-application/pgp-keys (entity situation)
- (let* ((start (mime-entity-header-start-point entity))
- (end (mime-entity-body-end-point entity))
- (entity-number (mime-entity-number entity))
- (new-name (format "%s-%s" (buffer-name) entity-number))
- (encoding (cdr (assq 'encoding situation)))
- str)
- (setq str (buffer-substring start end))
- (switch-to-buffer new-name)
- (setq buffer-read-only nil)
- (erase-buffer)
- (insert str)
- (goto-char (point-min))
- (if (re-search-forward "^\n" nil t)
- (delete-region (point-min) (match-end 0))
- )
- (mime-decode-region (point-min)(point-max) encoding)
- (funcall (pgp-function 'snarf-keys)
- (point-min)(point-max))
- (kill-buffer (current-buffer))
- ))
-
-(defun mime-display-application/pgp-keys (entity situation)
- (let ((packet
- (cdr (assq 6 (pgg-parse-armor (mime-entity-content entity)))))
- field)
- (insert
- "version: "
- (int-to-string (cdr (assq 'version packet)))
- "\n"
- "creation time: "
- (current-time-string (cdr (assq 'creation-time packet)))
- "\n"
- "public key algorithm: "
- (symbol-name (cdr (assq 'public-key-algorithm packet)))
- "\n"
- (if (setq field (cdr (assq 'key-expiry packet)))
- (concat "key exipiration time: " (current-time-string field) "\n")
- ""))
- (run-hooks 'mime-display-application/pgp-keys-hook)
- ))
+ (save-excursion
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (set-window-start
+ (get-buffer-window mime-echo-buffer-name)
+ (point-max))
+ )
+ (with-temp-buffer
+ (mime-insert-entity-content entity)
+ (mime-decode-region (point-min) (point-max)
+ (cdr (assq 'encoding situation)))
+ (let ((status (pgg-snarf-keys-region (point-min)(point-max))))
+ (save-excursion
+ (set-buffer mime-echo-buffer-name)
+ (insert-buffer-substring (if status pgg-output-buffer
+ pgg-errors-buffer)))
+ )))
;;; @ end
projects / elisp / semi.git / blobdiff