(defvar epa-key nil)
(defvar epa-list-keys-arguments nil)
(defvar epa-info-buffer nil)
+(defvar epa-last-coding-system-specified nil)
(defvar epa-keys-mode-map
(let ((keymap (make-sparse-keymap)))
(funcall epa-exit-buffer-function))
;;;###autoload
-(defun epa-list-keys (&optional name mode protocol)
+(defun epa-list-keys (&optional name mode)
+ "List all keys matched with NAME from the keyring.
+If MODE is non-nil, it reads the private keyring. Otherwise, it
+reads the public keyring."
(interactive
(if current-prefix-arg
(let ((name (read-string "Pattern: "
(if epa-list-keys-arguments
(car epa-list-keys-arguments)))))
(list (if (equal name "") nil name)
- (y-or-n-p "Secret keys? ")
- (intern (completing-read
- (format "Protocol? (default %S) " epa-protocol)
- '(("OpenPGP") ("CMS"))
- nil t nil nil (symbol-name epa-protocol)))))
- (or epa-list-keys-arguments (list nil nil epa-protocol))))
+ (y-or-n-p "Secret keys? ")))
+ (or epa-list-keys-arguments (list nil nil))))
(unless (and epa-keys-buffer
(buffer-live-p epa-keys-buffer))
(setq epa-keys-buffer (generate-new-buffer "*Keys*")))
(let ((inhibit-read-only t)
buffer-read-only
(point (point-min))
- (context (epg-make-context protocol)))
+ (context (epg-make-context epa-protocol)))
(unless (get-text-property point 'epa-list-keys)
(setq point (next-single-property-change point 'epa-list-keys)))
(when point
(widget-setup)
(set-keymap-parent (current-local-map) widget-keymap))
(make-local-variable 'epa-list-keys-arguments)
- (setq epa-list-keys-arguments (list name mode protocol))
+ (setq epa-list-keys-arguments (list name mode))
(goto-char (point-min))
(pop-to-buffer (current-buffer)))
(t
(throw 'done nil))))))))
(let ((signature (concat file
- (if (or epa-armor
- (not (memq mode '(nil t normal detached))))
- ".asc"
+ (if (eq epa-protocol 'OpenPGP)
+ (if (or epa-armor
+ (not (memq mode
+ '(nil t normal detached))))
+ ".asc"
+ (if (memq mode '(t detached))
+ ".sig"
+ ".gpg"))
(if (memq mode '(t detached))
- ".sig"
- ".gpg"))))
+ ".p7s"
+ ".p7m"))))
(context (epg-make-context epa-protocol)))
(epg-context-set-armor context epa-armor)
(epg-context-set-textmode context epa-textmode)
(epa-select-keys (epg-make-context epa-protocol)
"Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. ")))
- (let ((cipher (concat file (if epa-armor ".asc" ".gpg")))
+ (let ((cipher (concat file (if (eq epa-protocol 'OpenPGP)
+ (if epa-armor ".asc" ".gpg")
+ ".p7m")))
(context (epg-make-context epa-protocol)))
(epg-context-set-armor context epa-armor)
(epg-context-set-textmode context epa-textmode)
(message "Decrypting...done")
(delete-region start end)
(goto-char start)
- (insert (epa--decode-coding-string plain coding-system-for-read))
+ (insert (epa--decode-coding-string plain
+ (or coding-system-for-read
+ (get-text-property
+ start 'epa-coding-system-used))))
(if (epg-context-result-for context 'verify)
(epa-display-info (epg-verify-result-to-string
(epg-context-result-for context 'verify)))))))
(let ((coding-system-for-read coding-system))
(epa-decrypt-region start end)))))))
+(if (fboundp 'select-safe-coding-system)
+ (defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
+ (defun epa--select-safe-coding-system (from to)
+ buffer-file-coding-system))
+
;;;###autoload
(defun epa-verify-region (start end)
"Verify the current region between START and END.
(epg-verify-string context
(epa--encode-coding-string
(buffer-substring start end)
- coding-system-for-write))
+ (or coding-system-for-write
+ (get-text-property start
+ 'epa-coding-system-used))))
(if (epg-context-result-for context 'verify)
(epa-display-info (epg-verify-result-to-string
(epg-context-result-for context 'verify))))))
Don't use this command in Lisp programs!"
(interactive
- (list (region-beginning) (region-end)
- (epa-select-keys (epg-make-context epa-protocol)
- "Select keys for signing.
+ (progn
+ (setq epa-last-coding-system-specified
+ (or coding-system-for-write
+ (epa--select-safe-coding-system
+ (region-beginning) (region-end))))
+ (list (region-beginning) (region-end)
+ (epa-select-keys (epg-make-context epa-protocol)
+ "Select keys for signing.
If no one is selected, default secret key is used. "
- nil t)
- (catch 'done
- (while t
- (message "Signature type (n,c,d,?) ")
- (let ((c (read-char)))
- (cond ((eq c ?c)
- (throw 'done 'clear))
- ((eq c ?d)
- (throw 'done 'detached))
- ((eq c ??)
- (with-output-to-temp-buffer "*Help*"
- (save-excursion
- (set-buffer standard-output)
- (insert "\
+ nil t)
+ (catch 'done
+ (while t
+ (message "Signature type (n,c,d,?) ")
+ (let ((c (read-char)))
+ (cond ((eq c ?c)
+ (throw 'done 'clear))
+ ((eq c ?d)
+ (throw 'done 'detached))
+ ((eq c ??)
+ (with-output-to-temp-buffer "*Help*"
+ (save-excursion
+ (set-buffer standard-output)
+ (insert "\
n - Create a normal signature
c - Create a cleartext signature
d - Create a detached signature
? - Show this help
"))))
- (t
- (throw 'done nil))))))))
+ (t
+ (throw 'done nil)))))))))
(save-excursion
(let ((context (epg-make-context epa-protocol))
signature)
(setq signature (epg-sign-string context
(epa--encode-coding-string
(buffer-substring start end)
- coding-system-for-write)
+ epa-last-coding-system-specified)
mode))
(message "Signing...done")
(delete-region start end)
- (insert (epa--decode-coding-string signature coding-system-for-read)))))
+ (add-text-properties (point)
+ (progn
+ (insert (epa--decode-coding-string
+ signature
+ (or coding-system-for-read
+ epa-last-coding-system-specified)))
+ (point))
+ (list 'epa-coding-system-used
+ epa-last-coding-system-specified
+ 'front-sticky nil
+ 'rear-nonsticky t
+ 'start-open t
+ 'end-open t)))))
;;;###autoload
(defun epa-encrypt-region (start end recipients)
Don't use this command in Lisp programs!"
(interactive
- (list (region-beginning) (region-end)
- (epa-select-keys (epg-make-context epa-protocol)
- "Select recipients for encryption.
-If no one is selected, symmetric encryption will be performed. ")))
+ (progn
+ (setq epa-last-coding-system-specified
+ (or coding-system-for-write
+ (epa--select-safe-coding-system
+ (region-beginning) (region-end))))
+ (list (region-beginning) (region-end)
+ (epa-select-keys (epg-make-context epa-protocol)
+ "Select recipients for encryption.
+If no one is selected, symmetric encryption will be performed. "))))
(save-excursion
(let ((context (epg-make-context epa-protocol))
cipher)
(setq cipher (epg-encrypt-string context
(epa--encode-coding-string
(buffer-substring start end)
- coding-system-for-write)
+ epa-last-coding-system-specified)
recipients))
(message "Encrypting...done")
(delete-region start end)
- (insert cipher))))
+ (add-text-properties (point)
+ (progn
+ (insert cipher)
+ (point))
+ (list 'epa-coding-system-used
+ epa-last-coding-system-specified
+ 'front-sticky nil
+ 'rear-nonsticky t
+ 'start-open t
+ 'end-open t)))))
;;;###autoload
(defun epa-delete-keys (keys &optional allow-secret)
projects / elisp / epg.git / blobdiff