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

[elisp/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index cb0cb3b..c95f0e1 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -549,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))
@@ -591,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))))
@@ -606,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))))
@@ -619,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")
@@ -719,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
@@ -743,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
@@ -815,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