X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pgg-pgp5.el;h=e8066fbd9a7488899702319ef4cd9633d4b2dfed;hb=8dc29f35456a0c1f51e7282bf0e9b1e6497343c6;hp=494b678782fa10658db467e71266c7f70f567c87;hpb=87a62949376e3e45e4b07e9dd2d02c1220a69785;p=elisp%2Fsemi.git

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index 494b678..e8066fb 100644
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -101,9 +101,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")))
@@ -152,7 +153,7 @@
 
 (luna-define-method encrypt-region ((scheme pgg-scheme-pgp5) 
 				    start end recipients)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (args 
 	  `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
 	    ,@(if recipients
@@ -171,7 +172,7 @@
 
 (luna-define-method decrypt-region ((scheme pgg-scheme-pgp5) 
 				    start end)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (passphrase
 	  (pgg-read-passphrase 
 	   (format "PGP passphrase for %s: " pgg-pgp5-user-id)
@@ -186,7 +187,7 @@
 
 (luna-define-method sign-region ((scheme pgg-scheme-pgp5) 
 				 start end &optional clearsign)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (passphrase
 	  (pgg-read-passphrase 
 	   (format "PGP passphrase for %s: " pgg-pgp5-user-id)
@@ -205,17 +206,24 @@
 			     (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-pgp5) 
 				   start end &optional signature)
   (let* ((basename (expand-file-name "pgg" temporary-file-directory))
 	 (orig-file (make-temp-name basename))
-	 (args '("+verbose=1" "+batchmode=1" "+language=us")))
-    (write-region-as-binary start end orig-file)
+	 (args '("+verbose=1" "+batchmode=1" "+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)))
@@ -228,7 +236,7 @@
     ))
 
 (luna-define-method insert-key ((scheme pgg-scheme-pgp5))
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (args
 	  (list "+verbose=1" "+batchmode=1" "+language=us" "-x" 
 		(concat "\"" pgg-pgp5-user-id "\""))))
@@ -239,7 +247,7 @@
 
 (luna-define-method snarf-keys-region ((scheme pgg-scheme-pgp5)
 				       start end)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (basename (expand-file-name "pgg" temporary-file-directory))
 	 (key-file (make-temp-name basename))
 	 (args