X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=c4f87008e0fc31d58948a83bff6f817eaa444ae5;hb=7dd310a5477089fc298a838e5676fbed2892e282;hp=da9e000f155added79a17fae4f467b4490167c2c;hpb=0b55b55296d1494fe6ee9a3b44c39bb36cc8f140;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index da9e000..c4f8700 100644 --- a/epa.el +++ b/epa.el @@ -152,17 +152,21 @@ (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-key) - (define-key keymap "i" 'epa-import-key) + (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 "n" 'next-line) (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%]" @@ -185,7 +189,9 @@ ? )) (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 @@ -215,6 +221,7 @@ ;; 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 @@ -236,46 +243,77 @@ ;; 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) - (erase-buffer) - (epa-list-keys-1 name mode) + 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-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) - (let ((inhibit-read-only t) - buffer-read-only - (keys (epg-list-keys name mode)) - point) - (while keys - (setq point (point)) - (insert " ") - (put-text-property point (point) 'epa-key (car keys)) - (widget-create 'epa-key :value (car keys)) - (insert "\n") - (setq keys (cdr keys))))) - -(defun epa-select-keys (prompt &optional names) +(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 context name mode)) + point) + (while keys + (setq point (point)) + (insert " ") + (put-text-property point (point) 'epa-key (car keys)) + (widget-create 'epa-key :value (car keys)) + (insert "\n") + (setq keys (cdr keys)))) + (put-text-property (point-min) (point-max) 'epa-list-keys t))) + +(defun epa-marked-keys () + (or (save-excursion + (set-buffer epa-keys-buffer) + (goto-char (point-min)) + (let (keys key) + (while (re-search-forward "^\\*" nil t) + (if (setq key (get-text-property (match-beginning 0) + 'epa-key)) + (setq keys (cons key keys)))) + (nreverse keys))) + (save-excursion + (beginning-of-line) + (let ((key (get-text-property (point) 'epa-key))) + (if key + (list key)))))) + +(defun epa-select-keys (context prompt &optional names mode) (save-excursion (unless (and epa-keys-buffer (buffer-live-p epa-keys-buffer)) @@ -287,6 +325,12 @@ (erase-buffer) (insert prompt "\n") (widget-create 'link + :notify (lambda (&rest ignore) (abort-recursive-edit)) + :help-echo + (substitute-command-keys + "Click here or \\[abort-recursive-edit] to cancel") + "Cancel") + (widget-create 'link :notify (lambda (&rest ignore) (exit-recursive-edit)) :help-echo (substitute-command-keys @@ -296,27 +340,20 @@ (if names (while names (setq point (point)) - (epa-list-keys-1 (car names) nil) + (epa-list-keys-1 context (car names) mode) (goto-char point) (epa-mark) (goto-char (point-max)) (setq names (cdr names))) - (epa-list-keys-1 nil nil)) + (epa-list-keys-1 context nil mode)) (epa-keys-mode) + (setq epa-exit-buffer-function #'abort-recursive-edit) (goto-char (point-min)) (pop-to-buffer (current-buffer)) (unwind-protect (progn (recursive-edit) - (save-excursion - (set-buffer epa-keys-buffer) - (goto-char (point-min)) - (let (keys key) - (while (re-search-forward "^\\*" nil t) - (if (setq key (get-text-property (match-beginning 0) - 'epa-key)) - (setq keys (cons key keys)))) - (nreverse keys)))) + (epa-marked-keys)) (if (get-buffer-window epa-keys-buffer) (delete-window (get-buffer-window epa-keys-buffer))) (kill-buffer epa-keys-buffer))))) @@ -348,7 +385,9 @@ 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)) @@ -406,6 +445,10 @@ (interactive "P") (epa-mark (not arg))) +(defun epa-exit-buffer () + (interactive) + (funcall epa-exit-buffer-function)) + (defun epa-decrypt-file (file) (interactive "fFile: ") (let* ((default-name (file-name-sans-extension file)) @@ -425,73 +468,94 @@ (interactive "fFile: ") (let* ((context (epg-make-context)) (plain (if (equal (file-name-extension file) "sig") - (file-name-sans-extension file))) - signature) + (file-name-sans-extension file)))) (message "Verifying %s..." (file-name-nondirectory file)) (epg-verify-file context file plain) - (setq signature (reverse (epg-context-result-for context 'verify))) - (with-output-to-temp-buffer "*epa-verify-file*" - (set-buffer standard-output) - (while signature - (insert (format "%s: %s %s %s\n" - (epg-signature-status (car signature)) - (epg-signature-key-id (car signature)) - (epg-signature-user-id (car signature)) - (epg-signature-validity (car signature)))) - (setq signature (cdr signature)))) - (shrink-window-if-larger-than-buffer - (get-buffer-window "*epa-verify-file*")) - (message "Verifying %s...done" (file-name-nondirectory file)))) - -(defun epa-sign-file (file detached) + (message "Verifying %s...done" (file-name-nondirectory file)) + (message "%s" + (epg-verify-result-to-string + (epg-context-result-for context 'verify))))) + +(defun epa-sign-file (file signers detached) (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)))) (defun epa-encrypt-file (file recipients) (interactive (list (expand-file-name (read-file-name "File: ")) - (mapcar (lambda (key) - (epg-sub-key-id - (car (epg-key-sub-key-list key)))) - (epa-select-keys "Select recipents for encryption. -If no one is selected, symmetric encryption will be performed. ")))) + (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))) (message "Encrypting %s..." (file-name-nondirectory file)) - (epg-encrypt-file context - file - recipients - cipher) + (epg-encrypt-file context file recipients cipher) (message "Encrypting %s...done" (file-name-nondirectory file)))) -(defun epa-delete-key (key) +(defun epa-delete-keys (keys) (interactive - (list - (save-excursion - (beginning-of-line) - (get-text-property (point) 'epa-key)))) + (let ((keys (epa-marked-keys))) + (unless keys + (error "No keys selected")) + (list keys))) (let ((context (epg-make-context))) - (message "Deleting %s..." - (epg-sub-key-id (car (epg-key-sub-key-list key)))) - (epg-delete-key context key) + (message "Deleting...") + (epg-delete-keys context keys) (apply #'epa-list-keys epa-list-keys-arguments) - (message "Deleting %s...done" - (epg-sub-key-id (car (epg-key-sub-key-list key)))))) + (message "Deleting...done"))) -(defun epa-import-key (file) - (interactive "sFile: ") +(defun epa-import-keys (file) + (interactive "fFile: ") (let ((context (epg-make-context))) (message "Importing %s..." (file-name-nondirectory file)) - (epg-import-key context file) + (epg-import-keys-from-file context (expand-file-name file)) (apply #'epa-list-keys epa-list-keys-arguments) (message "Importing %s...done" (file-name-nondirectory file)))) +(defun epa-export-keys (keys file) + (interactive + (let ((keys (epa-marked-keys)) + default-name) + (unless keys + (error "No keys selected")) + (setq default-name + (expand-file-name + (concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys)))) + ".gpg") + default-directory)) + (list keys + (expand-file-name + (read-file-name + (concat "To file (default " + (file-name-nondirectory default-name) + ") ") + (file-name-directory default-name) + default-name))))) + (let ((context (epg-make-context))) + (message "Exporting to %s..." (file-name-nondirectory file)) + (epg-export-keys-to-file context keys file) + (message "Exporting to %s...done" (file-name-nondirectory file)))) + +(defun epa-sign-keys (keys &optional local) + (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