* pgg.el (pgg-remove-passphrase-cache): Add checking if

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

diff --git a/pgg-pgp.el b/pgg-pgp.el
index 7fe332d..9193660 100644 (file)
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -86,9 +86,10 @@
       (erase-buffer))
     (when passphrase
       (setenv "PGPPASSFD" "0"))
-    (setq process
-         (apply #'start-process-shell-command "*PGP*" output-buffer
-                program args))
+    (as-binary-process
+     (setq process
+          (apply #'start-process-shell-command "*PGP*" output-buffer
+                 program args)))
     (set-process-sentinel process 'ignore)
     (when passphrase
       (process-send-string process (concat passphrase "\n")))
@@ -100,9 +101,8 @@
          exit-status (process-exit-status process))
     (delete-process process)
     (with-current-buffer output-buffer
-      (goto-char (point-min))
-      (while (search-forward "\r$" nil t)
-       (replace-match ""))
+      (pgg-convert-lbt-region (point-min)(point-max) 'LF)
+
       (if (memq status '(stop signal))
          (error "%s exited abnormally: '%s'" program exit-status))
       (if (= 127 exit-status)
@@ -142,32 +142,24 @@
 
 (luna-define-method encrypt-region ((scheme pgg-scheme-pgp) 
                                    start end recipients)
-  (let* ((pgg-pgp-user-id pgg-default-user-id)
-        (passphrase
-         (pgg-read-passphrase 
-          (format "PGP passphrase for %s: " pgg-pgp-user-id)
-          (luna-send scheme 'lookup-key-string 
-                     scheme pgg-pgp-user-id 'encrypt)))
+  (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (args 
          `("+encrypttoself=off +verbose=1" "+batchmode"
            "+language=us" "-fate"
            ,@(if recipients
                  (mapcar (lambda (rcpt) (concat "\"" rcpt "\""))
-                         recipients)))))
-    (pgg-pgp-process-region start end passphrase 
+                         (append recipients
+                                 (if pgg-encrypt-for-me
+                                     (list pgg-pgp-user-id))))))
+         ))
+    (pgg-pgp-process-region start end nil
                            pgg-pgp-program args)
-    (pgg-process-when-success
-      (let ((packet 
-            (cdr (assq 1 (pgg-parse-armor-region 
-                          (point-min)(point-max))))))
-       (pgg-add-passphrase-cache 
-        (cdr (assq 'key-identifier packet))
-        passphrase)))
+    (pgg-process-when-success nil)
     ))
 
 (luna-define-method decrypt-region ((scheme pgg-scheme-pgp) 
                                    start end)
-  (let* ((pgg-pgp-user-id pgg-default-user-id)
+  (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (passphrase
          (pgg-read-passphrase 
           (format "PGP passphrase for %s: " pgg-pgp-user-id)
@@ -182,7 +174,7 @@
 
 (luna-define-method sign-region ((scheme pgg-scheme-pgp) 
                                 start end &optional clearsign)
-  (let* ((pgg-pgp-user-id pgg-default-user-id)
+  (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (passphrase
          (pgg-read-passphrase 
           (format "PGP passphrase for %s: " pgg-pgp-user-id)
@@ -193,28 +185,33 @@
                "+verbose=1" "+language=us" "+batchmode"
                "-u" pgg-pgp-user-id)))
     (pgg-pgp-process-region start end passphrase 
-                            pgg-pgp-program args)
+                           pgg-pgp-program args)
     (pgg-process-when-success
       (goto-char (point-min))
-      (while (re-search-forward "\r$" nil t)
-       (replace-match ""))
-      (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
+      (when (re-search-forward "^-+BEGIN PGP" nil t);XXX
        (let ((packet 
               (cdr (assq 2 (pgg-parse-armor-region 
                             (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-pgp) 
                                   start end &optional signature)
   (let* ((basename (expand-file-name "pgg" temporary-file-directory))
         (orig-file (make-temp-name basename))
-        (args '("+verbose=1" "+batchmode" "+language=us")))
-    (write-region-as-binary start end orig-file)
+        (args '("+verbose=1" "+batchmode" "+language=us"))
+        (orig-mode (default-file-modes)))
+    (unwind-protect
+       (progn
+         (set-default-file-modes 448)
+         (write-region-as-binary start end orig-file)
+         )
+      (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
       (setq args (append args (list signature orig-file)))
@@ -223,11 +220,21 @@
                            pgg-pgp-program args)
     (delete-file orig-file)
     (if signature (delete-file signature))
-    (pgg-process-when-success nil)
+    (pgg-process-when-success
+      (goto-char (point-min))
+      (let ((case-fold-search t))
+       (while (re-search-forward "^warning: " nil t)
+         (delete-region (match-beginning 0)
+                        (progn (beginning-of-line 2) (point)))))
+      (goto-char (point-min))
+      (when (re-search-forward "^\\.$" nil t)
+       (delete-region (point-min) 
+                      (progn (beginning-of-line 2)
+                             (point)))))
     ))
 
 (luna-define-method insert-key ((scheme pgg-scheme-pgp))
-  (let* ((pgg-pgp-user-id pgg-default-user-id)
+  (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (args
          (list "+verbose=1" "+batchmode" "+language=us" "-kxaf" 
                (concat "\"" pgg-pgp-user-id "\""))))
@@ -238,7 +245,7 @@
 
 (luna-define-method snarf-keys-region ((scheme pgg-scheme-pgp)
                                       start end)
-  (let* ((pgg-pgp-user-id pgg-default-user-id)
+  (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (basename (expand-file-name "pgg" temporary-file-directory))
         (key-file (make-temp-name basename))
         (args 
@@ -248,6 +255,7 @@
     (pgg-pgp-process-region start end nil
                            pgg-pgp-program args)
     (delete-file key-file)
+    (pgg-process-when-success nil)
     ))
 
 (provide 'pgg-pgp)