(require 'font-lock)
(require 'widget)
(eval-when-compile (require 'wid-edit))
-(require 'mail-utils)
(require 'derived)
(defgroup epa nil
:type 'integer
:group 'epa)
-(defcustom epa-mail-modes '(mail-mode message-mode)
- "List of major-modes to compose mails."
- :type 'list
- :group 'epa)
-
(defgroup epa-faces nil
"Faces for epa-mode."
:group 'epa)
(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)
(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))
+ (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)
- "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? ")))
- (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*")))
- (set-buffer epa-keys-buffer)
- (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 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))
- (goto-char (point-min))
- (pop-to-buffer (current-buffer)))
-
(defun epa--insert-keys (context name mode)
(save-excursion
(save-restriction
'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 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)))
+ (or epa-list-keys-arguments (list nil 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)))
+ (or epa-list-keys-arguments (list nil nil))))
+ (epa--list-keys name t))
+
(defun epa--marked-keys ()
(or (save-excursion
(set-buffer epa-keys-buffer)
(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
(if (get-text-property (point) 'epa-list-keys)
(epa-mark)))
(epa--insert-keys context nil nil)))
- (epa-keys-mode)
(widget-setup)
(set-keymap-parent (current-local-map) widget-keymap)
(setq epa-exit-buffer-function #'abort-recursive-edit)
(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)
"\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)))
(delete-region start end)
(goto-char start)
(insert plain))
- (let ((epa-popup-info-window t))
- (epa-display-info 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)))))))
(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-decrypt ()
- "Decrypt OpenPGP armors in the current buffer.
-
-Don't use this command in Lisp programs!"
- (interactive)
- (epa-decrypt-armor-in-region (point-min) (point-max)))
-
-(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.
Don't use this command in Lisp programs!"
(interactive "r")
- (let ((context (epg-make-context epa-protocol)))
+ (let ((context (epg-make-context epa-protocol))
+ plain)
(epg-context-set-progress-callback context
#'epa-progress-callback-function
"Verifying...")
- (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))))
+ (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))))))
-;;;###autoload
-(defun epa-verify ()
- "Verify OpenPGP cleartext signed messages in the current buffer.
-
-Don't use this command in Lisp programs!"
- (interactive)
- (epa-verify-cleartext-in-region (point-min) (point-max)))
+(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)
(setq parent (get parent 'derived-mode-parent))))
parent)))
-(defun epa--mail-mode-p ()
- (let ((pointer epa-mail-modes))
- (while (and pointer
- (epa--derived-mode-p (car pointer)))
- (setq pointer (cdr pointer)))
- pointer))
-
-;;;###autoload
-(defun epa-sign (start end signers mode)
- "Sign the current buffer.
-
-Don't use this command in Lisp programs!"
- (interactive
- (save-excursion
- (goto-char (point-min))
- (if (and (epa--mail-mode-p)
- (search-forward mail-header-separator nil t))
- (forward-line))
- (setq epa-last-coding-system-specified
- (or coding-system-for-write
- (epa--select-safe-coding-system (point) (point-max))))
- (let ((verbose current-prefix-arg))
- (list (point) (point-max)
- (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)))))
- (epa-sign-region start end signers mode))
-
;;;###autoload
(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
- (let ((sign (if current-prefix-arg (y-or-n-p "Sign? ")))
+ (let ((verbose current-prefix-arg)
(context (epg-make-context epa-protocol))
sign)
(setq epa-last-coding-system-specified
(epa-select-keys context
"Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. ")
- sign
+ (setq sign (if verbose (y-or-n-p "Sign? ")))
(if sign
(epa-select-keys context
"Select keys for signing. ")))))
'end-open t)))))
;;;###autoload
-(defun epa-encrypt (start end recipients sign signers)
- "Encrypt the current buffer.
-
-Don't use this command in Lisp programs!"
- (interactive
- (save-excursion
- (let* ((verbose current-prefix-arg)
- (sign (if verbose (y-or-n-p "Sign? ")))
- (context (epg-make-context epa-protocol))
- recipients)
- (goto-char (point-min))
- (when (epa--mail-mode-p)
- (save-restriction
- (narrow-to-region (point)
- (if (search-forward mail-header-separator nil 0)
- (match-beginning 0)
- (point)))
- (setq recipients
- (mail-strip-quoted-names
- (mapconcat #'identity
- (nconc (mail-fetch-field "to" nil nil t)
- (mail-fetch-field "cc" nil nil t)
- (mail-fetch-field "bcc" nil nil t))
- ","))))
- (if recipients
- (setq recipients (delete ""
- (split-string recipients "[ \t\n]+"))))
- (goto-char (point-min))
- (if (search-forward mail-header-separator nil t)
- (forward-line)))
- (setq epa-last-coding-system-specified
- (or coding-system-for-write
- (epa--select-safe-coding-system (point) (point-max))))
- (list (point) (point-max)
- (if verbose
- (epa-select-keys
- context
- "Select recipients for encryption.
-If no one is selected, symmetric encryption will be performed. "
- recipients)
- (if recipients
- (delq nil
- (apply #'nconc
- (mapcar
- (lambda (recipient)
- (epg-list-keys
- (epg-make-context epa-protocol)
- (concat "<" recipient ">")))
- recipients)))))
- sign
- (if sign
- (epa-select-keys context
- "Select keys for signing. "))))))
- (epa-encrypt-region start end recipients sign signers))
-
-;;;###autoload
(defun epa-delete-keys (keys &optional allow-secret)
"Delete selected KEYS.
(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
(epa-import-keys-region armor-start armor-end))))))
;;;###autoload
-(defun epa-import ()
- "Import keys in the OpenPGP armor format in the current buffer.
-
-Don't use this command in Lisp programs!"
- (interactive)
- (epa-import-armor-in-region (point-min) (point-max)))
-
-;;;###autoload
(defun epa-export-keys (keys file)
"Export selected KEYS to FILE.
projects / elisp / epg.git / blobdiff