X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=07e6697300cb7d51c604062e443c21ce395cd891;hb=2cb5b6d16de22da82f447f5d94c37700e66e4098;hp=46e12d0c52d92a09f98b6f16191f70b6a0c83335;hpb=ba6865a9315aeabf7ba02dd760cbfc645c8521e6;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 46e12d0..07e6697 100644 --- a/epa.el +++ b/epa.el @@ -1,4 +1,4 @@ -;;; epa.el --- EasyPG Assistant, GUI of EasyPG +;;; epa.el --- the EasyPG Assistant ;; Copyright (C) 2006 Daiki Ueno ;; Author: Daiki Ueno @@ -29,7 +29,7 @@ (eval-when-compile (require 'wid-edit)) (defgroup epa nil - "EasyPG Assistant, GUI of EasyPG." + "The EasyPG Assistant" :group 'epg) (defgroup epa-faces nil @@ -130,7 +130,7 @@ (3 . ?s) (16 . ?g) (17 . ?D) - (20 . G))) + (20 . ?G))) (defvar epa-keys-buffer nil) (defvar epa-key-buffer-alist nil) @@ -140,6 +140,10 @@ (let ((keymap (make-sparse-keymap))) (define-key keymap "m" 'epa-mark) (define-key keymap "u" 'epa-unmark) + (define-key keymap "d" 'epa-decrypt-file) + (define-key keymap "v" 'epa-verify-file) + (define-key keymap "s" 'epa-sign-file) + (define-key keymap "e" 'epa-encrypt-file) (define-key keymap "n" 'next-line) (define-key keymap "p" 'previous-line) (define-key keymap " " 'scroll-up) @@ -215,49 +219,59 @@ (widget-create 'link :tag (epg-sub-key-id primary-sub-key) :notify 'epa-show-key-notify + :help-echo + (format "Show key %s" + (epg-sub-key-id primary-sub-key)) (car keys)) (insert " " (epg-user-id-name primary-user-id) "\n") (put-text-property point (point) 'epa-key (car keys)) (setq keys (cdr keys))))) (defun epa-select-keys (prompt &optional names) - (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) - (set-buffer epa-keys-buffer) - (erase-buffer) - (insert prompt "\n\n" - (substitute-command-keys "\\[exit-recursive-edit] to exit.") - "\n\n") - (if names - (while names - (setq point (point)) - (epa-list-keys-1 (car names)) - (goto-char point) - (epa-mark) - (goto-char (point-max)) - (setq names (cdr names))) - (epa-list-keys-1 nil)) - (epa-keys-mode) - (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)))) - (if (get-buffer-window epa-keys-buffer) - (delete-window (get-buffer-window epa-keys-buffer))) - (kill-buffer epa-keys-buffer)))) + (save-excursion + (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) + (set-buffer epa-keys-buffer) + (erase-buffer) + (insert prompt "\n") + (widget-create 'link + :notify (lambda (&rest ignore) (exit-recursive-edit)) + :help-echo + (substitute-command-keys + "Click here or \\[exit-recursive-edit] to finish") + "OK") + (insert "\n\n") + (if names + (while names + (setq point (point)) + (epa-list-keys-1 (car names)) + (goto-char point) + (epa-mark) + (goto-char (point-max)) + (setq names (cdr names))) + (epa-list-keys-1 nil)) + (epa-keys-mode) + (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)))) + (if (get-buffer-window epa-keys-buffer) + (delete-window (get-buffer-window epa-keys-buffer))) + (kill-buffer epa-keys-buffer))))) (defun epa-show-key (key) (let* ((primary-sub-key (car (epg-key-sub-key-list key))) @@ -340,6 +354,70 @@ (interactive "P") (epa-mark (not arg))) +(defun epa-decrypt-file (file) + (interactive "fFile: ") + (let* ((default-name (file-name-sans-extension file)) + (plain (expand-file-name + (read-file-name + (concat "To file (default " + (file-name-nondirectory default-name) + ") ") + (file-name-directory default-name) + default-name))) + (context (epg-make-context))) + (message "Decrypting %s..." (file-name-nondirectory file)) + (epg-decrypt-file context file plain) + (message "Decrypting %s...done" (file-name-nondirectory file)))) + +(defun epa-verify-file (file) + (interactive "fFile: ") + (let* ((context (epg-make-context)) + (plain (if (equal (file-name-extension file) "sig") + (file-name-sans-extension file))) + signature) + (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) + (interactive + (list (expand-file-name (read-file-name "File: ")) + current-prefix-arg)) + (let ((signature (concat file (if detached ".sig" ".gpg"))) + (context (epg-make-context))) + (message "Signing %s..." (file-name-nondirectory file)) + (epg-sign-file context file signature (if detached '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. ")))) + (let ((cipher (concat file ".gpg")) + (context (epg-make-context))) + (message "Encrypting %s..." (file-name-nondirectory file)) + (epg-encrypt-file context + file + recipients + cipher) + (message "Encrypting %s...done" (file-name-nondirectory file)))) + (provide 'epa) ;;; epa.el ends here