X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=1a84de3c41a9498077b25b2a0e6fb084d9e3a7bd;hb=6ea4768dfc6993c0553985ee7855e8ce51f766a9;hp=6b12a4d21dc98e8b3fdd7b24a611b4e514ded2c1;hpb=4c57482ad8d08028d9dd44073dbb579f171b3189;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 6b12a4d..1a84de3 100644 --- a/epa.el +++ b/epa.el @@ -32,6 +32,12 @@ "The EasyPG Assistant" :group 'epg) +(defcustom epa-protocol 'OpenPGP + "The default protocol." + :type '(choice (const :tag "OpenPGP" OpenPGP) + (const :tag "CMS" CMS)) + :group 'epa) + (defcustom epa-armor nil "If non-nil, epa commands create ASCII armored output." :type 'boolean @@ -166,6 +172,7 @@ the separate window." (defvar epa-key nil) (defvar epa-list-keys-arguments nil) (defvar epa-info-buffer nil) +(defvar epa-last-coding-system-specified nil) (defvar epa-keys-mode-map (let ((keymap (make-sparse-keymap))) @@ -323,18 +330,18 @@ If ARG is non-nil, mark the current line." (funcall epa-exit-buffer-function)) ;;;###autoload -(defun epa-list-keys (&optional name mode protocol) +(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? ") - (intern (completing-read "Protocol? " - '(("OpenPGP") ("CMS")) - nil t)))) - (or epa-list-keys-arguments (list nil nil nil)))) + (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*"))) @@ -342,7 +349,7 @@ If ARG is non-nil, mark the current line." (let ((inhibit-read-only t) buffer-read-only (point (point-min)) - (context (epg-make-context protocol))) + (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 @@ -350,16 +357,16 @@ If ARG is non-nil, mark the current line." (or (next-single-property-change point 'epa-list-keys) (point-max))) (goto-char point)) - (epa-insert-keys context name mode) + (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 protocol)) + (setq epa-list-keys-arguments (list name mode)) (goto-char (point-min)) (pop-to-buffer (current-buffer))) -(defun epa-insert-keys (context name mode) +(defun epa--insert-keys (context name mode) (save-excursion (save-restriction (narrow-to-region (point) (point)) @@ -432,17 +439,17 @@ If SECRET is non-nil, list secret keys instead of public keys." (insert "\n\n") (if names (while names - (epa-insert-keys context (car names) secret) + (epa--insert-keys context (car names) secret) (if (get-text-property (point) 'epa-list-keys) (epa-mark)) (goto-char (point-max)) (setq names (cdr names))) (if secret (progn - (epa-insert-keys context nil secret) + (epa--insert-keys context nil secret) (if (get-text-property (point) 'epa-list-keys) (epa-mark))) - (epa-insert-keys context nil nil))) + (epa--insert-keys context nil nil))) (epa-keys-mode) (widget-setup) (set-keymap-parent (current-local-map) widget-keymap) @@ -585,7 +592,7 @@ If SECRET is non-nil, list secret keys instead of public keys." ") ") (file-name-directory default-name) default-name))) - (context (epg-make-context))) + (context (epg-make-context epa-protocol))) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context @@ -603,7 +610,7 @@ If SECRET is non-nil, list secret keys instead of public keys." "Verify FILE." (interactive "fFile: ") (setq file (expand-file-name file)) - (let* ((context (epg-make-context)) + (let* ((context (epg-make-context epa-protocol)) (plain (if (equal (file-name-extension file) "sig") (file-name-sans-extension file)))) (epg-context-set-progress-callback context @@ -620,7 +627,8 @@ If SECRET is non-nil, list secret keys instead of public keys." "Sign FILE by SIGNERS keys selected." (interactive (list (expand-file-name (read-file-name "File: ")) - (epa-select-keys (epg-make-context) "Select keys for signing. + (epa-select-keys (epg-make-context epa-protocol) + "Select keys for signing. If no one is selected, default secret key is used. " nil t) (catch 'done @@ -644,13 +652,18 @@ d - Create a detached signature (t (throw 'done nil)))))))) (let ((signature (concat file - (if (or epa-armor - (not (memq mode '(nil t normal detached)))) - ".asc" + (if (eq epa-protocol 'OpenPGP) + (if (or epa-armor + (not (memq mode + '(nil t normal detached)))) + ".asc" + (if (memq mode '(t detached)) + ".sig" + ".gpg")) (if (memq mode '(t detached)) - ".sig" - ".gpg")))) - (context (epg-make-context))) + ".p7s" + ".p7m")))) + (context (epg-make-context epa-protocol))) (epg-context-set-armor context epa-armor) (epg-context-set-textmode context epa-textmode) (epg-context-set-signers context signers) @@ -668,10 +681,13 @@ d - Create a detached signature "Encrypt FILE for RECIPIENTS." (interactive (list (expand-file-name (read-file-name "File: ")) - (epa-select-keys (epg-make-context) "Select recipients for encryption. + (epa-select-keys (epg-make-context epa-protocol) + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. "))) - (let ((cipher (concat file (if epa-armor ".asc" ".gpg"))) - (context (epg-make-context))) + (let ((cipher (concat file (if (eq epa-protocol 'OpenPGP) + (if epa-armor ".asc" ".gpg") + ".p7m"))) + (context (epg-make-context epa-protocol))) (epg-context-set-armor context epa-armor) (epg-context-set-textmode context epa-textmode) (epg-context-set-passphrase-callback context @@ -690,7 +706,7 @@ If no one is selected, symmetric encryption will be performed. "))) Don't use this command in Lisp programs!" (interactive "r") (save-excursion - (let ((context (epg-make-context)) + (let ((context (epg-make-context epa-protocol)) plain) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) @@ -701,7 +717,10 @@ Don't use this command in Lisp programs!" (message "Decrypting...done") (delete-region start end) (goto-char start) - (insert (epa--decode-coding-string plain coding-system-for-read)) + (insert (epa--decode-coding-string plain + (or coding-system-for-read + (get-text-property + start 'epa-coding-system-used)))) (if (epg-context-result-for context 'verify) (epa-display-info (epg-verify-result-to-string (epg-context-result-for context 'verify))))))) @@ -734,19 +753,26 @@ Don't use this command in Lisp programs!" (let ((coding-system-for-read coding-system)) (epa-decrypt-region start end))))))) +(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))) + (let ((context (epg-make-context epa-protocol))) (epg-context-set-progress-callback context #'epa-progress-callback-function) (epg-verify-string context (epa--encode-coding-string (buffer-substring start end) - coding-system-for-write)) + (or coding-system-for-write + (get-text-property start + 'epa-coding-system-used)))) (if (epg-context-result-for context 'verify) (epa-display-info (epg-verify-result-to-string (epg-context-result-for context 'verify)))))) @@ -782,35 +808,43 @@ Don't use this command in Lisp programs!" Don't use this command in Lisp programs!" (interactive - (list (region-beginning) (region-end) - (epa-select-keys (epg-make-context) "Select keys for signing. + (progn + (setq epa-last-coding-system-specified + (or coding-system-for-write + (epa--select-safe-coding-system + (region-beginning) (region-end)))) + (list (region-beginning) (region-end) + (epa-select-keys (epg-make-context epa-protocol) + "Select keys for signing. If no one is selected, default secret key is used. " - nil t) - (catch 'done - (while t - (message "Signature type (n,c,d,?) ") - (let ((c (read-char))) - (cond ((eq c ?c) - (throw 'done 'clear)) - ((eq c ?d) - (throw 'done 'detached)) - ((eq c ??) - (with-output-to-temp-buffer "*Help*" - (save-excursion - (set-buffer standard-output) - (insert "\ + nil t) + (catch 'done + (while t + (message "Signature type (n,c,d,?) ") + (let ((c (read-char))) + (cond ((eq c ?c) + (throw 'done 'clear)) + ((eq c ?d) + (throw 'done 'detached)) + ((eq c ??) + (with-output-to-temp-buffer "*Help*" + (save-excursion + (set-buffer standard-output) + (insert "\ n - Create a normal signature c - Create a cleartext signature d - Create a detached signature ? - Show this help ")))) - (t - (throw 'done nil)))))))) + (t + (throw 'done nil))))))))) (save-excursion - (let ((context (epg-make-context)) + (let ((context (epg-make-context epa-protocol)) signature) - (epg-context-set-armor context epa-armor) - (epg-context-set-textmode context epa-textmode) + ;;(epg-context-set-armor context epa-armor) + (epg-context-set-armor context t) + ;;(epg-context-set-textmode context epa-textmode) + (epg-context-set-textmode context t) (epg-context-set-signers context signers) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) @@ -820,11 +854,23 @@ d - Create a detached signature (setq signature (epg-sign-string context (epa--encode-coding-string (buffer-substring start end) - coding-system-for-write) + epa-last-coding-system-specified) mode)) (message "Signing...done") (delete-region start end) - (insert (epa--decode-coding-string signature coding-system-for-read))))) + (add-text-properties (point) + (progn + (insert (epa--decode-coding-string + signature + (or coding-system-for-read + epa-last-coding-system-specified))) + (point)) + (list 'epa-coding-system-used + epa-last-coding-system-specified + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t))))) ;;;###autoload (defun epa-encrypt-region (start end recipients) @@ -832,14 +878,22 @@ d - Create a detached signature Don't use this command in Lisp programs!" (interactive - (list (region-beginning) (region-end) - (epa-select-keys (epg-make-context) "Select recipients for encryption. -If no one is selected, symmetric encryption will be performed. "))) + (progn + (setq epa-last-coding-system-specified + (or coding-system-for-write + (epa--select-safe-coding-system + (region-beginning) (region-end)))) + (list (region-beginning) (region-end) + (epa-select-keys (epg-make-context epa-protocol) + "Select recipients for encryption. +If no one is selected, symmetric encryption will be performed. ")))) (save-excursion - (let ((context (epg-make-context)) + (let ((context (epg-make-context epa-protocol)) cipher) - (epg-context-set-armor context epa-armor) - (epg-context-set-textmode context epa-textmode) + ;;(epg-context-set-armor context epa-armor) + (epg-context-set-armor context t) + ;;(epg-context-set-textmode context epa-textmode) + (epg-context-set-textmode context t) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context @@ -848,11 +902,20 @@ If no one is selected, symmetric encryption will be performed. "))) (setq cipher (epg-encrypt-string context (epa--encode-coding-string (buffer-substring start end) - coding-system-for-write) + epa-last-coding-system-specified) recipients)) (message "Encrypting...done") (delete-region start end) - (insert cipher)))) + (add-text-properties (point) + (progn + (insert cipher) + (point)) + (list 'epa-coding-system-used + epa-last-coding-system-specified + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t))))) ;;;###autoload (defun epa-delete-keys (keys &optional allow-secret) @@ -865,7 +928,7 @@ Don't use this command in Lisp programs!" (error "No keys selected")) (list keys (eq (nth 1 epa-list-keys-arguments) t)))) - (let ((context (epg-make-context))) + (let ((context (epg-make-context epa-protocol))) (message "Deleting...") (epg-delete-keys context keys allow-secret) (message "Deleting...done") @@ -878,7 +941,7 @@ Don't use this command in Lisp programs!" Don't use this command in Lisp programs!" (interactive "fFile: ") (setq file (expand-file-name file)) - (let ((context (epg-make-context))) + (let ((context (epg-make-context epa-protocol))) (message "Importing %s..." (file-name-nondirectory file)) (condition-case nil (progn @@ -893,6 +956,24 @@ Don't use this command in Lisp programs!" (apply #'epa-list-keys epa-list-keys-arguments)))) ;;;###autoload +(defun epa-import-keys-region (start end) + "Import keys from the region. + +Don't use this command in Lisp programs!" + (interactive "r") + (let ((context (epg-make-context epa-protocol))) + (message "Importing...") + (condition-case nil + (progn + (epg-import-keys-from-string context (buffer-substring start end)) + (message "Importing...done")) + (error + (message "Importing...failed"))) + (if (epg-context-result-for context 'import) + (epa-display-info (epg-import-result-to-string + (epg-context-result-for context 'import)))))) + +;;;###autoload (defun epa-export-keys (keys file) "Export selected KEYS to FILE. @@ -915,13 +996,26 @@ Don't use this command in Lisp programs!" ") ") (file-name-directory default-name) default-name))))) - (let ((context (epg-make-context))) + (let ((context (epg-make-context epa-protocol))) (epg-context-set-armor context epa-armor) (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)))) ;;;###autoload +(defun epa-insert-keys (keys) + "Insert selected KEYS after the point. + +Don't use this command in Lisp programs!" + (interactive + (list (epa-select-keys (epg-make-context epa-protocol) + "Select keys to export. "))) + (let ((context (epg-make-context epa-protocol))) + ;;(epg-context-set-armor context epa-armor) + (epg-context-set-armor context t) + (insert (epg-export-keys-to-string context keys)))) + +;;;###autoload (defun epa-sign-keys (keys &optional local) "Sign selected KEYS. If a prefix-arg is specified, the signature is marked as non exportable. @@ -932,7 +1026,7 @@ Don't use this command in Lisp programs!" (unless keys (error "No keys selected")) (list keys current-prefix-arg))) - (let ((context (epg-make-context))) + (let ((context (epg-make-context epa-protocol))) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context