* smime.el (smime-encrypt-region): Delete entity header.

[elisp/semi.git] / pgg-gpg.el

diff --git a/pgg-gpg.el b/pgg-gpg.el
index 0f5a140..e6528b6 100644 (file)
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -92,9 +92,10 @@
     (with-current-buffer (get-buffer-create output-buffer)
       (buffer-disable-undo)
       (erase-buffer))
-    (setq process
-         (apply #'start-process-shell-command "*GnuPG*" output-buffer
-                program args))
+    (as-binary-process
+     (setq process
+          (apply #'start-process-shell-command "*GnuPG*" output-buffer
+                 program args)))
     (set-process-sentinel process 'ignore)
     (when passphrase
       (process-send-string process (concat passphrase "\n")))
@@ -149,12 +150,7 @@
 
 (luna-define-method encrypt-region ((scheme pgg-scheme-gpg) 
                                    start end recipients)
-  (let* ((pgg-gpg-user-id pgg-default-user-id)
-        (passphrase
-         (pgg-read-passphrase 
-          (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
-          (luna-send scheme 'lookup-key-string
-                     scheme pgg-gpg-user-id 'encrypt)))
+  (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
         (args 
          `("--batch" "--armor" "--always-trust" "--encrypt"
            ,@(if recipients
@@ -162,24 +158,20 @@
                         (mapcar (lambda (rcpt) 
                                   (list "--remote-user" 
                                         (concat "\"" rcpt "\""))) 
-                                recipients))))))
+                                (append recipients
+                                        (if pgg-encrypt-for-me
+                                            (list pgg-gpg-user-id)))))))
+         ))
     (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase 
-                             pgg-gpg-program args)
+      (pgg-gpg-process-region start end nil pgg-gpg-program args)
       )
     (pgg-process-when-success
-      (pgg-convert-lbt-region (point-min)(point-max) 'LF)
-      (let ((packet 
-            (cdr (assq 1 (pgg-parse-armor-region 
-                          (point-min)(point-max))))))
-       (pgg-add-passphrase-cache 
-        (cdr (assq 'key-identifier packet))
-        passphrase)))
+      (pgg-convert-lbt-region (point-min)(point-max) 'LF))
     ))
 
 (luna-define-method decrypt-region ((scheme pgg-scheme-gpg) 
                                    start end)
-  (let* ((pgg-gpg-user-id pgg-default-user-id)
+  (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
         (passphrase
          (pgg-read-passphrase 
           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
@@ -192,7 +184,7 @@
 
 (luna-define-method sign-region ((scheme pgg-scheme-gpg) 
                                 start end &optional cleartext)
-  (let* ((pgg-gpg-user-id pgg-default-user-id)
+  (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
         (passphrase
          (pgg-read-passphrase 
           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
@@ -215,9 +207,10 @@
                             (progn (beginning-of-line 2)
                                    (point))
                             (point-max))))))
-         (pgg-add-passphrase-cache 
-          (cdr (assq 'key-identifier packet))
-          passphrase))))
+         (if pgg-cache-passphrase
+             (pgg-add-passphrase-cache 
+              (cdr (assq 'key-identifier packet))
+              passphrase)))))
     ))
 
 (luna-define-method verify-region ((scheme pgg-scheme-gpg) 
@@ -247,7 +240,7 @@
     ))
 
 (luna-define-method insert-key ((scheme pgg-scheme-gpg))
-  (let* ((pgg-gpg-user-id pgg-default-user-id)
+  (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
         (args (list "--batch" "--export" "--armor" 
                     (concat "\"" pgg-gpg-user-id "\""))))
     (pgg-gpg-process-region (point)(point) nil pgg-gpg-program args)
@@ -286,4 +279,3 @@
 (provide 'pgg-gpg)
 
 ;;; pgg-gpg.el ends here
-