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

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index 49f1815..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")))
@@ -115,9 +116,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)
@@ -153,12 +153,7 @@
 
 (luna-define-method encrypt-region ((scheme pgg-scheme-pgp5) 
 				    start end recipients)
-  (let* ((pgg-pgp5-user-id pgg-default-user-id)
-	 (passphrase
-	  (pgg-read-passphrase 
-	   (format "PGP passphrase for %s: " pgg-pgp5-user-id)
-	   (luna-send scheme 'lookup-key-string 
-		      scheme pgg-pgp5-user-id 'encrypt)))
+  (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
 	 (args 
 	  `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
 	    ,@(if recipients
@@ -166,30 +161,18 @@
 			 (mapcar (lambda (rcpt) 
 				   (list "-r" 
 					 (concat "\"" rcpt "\""))) 
-				 recipients))))))
-    (pgg-pgp5-process-region start end passphrase 
+				 (append recipients
+					 (if pgg-encrypt-for-me
+					     (list pgg-pgp5-user-id)))))))
+	  ))
+    (pgg-pgp5-process-region start end nil
 			     pgg-pgp5-pgpe-program args)
-    (with-current-buffer pgg-output-buffer
-      (if (zerop (buffer-size))
-	  (insert-buffer-substring pgg-errors-buffer)
-	(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
-      (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-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)
@@ -204,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)
@@ -217,26 +200,30 @@
     (pgg-pgp5-process-region start end passphrase 
 			     pgg-pgp5-pgps-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
 	(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-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)))
@@ -249,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 "\""))))
@@ -260,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 
@@ -270,6 +257,7 @@
     (pgg-pgp5-process-region start end nil
 			     pgg-pgp5-pgpk-program args)
     (delete-file key-file)
+    (pgg-process-when-success nil)
     ))
 
 (provide 'pgg-pgp5)