(require 'font-lock)
(require 'widget)
(eval-when-compile (require 'wid-edit))
+(require 'derived)
(defgroup epa nil
"The EasyPG Assistant"
:group 'epg)
-(defcustom epa-armor nil
- "If non-nil, epa commands create ASCII armored output."
- :type 'boolean
- :group 'epa)
-
-(defcustom epa-textmode nil
- "If non-nil, epa commands treat input files as text."
- :type 'boolean
- :group 'epa)
-
(defcustom epa-popup-info-window t
"If non-nil, status information from epa commands is displayed on
the separate window."
(17 . ?D)
(20 . ?G)))
+(defvar epa-protocol 'OpenPGP
+ "*The default protocol.
+The value can be either OpenPGP or CMS.
+
+You should bind this variable with `let', but do not set it globally.")
+
+(defvar epa-armor nil
+ "*If non-nil, epa commands create ASCII armored output.
+
+You should bind this variable with `let', but do not set it globally.")
+
+(defvar epa-textmode nil
+ "*If non-nil, epa commands treat input files as text.
+
+You should bind this variable with `let', but do not set it globally.")
+
(defvar epa-keys-buffer nil)
(defvar epa-key-buffer-alist nil)
(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
+(defvar epa-key-list-mode-map
(let ((keymap (make-sparse-keymap)))
(define-key keymap "m" 'epa-mark)
(define-key keymap "u" 'epa-unmark)
(define-key keymap "r" 'epa-delete-keys)
(define-key keymap "i" 'epa-import-keys)
(define-key keymap "o" 'epa-export-keys)
- (define-key keymap "g" 'epa-list-keys)
+ (define-key keymap "g" 'revert-buffer)
(define-key keymap "n" 'next-line)
(define-key keymap "p" 'previous-line)
(define-key keymap " " 'scroll-up)
(defvar epa-key-mode-map
(let ((keymap (make-sparse-keymap)))
- (define-key keymap "q" 'bury-buffer)
+ (define-key keymap "q" 'epa-exit-buffer)
keymap))
(defvar epa-info-mode-map
(defalias 'epa--decode-coding-string 'decode-coding-string)
(defalias 'epa--decode-coding-string 'identity))
-(defun epa-keys-mode ()
+(defun epa-key-list-mode ()
"Major mode for `epa-list-keys'."
(kill-all-local-variables)
(buffer-disable-undo)
- (setq major-mode 'epa-keys-mode
+ (setq major-mode 'epa-key-list-mode
mode-name "Keys"
truncate-lines t
buffer-read-only t)
- (use-local-map epa-keys-mode-map)
+ (use-local-map epa-key-list-mode-map)
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults '(epa-font-lock-keywords t))
;; In XEmacs, auto-initialization of font-lock is not effective
;; if buffer-file-name is not set.
(font-lock-set-defaults)
(make-local-variable 'epa-exit-buffer-function)
- (run-hooks 'epa-keys-mode-hook))
+ (make-local-variable 'revert-buffer-function)
+ (setq revert-buffer-function 'epa--key-list-revert-buffer)
+ (run-hooks 'epa-key-list-mode-hook))
(defun epa-key-mode ()
"Major mode for a key description."
(interactive)
(funcall epa-exit-buffer-function))
-;;;###autoload
-(defun epa-list-keys (&optional name mode protocol)
- (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 "Protocol? "
- '(("OpenPGP") ("CMS"))
- nil t))))
- (or epa-list-keys-arguments (list nil nil nil))))
- (unless (and epa-keys-buffer
- (buffer-live-p epa-keys-buffer))
- (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
- (set-buffer epa-keys-buffer)
- (let ((inhibit-read-only t)
- buffer-read-only
- (point (point-min))
- (context (epg-make-context protocol)))
- (unless (get-text-property point 'epa-list-keys)
- (setq point (next-single-property-change point 'epa-list-keys)))
- (when point
- (delete-region point
- (or (next-single-property-change point 'epa-list-keys)
- (point-max)))
- (goto-char point))
- (epa--insert-keys context name mode)
- (epa-keys-mode)
- (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))
- (goto-char (point-min))
- (pop-to-buffer (current-buffer)))
-
-(defun epa--insert-keys (context name mode)
+(defun epa--insert-keys (keys)
(save-excursion
(save-restriction
(narrow-to-region (point) (point))
- (let ((keys (epg-list-keys context name mode))
- point)
+ (let (point)
(while keys
(setq point (point))
(insert " ")
'start-open t
'end-open t)))))
+(defun epa--list-keys (name secret)
+ (unless (and epa-keys-buffer
+ (buffer-live-p epa-keys-buffer))
+ (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
+ (set-buffer epa-keys-buffer)
+ (epa-key-list-mode)
+ (let ((inhibit-read-only t)
+ buffer-read-only
+ (point (point-min))
+ (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
+ (delete-region point
+ (or (next-single-property-change point 'epa-list-keys)
+ (point-max)))
+ (goto-char point))
+ (epa--insert-keys (epg-list-keys context name secret))
+ (widget-setup)
+ (set-keymap-parent (current-local-map) widget-keymap))
+ (make-local-variable 'epa-list-keys-arguments)
+ (setq epa-list-keys-arguments (list name secret))
+ (goto-char (point-min))
+ (pop-to-buffer (current-buffer)))
+
+;;;###autoload
+(defun epa-list-keys (&optional name)
+ "List all keys matched with NAME from 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)))
+ (list nil)))
+ (epa--list-keys name nil))
+
+;;;###autoload
+(defun epa-list-secret-keys (&optional name)
+ "List all keys matched with NAME from the private 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)))
+ (list nil)))
+ (epa--list-keys name t))
+
+(defun epa--key-list-revert-buffer (&optional ignore-auto noconfirm)
+ (apply #'epa--list-keys epa-list-keys-arguments))
+
(defun epa--marked-keys ()
(or (save-excursion
(set-buffer epa-keys-buffer)
(if key
(list key))))))
-;;;###autoload
-(defun epa-select-keys (context prompt &optional names secret)
- "Display a user's keyring and ask him to select keys.
-CONTEXT is an epg-context.
-PROMPT is a string to prompt with.
-NAMES is a list of strings to be matched with keys. If it is nil, all
-the keys are listed.
-If SECRET is non-nil, list secret keys instead of public keys."
+(defun epa--select-keys (prompt keys)
(save-excursion
(unless (and epa-keys-buffer
(buffer-live-p epa-keys-buffer))
(setq epa-keys-buffer (generate-new-buffer "*Keys*")))
+ (set-buffer epa-keys-buffer)
+ (epa-key-list-mode)
(let ((inhibit-read-only t)
buffer-read-only)
- (set-buffer epa-keys-buffer)
(erase-buffer)
- (insert prompt "\n")
+ (insert prompt "\n"
+ (substitute-command-keys "\
+- `\\[epa-mark]' to mark a key on the line
+- `\\[epa-unmark]' to unmark a key on the line\n"))
(widget-create 'link
:notify (lambda (&rest ignore) (abort-recursive-edit))
:help-echo
"Click here or \\[exit-recursive-edit] to finish")
"OK")
(insert "\n\n")
- (if names
- (while names
- (epa--insert-keys context (car names) secret)
- (if (get-text-property (point) 'epa-list-keys)
- (epa-mark))
- (goto-char (point-max))
- (setq names (cdr names)))
- (if secret
- (progn
- (epa--insert-keys context nil secret)
- (if (get-text-property (point) 'epa-list-keys)
- (epa-mark)))
- (epa--insert-keys context nil nil)))
- (epa-keys-mode)
+ (epa--insert-keys keys)
(widget-setup)
(set-keymap-parent (current-local-map) widget-keymap)
(setq epa-exit-buffer-function #'abort-recursive-edit)
(delete-window (get-buffer-window epa-keys-buffer)))
(kill-buffer epa-keys-buffer))))
+;;;###autoload
+(defun epa-select-keys (context prompt &optional names secret)
+ "Display a user's keyring and ask him to select keys.
+CONTEXT is an epg-context.
+PROMPT is a string to prompt with.
+NAMES is a list of strings to be matched with keys. If it is nil, all
+the keys are listed.
+If SECRET is non-nil, list secret keys instead of public keys."
+ (let ((keys (epg-list-keys context names secret)))
+ (if (> (length keys) 1)
+ (epa--select-keys prompt keys)
+ keys)))
+
+(defun epa--format-fingerprint-1 (fingerprint unit-size block-size)
+ (let ((unit 0))
+ (with-temp-buffer
+ (insert fingerprint)
+ (goto-char (point-min))
+ (while (progn
+ (goto-char (+ (point) unit-size))
+ (not (eobp)))
+ (setq unit (1+ unit))
+ (insert (if (= (% unit block-size) 0) " " " ")))
+ (buffer-string))))
+
+(defun epa--format-fingerprint (fingerprint)
+ (if fingerprint
+ (if (= (length fingerprint) 40)
+ ;; 1234 5678 9ABC DEF0 1234 5678 9ABC DEF0 1234 5678
+ (epa--format-fingerprint-1 fingerprint 4 5)
+ ;; 12 34 56 78 9A BC DE F0 12 34 56 78 9A BC DE F0
+ (epa--format-fingerprint-1 fingerprint 2 8))))
+
(defun epa--show-key (key)
(let* ((primary-sub-key (car (epg-key-sub-key-list key)))
(entry (assoc (epg-sub-key-id primary-sub-key)
(setcdr entry (generate-new-buffer
(format "*Key*%s" (epg-sub-key-id primary-sub-key)))))
(set-buffer (cdr entry))
+ (epa-key-mode)
(make-local-variable 'epa-key)
(setq epa-key key)
(erase-buffer)
(epg-sub-key-capability (car pointer))
" ")
"\n\tFingerprint: "
- (epg-sub-key-fingerprint (car pointer))
+ (epa--format-fingerprint (epg-sub-key-fingerprint (car pointer)))
"\n")
(setq pointer (cdr pointer)))
(goto-char (point-min))
- (pop-to-buffer (current-buffer))
- (epa-key-mode)))
+ (pop-to-buffer (current-buffer))))
(defun epa-display-info (info)
(if epa-popup-info-window
(save-selected-window
- (unless epa-info-buffer
+ (unless (and epa-info-buffer (buffer-live-p epa-info-buffer))
(setq epa-info-buffer (generate-new-buffer "*Info*")))
+ (if (get-buffer-window epa-info-buffer)
+ (delete-window (get-buffer-window epa-info-buffer)))
(save-excursion
(set-buffer epa-info-buffer)
(let ((inhibit-read-only t)
(defun epa-progress-callback-function (context what char current total
handback)
- (message "%s: %d%% (%d/%d)" what
+ (message "%s%d%% (%d/%d)" (or handback
+ (concat what ": "))
(if (> total 0) (floor (* (/ current (float total)) 100)) 0)
current total))
") ")
(file-name-directory default-name)
default-name)))
- (context (epg-make-context)))
+ (context (epg-make-context epa-protocol)))
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ (format "Decrypting %s..."
+ (file-name-nondirectory file)))
(message "Decrypting %s..." (file-name-nondirectory file))
(epg-decrypt-file context file plain)
(message "Decrypting %s...wrote %s" (file-name-nondirectory file)
"Verify FILE."
(interactive "fFile: ")
(setq file (expand-file-name file))
- (let* ((context (epg-make-context))
+ (let* ((context (epg-make-context epa-protocol))
(plain (if (equal (file-name-extension file) "sig")
(file-name-sans-extension file))))
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ (format "Verifying %s..."
+ (file-name-nondirectory file)))
(message "Verifying %s..." (file-name-nondirectory file))
(epg-verify-file context file plain)
(message "Verifying %s...done" (file-name-nondirectory file))
(epa-display-info (epg-verify-result-to-string
(epg-context-result-for context 'verify))))))
-;;;###autoload
-(defun epa-sign-file (file signers mode)
- "Sign FILE by SIGNERS keys selected."
- (interactive
- (list (expand-file-name (read-file-name "File: "))
- (epa-select-keys (epg-make-context) "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 "\
+(defun epa--read-signature-type ()
+ (let (type c)
+ (while (null type)
+ (message "Signature type (n,c,d,?) ")
+ (setq c (read-char))
+ (cond ((eq c ?c)
+ (setq type 'clear))
+ ((eq c ?d)
+ (setq type '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
+ (setq type 'normal))))))
+
+;;;###autoload
+(defun epa-sign-file (file signers mode)
+ "Sign FILE by SIGNERS keys selected."
+ (interactive
+ (let ((verbose current-prefix-arg))
+ (list (expand-file-name (read-file-name "File: "))
+ (if verbose
+ (epa-select-keys (epg-make-context epa-protocol)
+ "Select keys for signing.
+If no one is selected, default secret key is used. "
+ nil t))
+ (if verbose
+ (epa--read-signature-type)
+ 'clear))))
(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"))))
- (context (epg-make-context)))
+ ".p7s"
+ ".p7m"))))
+ (context (epg-make-context epa-protocol)))
(epg-context-set-armor context epa-armor)
(epg-context-set-textmode context epa-textmode)
(epg-context-set-signers context signers)
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ (format "Signing %s..."
+ (file-name-nondirectory file)))
(message "Signing %s..." (file-name-nondirectory file))
(epg-sign-file context file signature mode)
(message "Signing %s...wrote %s" (file-name-nondirectory file)
"Encrypt FILE for RECIPIENTS."
(interactive
(list (expand-file-name (read-file-name "File: "))
- (epa-select-keys (epg-make-context) "Select recipients for encryption.
+ (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")))
- (context (epg-make-context)))
+ (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)
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ (format "Encrypting %s..."
+ (file-name-nondirectory file)))
(message "Encrypting %s..." (file-name-nondirectory file))
(epg-encrypt-file context file recipients cipher)
(message "Encrypting %s...wrote %s" (file-name-nondirectory file)
Don't use this command in Lisp programs!"
(interactive "r")
(save-excursion
- (let ((context (epg-make-context))
+ (let ((context (epg-make-context epa-protocol))
plain)
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ "Decrypting...")
(message "Decrypting...")
(setq plain (epg-decrypt-string context (buffer-substring start end)))
(message "Decrypting...done")
- (delete-region start end)
- (goto-char start)
- (insert (epa--decode-coding-string plain coding-system-for-read))
+ (setq plain (epa--decode-coding-string
+ plain
+ (or coding-system-for-read
+ (get-text-property start 'epa-coding-system-used))))
+ (if (y-or-n-p "Replace the original text? ")
+ (let ((inhibit-read-only t)
+ buffer-read-only)
+ (delete-region start end)
+ (goto-char start)
+ (insert plain))
+ (with-output-to-temp-buffer "*Temp*"
+ (set-buffer standard-output)
+ (insert plain)
+ (epa-info-mode)))
(if (epg-context-result-for context 'verify)
(epa-display-info (epg-verify-result-to-string
(epg-context-result-for context 'verify)))))))
+(defun epa--find-coding-system-for-mime-charset (mime-charset)
+ (if (featurep 'xemacs)
+ (if (fboundp 'find-coding-system)
+ (find-coding-system mime-charset))
+ (let ((pointer (coding-system-list)))
+ (while (and pointer
+ (eq (coding-system-get (car pointer) 'mime-charset)
+ mime-charset))
+ (setq pointer (cdr pointer)))
+ pointer)))
+
;;;###autoload
(defun epa-decrypt-armor-in-region (start end)
"Decrypt OpenPGP armors in the current region between START and END.
(save-restriction
(narrow-to-region start end)
(goto-char start)
- (let (armor-start armor-end charset coding-system)
+ (let (armor-start armor-end)
(while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t)
(setq armor-start (match-beginning 0)
armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
(unless armor-end
(error "No armor tail"))
(goto-char armor-start)
- (if (re-search-forward "^Charset: \\(.*\\)" armor-end t)
- (setq charset (match-string 1)))
- (if coding-system-for-read
- (setq coding-system coding-system-for-read)
- (if charset
- (setq coding-system (intern (downcase charset)))
- (setq coding-system 'utf-8)))
- (let ((coding-system-for-read coding-system))
- (epa-decrypt-region start end)))))))
+ (let ((coding-system-for-read
+ (or coding-system-for-read
+ (if (re-search-forward "^Charset: \\(.*\\)" armor-end t)
+ (epa--find-coding-system-for-mime-charset
+ (intern (downcase (match-string 1))))))))
+ (goto-char armor-end)
+ (epa-decrypt-region armor-start armor-end)))))))
;;;###autoload
(defun epa-verify-region (start end)
Don't use this command in Lisp programs!"
(interactive "r")
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol))
+ plain)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
- (epg-verify-string context
- (epa--encode-coding-string
- (buffer-substring start end)
- coding-system-for-write))
+ #'epa-progress-callback-function
+ "Verifying...")
+ (setq plain (epg-verify-string
+ context
+ (epa--encode-coding-string
+ (buffer-substring start end)
+ (or coding-system-for-write
+ (get-text-property start
+ 'epa-coding-system-used)))))
+ (if (y-or-n-p "Replace the original text? ")
+ (let ((inhibit-read-only t)
+ buffer-read-only)
+ (delete-region start end)
+ (goto-char start)
+ (insert plain))
+ (with-output-to-temp-buffer "*Temp*"
+ (set-buffer standard-output)
+ (insert plain)
+ (epa-info-mode)))
(if (epg-context-result-for context 'verify)
(epa-display-info (epg-verify-result-to-string
(epg-context-result-for context 'verify))))))
(save-restriction
(narrow-to-region start end)
(goto-char start)
- (let (armor-start armor-end)
+ (let (cleartext-start cleartext-end)
(while (re-search-forward "-----BEGIN PGP SIGNED MESSAGE-----$"
nil t)
- (setq armor-start (match-beginning 0))
+ (setq cleartext-start (match-beginning 0))
(unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$"
nil t)
(error "Invalid cleartext signed message"))
- (setq armor-end (re-search-forward
+ (setq cleartext-end (re-search-forward
"^-----END PGP SIGNATURE-----$"
nil t))
- (unless armor-end
- (error "No armor tail"))
- (epa-verify-region armor-start armor-end))))))
+ (unless cleartext-end
+ (error "No cleartext tail"))
+ (epa-verify-region cleartext-start cleartext-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-sign-region (start end signers mode)
Don't use this command in Lisp programs!"
(interactive
- (list (region-beginning) (region-end)
- (epa-select-keys (epg-make-context) "Select keys for signing.
+ (let ((verbose current-prefix-arg))
+ (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)
+ (if verbose
+ (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 "\
-n - Create a normal signature
-c - Create a cleartext signature
-d - Create a detached signature
-? - Show this help
-"))))
- (t
- (throw 'done nil))))))))
+ nil t))
+ (if verbose
+ (epa--read-signature-type)
+ 'clear))))
(save-excursion
- (let ((context (epg-make-context))
+ (let ((context (epg-make-context epa-protocol))
signature)
- (if (memq mode '(t detached nil normal))
- ;; Normal or detached signature.
- (progn
- ;;(epg-context-set-armor context epa-armor)
- (epg-context-set-armor context t)
- ;;(epg-context-set-textmode context epa-textmode)
- (epg-context-set-textmode context t))
- ;; Cleartext signature.
- (epg-context-set-armor context nil)
- (epg-context-set-textmode context nil))
+ ;;(epg-context-set-armor context epa-armor)
+ (epg-context-set-armor context t)
+ ;;(epg-context-set-textmode context epa-textmode)
+ (epg-context-set-textmode context t)
(epg-context-set-signers context signers)
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ "Signing...")
(message "Signing...")
(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)))))
+ (goto-char start)
+ (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)))))
+
+(if (fboundp 'derived-mode-p)
+ (defalias 'epa--derived-mode-p 'derived-mode-p)
+ (defun epa--derived-mode-p (&rest modes)
+ "Non-nil if the current major mode is derived from one of MODES.
+Uses the `derived-mode-parent' property of the symbol to trace backwards."
+ (let ((parent major-mode))
+ (while (and (not (memq parent modes))
+ (setq parent (get parent 'derived-mode-parent))))
+ parent)))
;;;###autoload
-(defun epa-encrypt-region (start end recipients)
+(defun epa-encrypt-region (start end recipients sign signers)
"Encrypt the current region between START and END for RECIPIENTS.
Don't use this command in Lisp programs!"
(interactive
- (list (region-beginning) (region-end)
- (epa-select-keys (epg-make-context) "Select recipients for encryption.
-If no one is selected, symmetric encryption will be performed. ")))
+ (let ((verbose current-prefix-arg)
+ (context (epg-make-context epa-protocol))
+ sign)
+ (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 context
+ "Select recipients for encryption.
+If no one is selected, symmetric encryption will be performed. ")
+ (setq sign (if verbose (y-or-n-p "Sign? ")))
+ (if sign
+ (epa-select-keys context
+ "Select keys for signing. ")))))
(save-excursion
- (let ((context (epg-make-context))
+ (let ((context (epg-make-context epa-protocol))
cipher)
;;(epg-context-set-armor context epa-armor)
(epg-context-set-armor context t)
;;(epg-context-set-textmode context epa-textmode)
(epg-context-set-textmode context t)
+ (if sign
+ (epg-context-set-signers context signers))
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ "Encrypting...")
(message "Encrypting...")
(setq cipher (epg-encrypt-string context
(epa--encode-coding-string
(buffer-substring start end)
- coding-system-for-write)
- recipients))
+ epa-last-coding-system-specified)
+ recipients
+ sign))
(message "Encrypting...done")
(delete-region start end)
- (insert cipher))))
+ (goto-char start)
+ (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)
(error "No keys selected"))
(list keys
(eq (nth 1 epa-list-keys-arguments) t))))
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol)))
(message "Deleting...")
(epg-delete-keys context keys allow-secret)
(message "Deleting...done")
Don't use this command in Lisp programs!"
(interactive "fFile: ")
(setq file (expand-file-name file))
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol)))
(message "Importing %s..." (file-name-nondirectory file))
(condition-case nil
(progn
(if (epg-context-result-for context 'import)
(epa-display-info (epg-import-result-to-string
(epg-context-result-for context 'import))))
- (if (eq major-mode 'epa-keys-mode)
+ (if (eq major-mode 'epa-key-list-mode)
(apply #'epa-list-keys epa-list-keys-arguments))))
;;;###autoload
Don't use this command in Lisp programs!"
(interactive "r")
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol)))
(message "Importing...")
(condition-case nil
(progn
(epg-context-result-for context 'import))))))
;;;###autoload
+(defun epa-import-armor-in-region (start end)
+ "Import keys in the OpenPGP armor format in the current region
+between START and END.
+
+Don't use this command in Lisp programs!"
+ (interactive "r")
+ (save-excursion
+ (save-restriction
+ (narrow-to-region start end)
+ (goto-char start)
+ (let (armor-start armor-end)
+ (while (re-search-forward
+ "-----BEGIN \\(PGP \\(PUBLIC\\|PRIVATE\\) KEY BLOCK\\)-----$"
+ nil t)
+ (setq armor-start (match-beginning 0)
+ armor-end (re-search-forward
+ (concat "^-----END " (match-string 1) "-----$")
+ nil t))
+ (unless armor-end
+ (error "No armor tail"))
+ (epa-import-keys-region armor-start armor-end))))))
+
+;;;###autoload
(defun epa-export-keys (keys file)
"Export selected KEYS to FILE.
") ")
(file-name-directory default-name)
default-name)))))
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol)))
(epg-context-set-armor context epa-armor)
(message "Exporting to %s..." (file-name-nondirectory file))
(epg-export-keys-to-file context keys file)
Don't use this command in Lisp programs!"
(interactive
- (list (epa-select-keys (epg-make-context) "Select keys to export. ")))
- (let ((context (epg-make-context)))
+ (list (epa-select-keys (epg-make-context epa-protocol)
+ "Select keys to export. ")))
+ (let ((context (epg-make-context epa-protocol)))
;;(epg-context-set-armor context epa-armor)
(epg-context-set-armor context t)
(insert (epg-export-keys-to-string context keys))))
(unless keys
(error "No keys selected"))
(list keys current-prefix-arg)))
- (let ((context (epg-make-context)))
+ (let ((context (epg-make-context epa-protocol)))
(epg-context-set-passphrase-callback context
#'epa-passphrase-callback-function)
(epg-context-set-progress-callback context
- #'epa-progress-callback-function)
+ #'epa-progress-callback-function
+ "Signing keys...")
(message "Signing keys...")
(epg-sign-keys context keys local)
(message "Signing keys...done")))