(define-key keymap "d" 'epa-decrypt-file)
(define-key keymap "v" 'epa-verify-file)
(define-key keymap "s" 'epa-sign-file)
+ (define-key keymap "S" 'epa-sign-keys)
(define-key keymap "e" 'epa-encrypt-file)
(define-key keymap "r" 'epa-delete-keys)
(define-key keymap "i" 'epa-import-keys)
(define-key keymap "p" 'previous-line)
(define-key keymap " " 'scroll-up)
(define-key keymap [delete] 'scroll-down)
- (define-key keymap "q" 'bury-buffer)
+ (define-key keymap "q" 'epa-exit-buffer)
keymap))
+(defvar epa-exit-buffer-function #'bury-buffer)
+
(define-widget 'epa-key 'push-button
"Button for representing a epg-key object."
:format "%[%v%]"
? ))
(epg-sub-key-id primary-sub-key)
" "
- (epg-user-id-name primary-user-id))))
+ (if (stringp (epg-user-id-name primary-user-id))
+ (epg-user-id-name primary-user-id)
+ (epg-decode-dn (epg-user-id-name primary-user-id))))))
(defun epa-key-widget-button-face-get (widget)
(let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
;; if buffer-file-name is not set.
(font-lock-set-defaults)
(widget-setup)
+ (make-local-variable 'epa-exit-buffer-function)
(run-hooks 'epa-keys-mode-hook))
(defvar epa-key-mode-map
;; 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-key-mode-hook))
;;;###autoload
-(defun epa-list-keys (&optional name mode)
+(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? ")))
- (or epa-list-keys-arguments (list nil nil))))
+ (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)))
+ (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
(or (next-single-property-change point 'epa-list-keys)
(point-max)))
(goto-char point))
- (epa-list-keys-1 name mode)
+ (epa-list-keys-1 context name mode)
(epa-keys-mode))
(make-local-variable 'epa-list-keys-arguments)
- (setq epa-list-keys-arguments (list name mode))
+ (setq epa-list-keys-arguments (list name mode protocol))
(goto-char (point-min))
(pop-to-buffer (current-buffer)))
-(defun epa-list-keys-1 (name mode)
+(defun epa-list-keys-1 (context name mode)
(save-restriction
(narrow-to-region (point) (point))
(let ((inhibit-read-only t)
buffer-read-only
- (keys (epg-list-keys name mode))
+ (keys (epg-list-keys context name mode))
point)
(while keys
(setq point (point))
(nreverse keys)))
(save-excursion
(beginning-of-line)
- (get-text-property (point) 'epa-key))))
+ (let ((key (get-text-property (point) 'epa-key)))
+ (if key
+ (list key))))))
-(defun epa-select-keys (prompt &optional names mode)
+;;;###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."
(save-excursion
(unless (and epa-keys-buffer
(buffer-live-p epa-keys-buffer))
(if names
(while names
(setq point (point))
- (epa-list-keys-1 (car names) mode)
+ (epa-list-keys-1 context (car names) secret)
(goto-char point)
(epa-mark)
(goto-char (point-max))
(setq names (cdr names)))
- (epa-list-keys-1 nil mode))
+ (epa-list-keys-1 context nil secret))
(epa-keys-mode)
+ (setq epa-exit-buffer-function #'abort-recursive-edit)
(goto-char (point-min))
- (pop-to-buffer (current-buffer))
- (unwind-protect
+ (pop-to-buffer (current-buffer)))
+ (unwind-protect
(progn
(recursive-edit)
(epa-marked-keys))
(if (get-buffer-window epa-keys-buffer)
(delete-window (get-buffer-window epa-keys-buffer)))
- (kill-buffer epa-keys-buffer)))))
+ (kill-buffer epa-keys-buffer))))
(defun epa-show-key (key)
(let* ((primary-sub-key (car (epg-key-sub-key-list key)))
epg-key-validity-alist)))
" ")
" "
- (epg-user-id-name (car pointer))
+ (if (stringp (epg-user-id-name (car pointer)))
+ (epg-user-id-name (car pointer))
+ (epg-decode-dn (epg-user-id-name (car pointer))))
"\n")
(setq pointer (cdr pointer)))
(setq pointer (epg-key-sub-key-list key))
(epa-show-key (widget-get widget :value)))
(defun epa-mark (&optional arg)
- "Mark the current line."
+ "Mark the current line.
+If ARG is non-nil, unmark the current line."
(interactive "P")
(let ((inhibit-read-only t)
buffer-read-only
(forward-line)))
(defun epa-unmark (&optional arg)
- "Unmark the current line."
+ "Unmark the current line.
+If ARG is non-nil, mark the current line."
(interactive "P")
(epa-mark (not arg)))
+(defun epa-exit-buffer ()
+ "Exit the current buffer.
+`epa-exit-buffer-function' is called if it is set."
+ (interactive)
+ (funcall epa-exit-buffer-function))
+
+;;;###autoload
(defun epa-decrypt-file (file)
+ "Decrypt FILE."
(interactive "fFile: ")
(let* ((default-name (file-name-sans-extension file))
(plain (expand-file-name
(epg-decrypt-file context file plain)
(message "Decrypting %s...done" (file-name-nondirectory file))))
+;;;###autoload
(defun epa-verify-file (file)
+ "Verify FILE."
(interactive "fFile: ")
(let* ((context (epg-make-context))
(plain (if (equal (file-name-extension file) "sig")
(epg-verify-result-to-string
(epg-context-result-for context 'verify)))))
-(defun epa-sign-file (file detached)
+;;;###autoload
+(defun epa-sign-file (file signers detached)
+ "Sign FILE by selected SIGNERS keys.
+If DETACHED is non-nil, it creates a detached signature."
(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)
(y-or-n-p "Make a detached signature? ")))
(let ((signature (concat file (if detached ".sig" ".gpg")))
(context (epg-make-context)))
(message "Signing %s..." (file-name-nondirectory file))
+ (epg-context-set-signers context signers)
(epg-sign-file context file signature (not (null detached)))
(message "Signing %s...done" (file-name-nondirectory file))))
+;;;###autoload
(defun epa-encrypt-file (file recipients)
+ "Encrypt FILE for RECIPIENTS."
(interactive
(list (expand-file-name (read-file-name "File: "))
- (epa-select-keys "Select recipents for encryption.
+ (epa-select-keys (epg-make-context) "Select recipents for encryption.
If no one is selected, symmetric encryption will be performed. ")))
(let ((cipher (concat file ".gpg"))
(context (epg-make-context)))
(epg-encrypt-file context file recipients cipher)
(message "Encrypting %s...done" (file-name-nondirectory file))))
+;;;###autoload
(defun epa-delete-keys (keys)
+ "Delete selected KEYS."
(interactive
(let ((keys (epa-marked-keys)))
(unless keys
(apply #'epa-list-keys epa-list-keys-arguments)
(message "Deleting...done")))
+;;;###autoload
(defun epa-import-keys (file)
+ "Import keys from FILE."
(interactive "fFile: ")
(let ((context (epg-make-context)))
(message "Importing %s..." (file-name-nondirectory file))
(apply #'epa-list-keys epa-list-keys-arguments)
(message "Importing %s...done" (file-name-nondirectory file))))
+;;;###autoload
(defun epa-export-keys (keys file)
+ "Export selected KEYS to FILE."
(interactive
(let ((keys (epa-marked-keys))
default-name)
(epg-export-keys-to-file context keys file)
(message "Exporting to %s...done" (file-name-nondirectory file))))
+;;;###autoload
+(defun epa-sign-keys (keys &optional local)
+ "Sign selected KEYS.
+If LOCAL is non-nil, the signature is marked as non exportable."
+ (interactive
+ (let ((keys (epa-marked-keys)))
+ (unless keys
+ (error "No keys selected"))
+ (list keys current-prefix-arg)))
+ (let ((context (epg-make-context)))
+ (message "Signing keys...")
+ (epg-sign-keys context keys local)
+ (message "Signing keys...done")))
+
(provide 'epa)
;;; epa.el ends here
projects / elisp / epg.git / blobdiff