From: ueno Date: Tue, 18 Apr 2006 22:23:02 +0000 (+0000) Subject: * epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to X-Git-Tag: epgsm-branchpoint~27 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f0cf0f951e5534b14c3a798424ff6fdc40ad39a8;p=elisp%2Fepg.git * epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to passphrase-callback-function. --- diff --git a/ChangeLog b/ChangeLog index 866a960..926f454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-04-18 Daiki Ueno + * epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to + passphrase-callback-function. + +2006-04-18 Daiki Ueno + * epa.el (epa-export-keys): New command. * epg.el (epg-start-export-keys): Accept a list of epg-key object instead of a regexp. diff --git a/epa-file.el b/epa-file.el index 6ba67f2..86af182 100644 --- a/epa-file.el +++ b/epa-file.el @@ -39,8 +39,8 @@ (defvar epa-file-passphrase-alist nil) -(defun epa-file-passphrase-callback-function (key-id file) - (if (eq key-id 'SYM) +(defun epa-file-passphrase-callback-function (file) + (if (eq epg-key-id 'SYM) (let ((entry (assoc file epa-file-passphrase-alist)) passphrase) (or (copy-sequence (cdr entry)) @@ -49,10 +49,10 @@ (setq entry (list file) epa-file-passphrase-alist (cons entry epa-file-passphrase-alist))) - (setq passphrase (epg-passphrase-callback-function key-id nil)) + (setq passphrase (epg-passphrase-callback-function nil)) (setcdr entry (copy-sequence passphrase)) passphrase))) - (epg-passphrase-callback-function key-id nil))) + (epg-passphrase-callback-function nil))) (defun epa-file-handler (operation &rest args) (save-match-data diff --git a/epg.el b/epg.el index 8a70d21..f4c2f83 100644 --- a/epg.el +++ b/epg.el @@ -534,7 +534,6 @@ This function is for internal use only." (funcall (if (consp (epg-context-passphrase-callback epg-context)) (car (epg-context-passphrase-callback epg-context)) (epg-context-passphrase-callback epg-context)) - epg-key-id (if (consp (epg-context-passphrase-callback epg-context)) (cdr (epg-context-passphrase-callback epg-context))))) string) @@ -717,16 +716,16 @@ This function is for internal use only." (cons (cons 'delete-problem (string-to-number (match-string 1 string))) (epg-context-result-for epg-context 'error))))) -(defun epg-passphrase-callback-function (key-id handback) +(defun epg-passphrase-callback-function (handback) (read-passwd - (if (eq key-id 'SYM) + (if (eq epg-key-id 'SYM) "Passphrase for symmetric encryption: " - (if (eq key-id 'PIN) + (if (eq epg-key-id 'PIN) "Passphrase for PIN: " - (let ((entry (assoc key-id epg-user-id-alist))) + (let ((entry (assoc epg-key-id epg-user-id-alist))) (if entry - (format "Passphrase for %s %s: " key-id (cdr entry)) - (format "Passphrase for %s: " key-id))))))) + (format "Passphrase for %s %s: " epg-key-id (cdr entry)) + (format "Passphrase for %s: " epg-key-id))))))) (defun epg-progress-callback-function (what char current total handback) (message "%s: %d%%/%d%%" what current total))