: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-handler
(cons epa-file-name-regexp 'epa-file-handler))
-
+
(defvar epa-file-passphrase-alist nil)
(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))
(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
(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 (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))
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)
- (or coding-system-for-read '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)))
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