* epa.el (epa-decrypt-file): Set passphrase-callback.

[elisp/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index aae2313..c95f0e1 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -362,8 +362,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
                 (buffer-live-p epa-keys-buffer))
       (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
     (let ((inhibit-read-only t)
-         buffer-read-only
-         point)
+         buffer-read-only)
       (set-buffer epa-keys-buffer)
       (erase-buffer)
       (insert prompt "\n")
@@ -382,30 +381,28 @@ If SECRET is non-nil, list secret keys instead of public keys."
       (insert "\n\n")
       (if names
          (while names
-           (setq point (point))
            (epa-insert-keys context (car names) secret)
-           (goto-char point)
-           (epa-mark)
+           (if (get-text-property (point) 'epa-list-keys)
+               (epa-mark))
            (goto-char (point-max))
            (setq names (cdr names)))
        (if secret
            (progn
-             (setq point (point))
              (epa-insert-keys context nil secret)
-             (goto-char point)
-             (epa-mark))
+             (if (get-text-property (point) 'epa-list-keys)
+                 (epa-mark)))
          (epa-insert-keys context nil nil)))
       (epa-keys-mode)
       (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))
       (pop-to-buffer (current-buffer)))
     (unwind-protect
-         (progn
-           (recursive-edit)
-           (epa-marked-keys))
-       (if (get-buffer-window epa-keys-buffer)
-           (delete-window (get-buffer-window epa-keys-buffer)))
-       (kill-buffer epa-keys-buffer))))
+       (progn
+         (recursive-edit)
+         (epa-marked-keys))
+      (if (get-buffer-window epa-keys-buffer)
+         (delete-window (get-buffer-window epa-keys-buffer)))
+      (kill-buffer epa-keys-buffer))))
 
 (defun epa-show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
@@ -499,6 +496,11 @@ If ARG is non-nil, mark the current line."
   (interactive "P")
   (epa-mark (not arg)))
 
+(defun epa-toggle-mark ()
+  "Toggle the mark the current line."
+  (interactive)
+  (epa-mark (eq (char-after (save-excursion (beginning-of-line) (point))) ?*)))
+
 (defun epa-exit-buffer ()
   "Exit the current buffer.
 `epa-exit-buffer-function' is called if it is set."
@@ -547,6 +549,8 @@ If ARG is non-nil, mark the current line."
                  (file-name-directory default-name)
                  default-name)))
         (context (epg-make-context)))
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)
     (message "Decrypting %s...done" (file-name-nondirectory file))
@@ -589,6 +593,8 @@ If no one is selected, default secret key is used.  "
     (epg-context-set-armor context epa-armor)
     (epg-context-set-textmode context epa-textmode)
     (epg-context-set-signers context signers)
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
     (message "Signing %s..." (file-name-nondirectory file))
     (epg-sign-file context file signature mode)
     (message "Signing %s...done" (file-name-nondirectory file))))
@@ -604,6 +610,8 @@ If no one is selected, symmetric encryption will be performed.  ")))
        (context (epg-make-context)))
     (epg-context-set-armor context epa-armor)
     (epg-context-set-textmode context epa-textmode)
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
     (message "Encrypting %s..." (file-name-nondirectory file))
     (epg-encrypt-file context file recipients cipher)
     (message "Encrypting %s...done" (file-name-nondirectory file))))
@@ -617,6 +625,8 @@ Don't use this command in Lisp programs!"
   (save-excursion
     (let ((context (epg-make-context))
          plain)
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
       (message "Decrypting...")
       (setq plain (epg-decrypt-string context (buffer-substring start end)))
       (message "Decrypting...done")
@@ -717,6 +727,8 @@ If no one is selected, default secret key is used.  "
       (epg-context-set-armor context epa-armor)
       (epg-context-set-textmode context epa-textmode)
       (epg-context-set-signers context signers)
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
       (message "Signing...")
       (setq signature (epg-sign-string context
                                       (encode-coding-string
@@ -741,6 +753,8 @@ If no one is selected, symmetric encryption will be performed.  ")))
          cipher)
       (epg-context-set-armor context epa-armor)
       (epg-context-set-textmode context epa-textmode)
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
       (message "Encrypting...")
       (setq cipher (epg-encrypt-string context
                                       (encode-coding-string
@@ -813,10 +827,30 @@ If LOCAL is non-nil, the signature is marked as non exportable."
        (error "No keys selected"))
      (list keys current-prefix-arg)))
   (let ((context (epg-make-context)))
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
     (message "Signing keys...")
     (epg-sign-keys context keys local)
     (message "Signing keys...done")))
 
+(defun epa-passphrase-callback-function (context key-id handback)
+  (if (eq key-id 'SYM)
+      (read-passwd "Passphrase for symmetric encryption: "
+                  (eq (epg-context-operation context) 'encrypt))
+    (read-passwd
+     (if (eq key-id 'PIN)
+       "Passphrase for PIN: "
+       (let ((entry (assoc key-id epg-user-id-alist)))
+        (if entry
+            (format "Passphrase for %s %s: " key-id (cdr entry))
+          (format "Passphrase for %s: " key-id)))))))
+
+(defun epa-progress-callback-function (context what char current total
+                                              handback)
+  (message "%s: %d%% (%d/%d)" what
+          (if (> total 0) (floor (* (/ current (float total)) 100)) 0)
+          current total))
+
 (provide 'epa)
 
 ;;; epa.el ends here