X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=b9eb487199d561068c283b5a75c913d218b4fb94;hb=d00ee5e0ec545a77b645d8faaf6961deb7073346;hp=12b57407bb6707e46da7596401e023eb853470d3;hpb=eeaa937a3de2d4fc177249e74d347727829ef78e;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 12b5740..b9eb487 100644 --- a/epa.el +++ b/epa.el @@ -41,7 +41,7 @@ "If non-nil, epa commands treat input files as text." :type 'boolean :group 'epa) - + (defgroup epa-faces nil "Faces for epa-mode." :group 'epa) @@ -284,28 +284,37 @@ (or (next-single-property-change point 'epa-list-keys) (point-max))) (goto-char point)) - (epa-list-keys-1 context name mode) + (epa-insert-keys context name mode) (epa-keys-mode)) (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-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-insert-keys (context name mode) + (save-excursion + (save-restriction + (narrow-to-region (point) (point)) + (let ((keys (epg-list-keys context name mode)) + point) + (while keys + (setq point (point)) + (insert " ") + (add-text-properties point (point) + (list 'epa-key (car keys) + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t)) + (widget-create 'epa-key :value (car keys)) + (insert "\n") + (setq keys (cdr keys)))) + (add-text-properties (point-min) (point-max) + (list 'epa-list-keys t + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t))))) (defun epa-marked-keys () (or (save-excursion @@ -357,12 +366,12 @@ If SECRET is non-nil, list secret keys instead of public keys." (if names (while names (setq point (point)) - (epa-list-keys-1 context (car names) secret) + (epa-insert-keys context (car names) secret) (goto-char point) (epa-mark) (goto-char (point-max)) (setq names (cdr names))) - (epa-list-keys-1 context nil secret)) + (epa-insert-keys context nil secret)) (epa-keys-mode) (setq epa-exit-buffer-function #'abort-recursive-edit) (goto-char (point-min)) @@ -527,8 +536,8 @@ If no one is selected, default secret key is used. " (context (epg-make-context))) (epg-context-set-armor context epa-armor) (epg-context-set-textmode context epa-textmode) - (message "Signing %s..." (file-name-nondirectory file)) (epg-context-set-signers context signers) + (message "Signing %s..." (file-name-nondirectory file)) (epg-sign-file context file signature mode) (message "Signing %s...done" (file-name-nondirectory file)))) @@ -548,14 +557,36 @@ If no one is selected, symmetric encryption will be performed. "))) (message "Encrypting %s...done" (file-name-nondirectory file)))) ;;;###autoload +(defun epa-decrypt-region (start end) + "Decrypt the current region between START and END. + +Don't use this command in Lisp programs!" + (interactive "r") + (save-excursion + (let ((context (epg-make-context)) + plain) + (message "Decrypting...") + (setq plain (epg-decrypt-string context (buffer-substring start end))) + (message "Decrypting...done") + (delete-region start end) + (goto-char start) + (insert (decode-coding-string plain coding-system-for-read)) + (if (epg-context-result-for context 'verify) + (message "%s" + (epg-verify-result-to-string + (epg-context-result-for context 'verify))))))) + +;;;###autoload (defun epa-decrypt-armor-in-region (start end) - "Decrypt OpenPGP armors in the current region between START and END." + "Decrypt OpenPGP armors 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 charset plain coding-system) + (let (armor-start armor-end charset coding-system) (while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t) (setq armor-start (match-beginning 0) armor-end (re-search-forward "^-----END PGP MESSAGE-----$" @@ -565,27 +596,34 @@ If no one is selected, symmetric encryption will be performed. "))) (goto-char armor-start) (if (re-search-forward "^Charset: \\(.*\\)" armor-end t) (setq charset (match-string 1))) - (message "Decrypting...") - (setq plain (epg-decrypt-string - (epg-make-context) - (buffer-substring armor-start armor-end))) - (message "Decrypting...done") - (delete-region armor-start armor-end) - (goto-char armor-start) (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))) - (insert (decode-coding-string plain coding-system)) - (if (epg-context-result-for context 'verify) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify))))))))) + (let ((coding-system-for-read coding-system)) + (epa-decrypt-region start end))))))) + +;;;###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))) + (epg-verify-string context + (encode-coding-string + (buffer-substring start end) + coding-system-for-write)) + (message "%s" + (epg-verify-result-to-string + (epg-context-result-for context 'verify))))) ;;;###autoload (defun epa-verify-armor-in-region (start end) - "Verify OpenPGP armors in the current region between START and END." + "Verify OpenPGP armors in the current region between START and END. + +Don't use this command in Lisp programs!" (interactive "r") (save-excursion (save-restriction @@ -608,17 +646,13 @@ If no one is selected, symmetric encryption will be performed. "))) nil t))) (unless armor-end (error "No armor tail")) - (epg-verify-string (epg-make-context) - (encode-coding-string - (buffer-substring armor-start armor-end) - coding-system-for-write)) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify)))))))) + (epa-verify-region armor-start armor-end)))))) ;;;###autoload (defun epa-sign-region (start end signers mode) - "Sign the current region between START and END by SIGNERS keys selected." + "Sign the current region between START and END by SIGNERS keys selected. + +Don't use this command in Lisp programs!" (interactive (list (region-beginning) (region-end) (epa-select-keys (epg-make-context) "Select keys for signing. @@ -633,8 +667,8 @@ If no one is selected, default secret key is used. " signature) (epg-context-set-armor context epa-armor) (epg-context-set-textmode context epa-textmode) - (message "Signing...") (epg-context-set-signers context signers) + (message "Signing...") (setq signature (epg-sign-string context (encode-coding-string (buffer-substring start end) @@ -646,7 +680,9 @@ If no one is selected, default secret key is used. " ;;;###autoload (defun epa-encrypt-region (start end recipients) - "Encrypt the current region between START and END for RECIPIENTS." + "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 recipents for encryption. @@ -678,8 +714,8 @@ If no one is selected, symmetric encryption will be performed. "))) (let ((context (epg-make-context))) (message "Deleting...") (epg-delete-keys context keys allow-secret) - (apply #'epa-list-keys epa-list-keys-arguments) - (message "Deleting...done"))) + (message "Deleting...done") + (apply #'epa-list-keys epa-list-keys-arguments))) ;;;###autoload (defun epa-import-keys (file) @@ -688,8 +724,8 @@ If no one is selected, symmetric encryption will be performed. "))) (let ((context (epg-make-context))) (message "Importing %s..." (file-name-nondirectory 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)))) + (message "Importing %s...done" (file-name-nondirectory file)) + (apply #'epa-list-keys epa-list-keys-arguments))) ;;;###autoload (defun epa-export-keys (keys file)