X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=29611b9f9d7f9dfceb6fc48f305f6d1af68adcbc;hb=3ac19de3136bb8dec6581b8ef49a3e04c3c656a9;hp=d0d194fc014006a90c1c30e313f694955bc4c132;hpb=ac3c5f1e851519e110b8d908d388b48221334e66;p=elisp%2Fepg.git

diff --git a/epa-file.el b/epa-file.el
index d0d194f..29611b9 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -1,4 +1,4 @@
-;;; epa-file.el --- the EasyPG Assistant hooks for transparent file encryption
+;;; epa-file.el --- the EasyPG Assistant, transparent file encryption
 ;; Copyright (C) 2006 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -33,23 +33,27 @@
   "Regexp which matches filenames to be encrypted with GnuPG."
   :type 'regexp
   :group 'epa-file)
+
+(defvar epa-file-handler
+  (cons epa-file-name-regexp 'epa-file-handler))
   
-(defvar epa-passphrase-alist nil)
+(defvar epa-file-passphrase-alist nil)
 
-(defun epa-file-passphrase-callback-function (key-id buffer)
+(defun epa-file-passphrase-callback-function (context key-id file)
   (if (eq key-id 'SYM)
-      (let ((entry (assoc buffer epa-passphrase-alist))
+      (let ((entry (assoc file epa-file-passphrase-alist))
 	    passphrase)
-	(or (cdr entry)
+	(or (copy-sequence (cdr entry))
 	    (progn
 	      (unless entry
-		(setq entry (list buffer)
-		      epa-passphrase-alist (cons entry
-						 epa-passphrase-alist)))
-	      (setq passphrase (epg-passphrase-callback-function key-id nil))
+		(setq entry (list file)
+		      epa-file-passphrase-alist (cons entry
+						 epa-file-passphrase-alist)))
+	      (setq passphrase (epg-passphrase-callback-function context
+								 key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function key-id nil)))
+    (epg-passphrase-callback-function context key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data
@@ -74,31 +78,33 @@
   (setq file (expand-file-name file))
   (let ((local-copy (epa-file-run-real-handler #'file-local-copy (list file)))
 	(context (epg-make-context))
-	point length entry)
+	string length entry)
     (if visit
 	(setq buffer-file-name file))
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
-	   (current-buffer)))
+	   file))
     (unwind-protect
 	(progn
 	  (if replace
 	      (goto-char (point-min)))
-	  (setq point (point))
 	  (condition-case error
-	      (insert (epg-decrypt-file context file nil))
-	    (error (signal 'file-error
-			   (cons "Opening input file"
-				 (nthcdr 2 error)))))
-	  (setq length (- (point) point))
-	  (if replace
-	      (delete-region (point) (point-max)))
-	  (decode-coding-region point (point) 'undecided)
+	      (setq string (decode-coding-string
+			    (epg-decrypt-file context file nil)
+			    'undecided))
+	    (error
+	     (if (setq entry (assoc file epa-file-passphrase-alist))
+		 (setcdr entry nil))
+	     (signal 'file-error
+		     (cons "Opening input file" (cdr error)))))
 	  (if (boundp 'last-coding-system-used)
 	      (set-buffer-file-coding-system last-coding-system-used)
 	    (set-buffer-file-coding-system default-buffer-file-coding-system))
-	  (goto-char point))
+	  (insert string)
+	  (setq length (length string))
+	  (if replace
+	      (delete-region (point) (point-max))))
       (if (and local-copy
 	       (file-exists-p local-copy))
 	  (delete-file local-copy)))
@@ -116,23 +122,32 @@
 			      (error last-coding-system-used))
 			  buffer-file-coding-system))
 	 (context (epg-make-context))
-	 (coding-system-for-write 'binary))
+	 (coding-system-for-write 'binary)
+	 string entry)
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
-	   (current-buffer)))
+	   file))
+    (condition-case error
+	(setq string
+	      (epg-encrypt-string
+	       context
+	       (if (stringp start)
+		   (encode-coding-string start coding-system)
+		 (encode-coding-string (buffer-substring start end)
+				       coding-system))
+	       (unless (assoc file epa-file-passphrase-alist)
+			 (epa-select-keys
+			  context
+			  "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "))))
+      (error
+       (if (setq entry (assoc file epa-file-passphrase-alist))
+	   (setcdr entry nil))
+       (signal 'file-error (cons "Opening output file" (cdr error)))))
     (epa-file-run-real-handler
      #'write-region
-     (list (epg-encrypt-string
-	    context
-	    (encode-coding-string (buffer-string) coding-system)
-	    (mapcar (lambda (key)
-		      (epg-sub-key-id (car (epg-key-sub-key-list key))))
-		    (unless (assoc (current-buffer) epa-passphrase-alist)
-		      (epa-select-keys
-		       "Select recipents for encryption.
-If no one is selected, symmetric encryption will be performed.  "))))
-	   nil file append visit lockname mustbenew))
+     (list string nil file append visit lockname mustbenew))
     (if (boundp 'last-coding-system-used)
 	(setq last-coding-system-used coding-system))
     (if (eq visit t)
@@ -149,6 +164,25 @@ If no one is selected, symmetric encryption will be performed.  "))))
 	(message "Wrote %s" buffer-file-name))))
 (put 'write-region 'epa-file 'epa-file-write-region)
 
+;;;###autoload
+(defun epa-file-enable ()
+  (interactive)
+  (if (memq epa-file-handler file-name-handler-alist)
+      (message "`epa-file' already enabled")
+    (setq file-name-handler-alist
+	  (cons epa-file-handler file-name-handler-alist))
+    (message "`epa-file' enabled")))
+
+;;;###autoload
+(defun epa-file-disable ()
+  (interactive)
+  (if (memq epa-file-handler file-name-handler-alist)
+      (progn
+	(setq file-name-handler-alist
+	      (delq epa-file-handler file-name-handler-alist))
+	(message "`epa-file' disabled"))
+    (message "`epa-file' already disabled")))
+
 (provide 'epa-file)
 
 ;;; epa-file.el ends here