X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=4d16a3c8fd3bf60a0cc4ec58e56729470d235fa9;hb=2e8cf939a067948d210ebbf01576000de13c970c;hp=9ae9bf2761483c94843ab93261b2718911893c58;hpb=28164b2add2c4bc374542dea4acebe8ea31c00cf;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 9ae9bf2..4d16a3c 100644 --- a/epa.el +++ b/epa.el @@ -32,6 +32,16 @@ "The EasyPG Assistant" :group 'epg) +(defcustom epa-armor nil + "If non-nil, epa commands create ASCII armored output." + :type 'boolean + :group 'epa) + +(defcustom epa-textmode nil + "If non-nil, epa commands treat input files as text." + :type 'boolean + :group 'epa) + (defgroup epa-faces nil "Faces for epa-mode." :group 'epa) @@ -475,7 +485,11 @@ If ARG is non-nil, mark the current line." (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)))) + (message "Decrypting %s...done" (file-name-nondirectory file)) + (if (epg-context-result-for context 'verify) + (message "%s" + (epg-verify-result-to-string + (epg-context-result-for context 'verify)))))) ;;;###autoload (defun epa-verify-file (file) @@ -492,20 +506,30 @@ If ARG is non-nil, mark the current line." (epg-context-result-for context 'verify))))) ;;;###autoload -(defun epa-sign-file (file signers detached) - "Sign FILE by selected SIGNERS keys. -If DETACHED is non-nil, it creates a detached signature." +(defun epa-sign-file (file signers mode) + "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. 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"))) + (if (y-or-n-p "Make a detached signature? ") + 'detached + (if (y-or-n-p "Make a cleartext signature? ") + 'clear)))) + (let ((signature (concat file + (if (or epa-armor + (not (memq mode '(nil t normal detached)))) + ".asc" + (if (memq mode '(t detached)) + ".sig" + ".gpg")))) (context (epg-make-context))) - (message "Signing %s..." (file-name-nondirectory file)) + (epg-context-set-armor context epa-armor) + (epg-context-set-textmode context epa-textmode) (epg-context-set-signers context signers) - (epg-sign-file context file signature (not (null detached))) + (message "Signing %s..." (file-name-nondirectory file)) + (epg-sign-file context file signature mode) (message "Signing %s...done" (file-name-nondirectory file)))) ;;;###autoload @@ -515,25 +539,162 @@ If no one is selected, default secret key is used. " (list (expand-file-name (read-file-name "File: ")) (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")) + (let ((cipher (concat file (if epa-armor ".asc" ".gpg"))) (context (epg-make-context))) + (epg-context-set-armor context epa-armor) + (epg-context-set-textmode context epa-textmode) (message "Encrypting %s..." (file-name-nondirectory file)) (epg-encrypt-file context file recipients cipher) (message "Encrypting %s...done" (file-name-nondirectory file)))) ;;;###autoload -(defun epa-delete-keys (keys) +(defun epa-decrypt-region (start end) + "Decrypt the current region between START and END." + (interactive "r") + (save-excursion + (let ((context (epg-make-context)) + charset plain coding-system) + (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." + (interactive "r") + (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char start) + (let (armor-start armor-end charset plain 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-----$" + nil t)) + (unless armor-end + (error "No armor tail")) + (goto-char armor-start) + (if (re-search-forward "^Charset: \\(.*\\)" armor-end t) + (setq charset (match-string 1))) + (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))) + (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." + (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." + (interactive "r") + (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char start) + (let (armor-start armor-end) + (while (re-search-forward "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----$" + nil t) + (setq armor-start (match-beginning 0)) + (if (match-beginning 1) ;cleartext signed message + (progn + (unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$" + nil t) + (error "Invalid cleartext signed message")) + (setq armor-end (re-search-forward + "^-----END PGP SIGNATURE-----$" + nil t))) + (setq armor-end (re-search-forward + "^-----END PGP MESSAGE-----$" + nil t))) + (unless armor-end + (error "No armor tail")) + (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." + (interactive + (list (region-beginning) (region-end) + (epa-select-keys (epg-make-context) "Select keys for signing. +If no one is selected, default secret key is used. " + nil t) + (if (y-or-n-p "Make a detached signature? ") + 'detached + (if (y-or-n-p "Make a cleartext signature? ") + 'clear)))) + (save-excursion + (let ((context (epg-make-context)) + signature) + (epg-context-set-armor context epa-armor) + (epg-context-set-textmode context epa-textmode) + (epg-context-set-signers context signers) + (message "Signing...") + (setq signature (epg-sign-string context + (encode-coding-string + (buffer-substring start end) + coding-system-for-write) + mode)) + (message "Signing...done") + (delete-region start end) + (insert (decode-coding-string signature coding-system-for-read))))) + +;;;###autoload +(defun epa-encrypt-region (start end recipients) + "Encrypt the current region between START and END for RECIPIENTS." + (interactive + (list (region-beginning) (region-end) + (epa-select-keys (epg-make-context) "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. "))) + (save-excursion + (let ((context (epg-make-context)) + cipher) + (epg-context-set-armor context epa-armor) + (epg-context-set-textmode context epa-textmode) + (message "Encrypting...") + (setq cipher (epg-encrypt-string context + (encode-coding-string + (buffer-substring start end) + coding-system-for-write) + recipients)) + (message "Encrypting...done") + (delete-region start end) + (insert cipher)))) + +;;;###autoload +(defun epa-delete-keys (keys &optional allow-secret) "Delete selected KEYS." (interactive (let ((keys (epa-marked-keys))) (unless keys (error "No keys selected")) - (list keys))) + (list keys + (eq (nth 1 epa-list-keys-arguments) t)))) (let ((context (epg-make-context))) (message "Deleting...") - (epg-delete-keys context keys) - (apply #'epa-list-keys epa-list-keys-arguments) - (message "Deleting...done"))) + (epg-delete-keys context keys allow-secret) + (message "Deleting...done") + (apply #'epa-list-keys epa-list-keys-arguments))) ;;;###autoload (defun epa-import-keys (file) @@ -542,8 +703,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) @@ -556,7 +717,7 @@ If no one is selected, symmetric encryption will be performed. "))) (setq default-name (expand-file-name (concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys)))) - ".gpg") + (if epa-armor ".asc" ".gpg")) default-directory)) (list keys (expand-file-name @@ -567,6 +728,7 @@ If no one is selected, symmetric encryption will be performed. "))) (file-name-directory default-name) default-name))))) (let ((context (epg-make-context))) + (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))))