"Internal method to verify multipart/signed."
(mime-play-entity
(nth 1 (mime-entity-children entity)) ; entity-info of signature
- (cdr (assq 'mode situation)) ; play-mode
+ (list (assq 'mode situation)) ; play-mode
))
;;; It is based on draft-kazu-pgp-mime-00.txt (PGP-kazu).
(defun mime-view-application/pgp (entity situation)
- (let* ((p-win (or (get-buffer-window mime-preview-buffer)
+ (let* ((p-win (or (get-buffer-window (current-buffer))
(get-largest-window)))
(new-name
(format "%s-%s" (buffer-name) (mime-entity-number entity)))
- (mother mime-preview-buffer)
+ (mother (current-buffer))
representation-type)
(set-buffer (get-buffer-create new-name))
(erase-buffer)
- (insert-buffer-substring (mime-entity-buffer entity)
- (mime-entity-point-min entity)
- (mime-entity-point-max entity))
+ (mime-insert-entity entity)
(cond ((progn
(goto-char (point-min))
(re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
'((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 orig-file)
+(defun mime-pgp-check-signature (output-buffer sig-file orig-file)
(save-excursion
(set-buffer output-buffer)
(erase-buffer))
(status (call-process-region (point-min)(point-max)
mime-pgp-command
nil output-buffer nil
- orig-file (format "+language=%s" lang)))
+ sig-file orig-file (format "+language=%s" lang)))
(regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist))))
(if (= status 0)
(save-excursion
(mime-write-entity orig-entity orig-file)
(save-excursion (mime-show-echo-buffer))
(mime-write-entity-content entity sig-file)
- (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
+ (or (mime-pgp-check-signature mime-echo-buffer-name sig-file orig-file)
(let (pgp-id)
(save-excursion
(set-buffer mime-echo-buffer-name)
(defun mime-add-application/pgp-keys (entity situation)
(let* ((start (mime-entity-point-min entity))
(end (mime-entity-point-max entity))
- (entity-number (mime-raw-point-to-entity-number start))
+ (entity-number (mime-entity-number entity))
(new-name (format "%s-%s" (buffer-name) entity-number))
(encoding (cdr (assq 'encoding situation)))
str)