X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=09f69f0749e413722f45edd28ed56a55d6b71c8d;hb=24c376fab8b0785deeb6e1df796624a035090b20;hp=6ca5e60580e00b1191bc76d35f6323326b2457dd;hpb=adb6ad2f0f841fbd143835196d5ab976d04695d8;p=elisp%2Fepg.git

diff --git a/pgg-epg.el b/pgg-epg.el
index 6ca5e60..09f69f0 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 <ueno@unixuser.org>
-;; Keywords: PGP, GnuPG
+;; Keywords: PGP, GnuPG, Gnus
 
 ;; This file is part of EasyPG.
 
@@ -80,7 +80,7 @@ passphrase cache or user."
 				  (buffer-substring start end)
 				  (mapcar
 				   (lambda (recipient)
-				     (car (epg-list-keys recipient)))
+				     (car (epg-list-keys context recipient)))
 				   (if pgg-encrypt-for-me
 				       (cons pgg-default-user-id recipients)
 				     recipients))
@@ -124,13 +124,16 @@ passphrase cache or user."
       (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))
       (insert plain))
@@ -149,6 +152,9 @@ passphrase cache or user."
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback)
+    (epg-context-set-signers
+     context
+     (list (car (epg-list-keys context pgg-default-user-id t))))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
       (erase-buffer)
@@ -159,7 +165,7 @@ passphrase cache or user."
 	      (epg-sign-string context
 			       (buffer-substring start end)
 			       (if cleartext
-				   'clearsign
+				   'clear
 				 'detached))
 	      pgg-epg-secret-key-id-list nil)
       (error
@@ -259,6 +265,12 @@ Add all public keys in region between START and END to the keyring."
 	       "From unknown user")))
     "From unknown user"))
 
+(defun pgg-epg-lookup-key (string &optional type)
+  "Search keys associated with STRING."
+  (mapcar (lambda (key)
+	    (epg-sub-key-id (car (epg-key-sub-key-list key))))
+	  (epg-list-keys (epg-make-context) string (not (null type)))))
+
 (provide 'pgg-epg)
 
 ;;; pgg-epg.el ends here