X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=27b6e4295481ca3af694298ecf474133bf38cf49;hb=ba1a4d03b21a2575b3e3e4b3e686acd6b20aac2c;hp=a1705f59baf7c955923072d60599ad57d7b2e3a2;hpb=799a47403e4fa3cca542c7a0027bdd7d273e002f;p=elisp%2Fepg.git diff --git a/pgg-epg.el b/pgg-epg.el index a1705f5..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,6 +23,10 @@ ;; 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) @@ -30,24 +34,26 @@ (defvar pgg-epg-secret-key-id-list nil) -(defun pgg-epg-passphrase-callback (key-id ignore) +(defun pgg-epg-passphrase-callback (context key-id ignore) (if (eq key-id 'SYM) - (pgg-read-passphrase "GnuPG passphrase for symmetric encryption: ") - (let ((passphrase - (pgg-read-passphrase - (format "GnuPG passphrase for %s: " - (if entry - (cdr entry) - pgg-gpg-key-id)) - (if (eq pgg-gpg-key-id 'PIN) - "PIN" - pgg-gpg-key-id)))) + (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) - (copy-sequence passphrase) (setq pgg-epg-secret-key-id-list - (cons key-id 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. @@ -58,18 +64,28 @@ 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) (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) - (if pgg-encrypt-for-me - (cons pgg-default-user-id recipients) - recipients) - sign t)) + (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)) @@ -77,7 +93,6 @@ passphrase cache or user." (signal (car error) (cdr error)))) (save-excursion (set-buffer (get-buffer-create pgg-output-buffer)) - (erase-buffer) (insert cipher)) t)) @@ -98,20 +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) (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))) + (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)) - (erase-buffer) (insert plain)) t)) @@ -123,17 +147,24 @@ 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) (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 - 'clearsign - 'detached))) + '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)) @@ -141,7 +172,6 @@ passphrase cache or user." (signal (car error) (cdr error)))) (save-excursion (set-buffer (get-buffer-create pgg-output-buffer)) - (erase-buffer) (insert signature)) t)) @@ -151,9 +181,15 @@ passphrase cache or user." "This function is for internal use only. Verify region between START and END as the detached signature SIGNATURE." - (let ((context (epg-make-context))) + (let ((context (epg-make-context)) + (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-string context (with-temp-buffer @@ -165,7 +201,6 @@ Verify region between START and END as the detached signature SIGNATURE." (set-buffer (get-buffer-create pgg-errors-buffer)) (make-local-variable 'pgg-epg-signatures) (setq pgg-epg-signatures (epg-context-result-for context 'verify)) - (erase-buffer) (insert (epg-verify-result-to-string pgg-epg-signatures))) t)) @@ -174,27 +209,43 @@ Verify region between START and END as the detached signature SIGNATURE." 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-signatures (let* ((expired (eq (epg-signature-status (car pgg-epg-signatures)) 'key-expired)) (signer (cons (epg-signature-key-id (car pgg-epg-signatures)) - (epg-signature-user-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 (car pgg-epg-signatures))