X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=1f939c1fb83aa89ac40e8d52c91bfe5fc66ad65a;hb=b052679fa33b4b762df2a03d38d53bb06b676bf6;hp=29611b9f9d7f9dfceb6fc48f305f6d1af68adcbc;hpb=ea9e1ce535b76ba79c8fa5ecfe596c0a5a70b457;p=elisp%2Fepg.git diff --git a/epa-file.el b/epa-file.el index 29611b9..1f939c1 100644 --- a/epa-file.el +++ b/epa-file.el @@ -34,13 +34,43 @@ :type 'regexp :group 'epa-file) +(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil + "If t, cache passphrase for symmetric encryption." + :type 'boolean + :group 'epa-file) + +(defvar epa-file-encrypt-to nil + "*Recipient(s) used for encrypting files. +May either be a string or a list of strings.") + +;;;###autoload +(put 'epa-file-encrypt-to 'safe-local-variable + (lambda (val) + (or (stringp val) + (and (listp val) + (catch 'safe + (mapc (lambda (elt) + (unless (stringp elt) + (throw 'safe nil))) + val) + t))))) + (defvar epa-file-handler (cons epa-file-name-regexp 'epa-file-handler)) - + (defvar epa-file-passphrase-alist nil) +(if (fboundp 'encode-coding-string) + (defalias 'epa-file--encode-coding-string 'encode-coding-string) + (defalias 'epa-file--encode-coding-string 'identity)) + +(if (fboundp 'decode-coding-string) + (defalias 'epa-file--decode-coding-string 'decode-coding-string) + (defalias 'epa-file--decode-coding-string 'identity)) + (defun epa-file-passphrase-callback-function (context key-id file) - (if (eq key-id 'SYM) + (if (and epa-file-cache-passphrase-for-symmetric-encryption + (eq key-id 'SYM)) (let ((entry (assoc file epa-file-passphrase-alist)) passphrase) (or (copy-sequence (cdr entry)) @@ -49,11 +79,11 @@ (setq entry (list file) epa-file-passphrase-alist (cons entry epa-file-passphrase-alist))) - (setq passphrase (epg-passphrase-callback-function context + (setq passphrase (epa-passphrase-callback-function context key-id nil)) (setcdr entry (copy-sequence passphrase)) passphrase))) - (epg-passphrase-callback-function context key-id nil))) + (epa-passphrase-callback-function context key-id nil))) (defun epa-file-handler (operation &rest args) (save-match-data @@ -70,11 +100,26 @@ (inhibit-file-name-operation operation)) (apply operation args))) +(defun epa-file-decode-and-insert (string file visit beg end replace) + (if (fboundp 'decode-coding-inserted-region) + (save-restriction + (narrow-to-region (point) (point)) + (let ((multibyte enable-multibyte-characters)) + (set-buffer-multibyte nil) + (insert string) + (set-buffer-multibyte multibyte) + (decode-coding-inserted-region + (point-min) (point-max) + (substring file 0 (string-match epa-file-name-regexp file)) + visit beg end replace))) + (insert (epa-file--decode-coding-string string (or coding-system-for-read + 'undecided))))) + (defvar last-coding-system-used) (defun epa-file-insert-file-contents (file &optional visit beg end replace) (barf-if-buffer-read-only) - (if (or beg end) - (error "Can't read the file partially.")) + (if (and visit (or beg end)) + (error "Attempt to visit less than an entire file")) (setq file (expand-file-name file)) (let ((local-copy (epa-file-run-real-handler #'file-local-copy (list file))) (context (epg-make-context)) @@ -85,26 +130,28 @@ context (cons #'epa-file-passphrase-callback-function file)) + (epg-context-set-progress-callback context + #'epa-progress-callback-function) (unwind-protect (progn (if replace (goto-char (point-min))) (condition-case error - (setq string (decode-coding-string - (epg-decrypt-file context file nil) - 'undecided)) + (setq string (epg-decrypt-file context file nil)) (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)) - (insert string) - (setq length (length string)) - (if replace - (delete-region (point) (point-max)))) + (if (or beg end) + (setq string (substring string (or beg 0) end))) + (save-excursion + (save-restriction + (narrow-to-region (point) (point)) + (epa-file-decode-and-insert string file visit beg end replace) + (setq length (- (point-max) (point-min)))) + (if replace + (delete-region (point) (point-max))))) (if (and local-copy (file-exists-p local-copy)) (delete-file local-copy))) @@ -116,11 +163,11 @@ (if append (error "Can't append to the file.")) (setq file (expand-file-name file)) - (let* ((coding-system (if (boundp 'last-coding-system-used) - (condition-case nil - (write-region (point-min) (point-max) "/") - (error last-coding-system-used)) - buffer-file-coding-system)) + (let* ((coding-system (or coding-system-for-write + (if (fboundp 'select-safe-coding-system) + (select-safe-coding-system + (point-min) (point-max)) + buffer-file-coding-system))) (context (epg-make-context)) (coding-system-for-write 'binary) string entry) @@ -128,19 +175,24 @@ context (cons #'epa-file-passphrase-callback-function file)) + (epg-context-set-progress-callback context + #'epa-progress-callback-function) (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)) + (epa-file--encode-coding-string start coding-system) + (epa-file--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. ")))) + (epa-select-keys + context + "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. " + (cond + ((listp epa-file-encrypt-to) epa-file-encrypt-to) + ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to))))))) (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil))