X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=27b6e4295481ca3af694298ecf474133bf38cf49;hb=d00ee5e0ec545a77b645d8faaf6961deb7073346;hp=b30038a79216e63b7ab17abe5011bffcae0da132;hpb=4096aa3c6b7ea99b15ad6ad4165b1ca84dbab395;p=elisp%2Fepg.git diff --git a/pgg-epg.el b/pgg-epg.el index b30038a..27b6e42 100644 --- a/pgg-epg.el +++ b/pgg-epg.el @@ -1,10 +1,10 @@ -;;; pgg-epg.el --- Gnus/PGG backend of EasyPG. +;;; pgg-epg.el --- Gnus' PGG backend of EasyPG. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Copyright (C) 2006 Daiki Ueno ;; Author: Daiki Ueno -;; Keywords: PGP, GnuPG +;; Keywords: PGP, GnuPG, Gnus ;; This file is part of EasyPG. @@ -23,11 +23,37 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +;;; Commentary: + +;; To use, add (setq pgg-scheme 'epg) to your ~/.gnus. + ;;; Code: (require 'epg) (eval-when-compile (require 'pgg)) +(defvar pgg-epg-secret-key-id-list nil) + +(defun pgg-epg-passphrase-callback (context key-id ignore) + (if (eq key-id 'SYM) + (epg-passphrase-callback-function context key-id nil) + (let* ((entry (assoc key-id epg-user-id-alist)) + (passphrase + (pgg-read-passphrase + (format "GnuPG passphrase for %s: " + (if entry + (cdr entry) + key-id)) + (if (eq key-id 'PIN) + "PIN" + key-id)))) + (when passphrase + (pgg-add-passphrase-to-cache key-id passphrase) + (setq pgg-epg-secret-key-id-list + (cons key-id pgg-epg-secret-key-id-list)) + (copy-sequence passphrase))))) + +(defvar inhibit-redisplay) (defun pgg-epg-encrypt-region (start end recipients &optional sign passphrase) "This function is for internal use only. @@ -38,17 +64,35 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt. If optional PASSPHRASE is not specified, it will be obtained from the passphrase cache or user." (let ((context (epg-make-context)) + (inhibit-redisplay t) ;Gnus users don't like flickering cipher) (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) - (setq cipher (epg-encrypt-string context (buffer-substring start end) - (if pgg-encrypt-for-me - (cons pgg-default-user-id recipients) - recipients) - sign t)) + (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback) (save-excursion (set-buffer (get-buffer-create pgg-output-buffer)) (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) + (condition-case error + (setq cipher + (epg-encrypt-string context + (buffer-substring start end) + (mapcar + (lambda (recipient) + (car (epg-list-keys recipient))) + (if pgg-encrypt-for-me + (cons pgg-default-user-id recipients) + recipients)) + sign t) + pgg-epg-secret-key-id-list nil) + (error + (while pgg-epg-secret-key-id-list + (pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list)) + (setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list))) + (signal (car error) (cdr error)))) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) (insert cipher)) t)) @@ -69,13 +113,29 @@ Decrypt the current region between START and END. If optional PASSPHRASE is not specified, it will be obtained from the passphrase cache or user." (let ((context (epg-make-context)) + (inhibit-redisplay t) ;Gnus users don't like flickering plain) (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) - (setq plain (epg-decrypt-string context (buffer-substring start end))) + (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback) (save-excursion (set-buffer (get-buffer-create pgg-output-buffer)) (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) + (condition-case error + (setq plain + (epg-decrypt-string context (buffer-substring start end)) + pgg-epg-secret-key-id-list nil) + (error + (while pgg-epg-secret-key-id-list + (pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list)) + (setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list))) + (signal (car error) (cdr error)))) + (if pgg-text-mode + (setq plain (decode-coding-string plain 'raw-text))) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) (insert plain)) t)) @@ -87,76 +147,108 @@ Make detached signature from text between START and END. If optional PASSPHRASE is not specified, it will be obtained from the passphrase cache or user." (let ((context (epg-make-context)) + (inhibit-redisplay t) ;Gnus users don't like flickering signature) (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) - (setq signature (epg-sign-string context (buffer-substring start end) - (if cleartext - 'cleartext - 'detached))) + (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) + (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) + (condition-case error + (setq signature + (epg-sign-string context + (buffer-substring start end) + (if cleartext + 'clear + 'detached)) + pgg-epg-secret-key-id-list nil) + (error + (while pgg-epg-secret-key-id-list + (pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list)) + (setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list))) + (signal (car error) (cdr error)))) (save-excursion (set-buffer (get-buffer-create pgg-output-buffer)) (insert signature)) t)) -(defvar pgg-epg-signature nil) +(defvar pgg-epg-signatures nil) (defun pgg-epg-verify-region (start end &optional signature) "This function is for internal use only. Verify region between START and END as the detached signature SIGNATURE." (let ((context (epg-make-context)) - pointer) + (inhibit-redisplay t)) ;Gnus users don't like flickering (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) + (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) (if signature - (epg-verify-file context signature (buffer-substring start end)) + (epg-verify-string context + (with-temp-buffer + (insert-file-contents signature) + (buffer-string)) + (buffer-substring start end)) (epg-verify-string context (buffer-substring start end))) - (setq signature (reverse (epg-context-result-for context 'verify)) - pointer signature) (save-excursion (set-buffer (get-buffer-create pgg-errors-buffer)) - (make-local-variable 'pgg-epg-signature) - (setq pgg-epg-signature (car signature)) - (erase-buffer) - (while pointer - (insert (format "%s: %s %s %s\n" - (epg-signature-status (car pointer)) - (epg-signature-key-id (car pointer)) - (epg-signature-user-id (car pointer)) - (epg-signature-validity (car pointer)))) - (setq pointer (cdr pointer)))) - signature)) + (make-local-variable 'pgg-epg-signatures) + (setq pgg-epg-signatures (epg-context-result-for context 'verify)) + (insert (epg-verify-result-to-string pgg-epg-signatures))) + t)) (defun pgg-epg-insert-key () "This function is for internal use only. Insert public key at point." (let ((context (epg-make-context)) - pointer) + (inhibit-redisplay t) ;Gnus users don't like flickering + ) (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) - (insert (epg-export-keys context pgg-default-user-id)))) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) + (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) + (insert (epg-export-keys-to-string context pgg-default-user-id)))) (defun pgg-epg-snarf-keys-region (start end) "This function is for internal use only. Add all public keys in region between START and END to the keyring." (let ((context (epg-make-context)) - pointer) + (inhibit-redisplay t) ;Gnus users don't like flickering + ) (epg-context-set-armor context t) (epg-context-set-textmode context pgg-text-mode) - (epg-import-keys context (buffer-substring start end)))) + (save-excursion + (set-buffer (get-buffer-create pgg-output-buffer)) + (erase-buffer) + (set-buffer (get-buffer-create pgg-errors-buffer)) + (erase-buffer)) + (epg-import-keys-from-string context (buffer-substring start end)))) +(eval-when-compile + (autoload 'mml2015-gpg-pretty-print-fpr "mml2015")) (defun mml2015-gpg-extract-signature-details () - (if pgg-epg-signature - (let* ((expired (eq (epg-signature-status pgg-epg-signature) + (if pgg-epg-signatures + (let* ((expired (eq (epg-signature-status (car pgg-epg-signatures)) 'key-expired)) - (signer (cons (epg-signature-key-id pgg-epg-signature) - (epg-signature-user-id pgg-epg-signature))) - (fprint (epg-signature-fingerprint pgg-epg-signature)) + (signer (cons (epg-signature-key-id (car pgg-epg-signatures)) + (cdr (assoc (epg-signature-key-id + (car pgg-epg-signatures)) + epg-user-id-alist)))) + (fprint (epg-signature-fingerprint (car pgg-epg-signatures))) (trust-good-enough-p - (memq (epg-signature-validity pgg-epg-signature) + (memq (epg-signature-validity (car pgg-epg-signatures)) '(marginal fully ultimate)))) (cond ((and signer fprint) (concat (cdr signer)