X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=330e7c46926c58c809d3bb1d6de8d2b1b20a02ba;hb=b1d05ceee17137266c8a4729bb0180fe265baae4;hp=2020ebcc192b3a24ac885b9affa5f20d933ec697;hpb=adfcc7d88131d97581d89abd7e0c57302a95b9a1;p=elisp%2Fepg.git diff --git a/epg.el b/epg.el index 2020ebc..330e7c4 100644 --- a/epg.el +++ b/epg.el @@ -260,11 +260,12 @@ This function is for internal use only." (defun epg-read-output (context) (with-temp-buffer - (set-buffer-multibyte nil) + (if (fboundp 'set-buffer-multibyte) + (set-buffer-multibyte nil)) (if (file-exists-p (epg-context-output-file context)) - (let ((coding-system-for-read (if (epg-context-output-file context) + (let ((coding-system-for-read (if (epg-context-textmode context) 'raw-text - 'binary))) + 'binary))) (insert-file-contents (epg-context-output-file context)) (buffer-string))))) @@ -276,7 +277,8 @@ This function is for internal use only." (accept-process-output (epg-context-process context) 1)))) (defun epg-wait-for-completion (context) - (process-send-eof (epg-context-process context)) + (if (eq (process-status (epg-context-process context)) 'run) + (process-send-eof (epg-context-process context))) (while (eq (process-status (epg-context-process context)) 'run) ;; We can't use accept-process-output instead of sit-for here ;; because it may cause an interrupt during the sentinel execution. @@ -315,11 +317,17 @@ This function is for internal use only." (let ((passphrase (funcall (car (epg-context-passphrase-callback-info epg-context)) epg-key-id - (cdr (epg-context-passphrase-callback-info epg-context))))) - (unwind-protect - (if passphrase - (process-send-string process (concat passphrase "\n"))) - (fillarray passphrase 0)))) + (cdr (epg-context-passphrase-callback-info epg-context)))) + string) + (if passphrase + (unwind-protect + (progn + (setq string (concat passphrase "\n")) + (fillarray passphrase 0) + (setq passphrase nil) + (process-send-string process string)) + (if string + (fillarray string 0)))))) (defun epg-status-GOODSIG (process string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) @@ -372,7 +380,7 @@ This function is for internal use only." (epg-context-result-for epg-context 'verify))))) (defun epg-status-TRUST_UNDEFINED (process string) - (let ((signature (car (epg-context-result-for-for epg-context 'verify)))) + (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'unknown)))) @@ -401,9 +409,6 @@ This function is for internal use only." (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'full)))) -(defun epg-status-DECRYPTION_FAILED (process string) - (epg-context-set-result-for epg-context 'decrypt 'failed)) - (defun epg-status-PROGRESS (process string) (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)" string) @@ -414,13 +419,49 @@ This function is for internal use only." (string-to-number (match-string 4 string)) (cdr (epg-context-progress-callback-info epg-context))))) +(defun epg-status-DECRYPTION_FAILED (process string) + (epg-context-set-result-for + epg-context 'error + (cons 'decryption-failed + (epg-context-result-for epg-context 'error)))) + +(defun epg-status-NODATA (process string) + (epg-context-set-result-for + epg-context 'error + (cons (cons 'no-data (string-to-number string)) + (epg-context-result-for epg-context 'error)))) + +(defun epg-status-UNEXPECTED (process string) + (epg-context-set-result-for + epg-context 'error + (cons (cons 'unexpected (string-to-number string)) + (epg-context-result-for epg-context 'error)))) + +(defun epg-status-KEYEXPIRED (process string) + (epg-context-set-result-for + epg-context 'error + (cons (cons 'key-expired string) + (epg-context-result-for epg-context 'error)))) + +(defun epg-status-KEYREVOKED (process string) + (epg-context-set-result-for + epg-context 'error + (cons 'key-revoked + (epg-context-result-for epg-context 'error)))) + +(defun epg-status-BADARMOR (process string) + (epg-context-set-result-for + epg-context 'error + (cons 'bad-armor + (epg-context-result-for epg-context 'error)))) + (defun epg-passphrase-callback-function (key-id handback) (read-passwd (if (eq key-id 'SYM) - "GnuPG passphrase for symmetric encryption: " + "Passphrase for symmetric encryption: " (if (eq key-id 'PIN) - "GnuPG passphrase for PIN: " - (format "GnuPG passphrase for %s: " + "Passphrase for PIN: " + (format "Passphrase for %s: " (let ((entry (assoc key-id epg-user-id-alist))) (if entry (cdr entry) @@ -482,6 +523,55 @@ This function is for internal use only." (setq alist (cdr alist))) (nreverse result))) +(if (fboundp 'make-temp-file) + (defalias 'epg-make-temp-file 'make-temp-file) + ;; stolen from poe.el. + (defun epg-make-temp-file (prefix) + "Create a temporary file. +The returned file name (created by appending some random characters at the end +of PREFIX, and expanding against `temporary-file-directory' if necessary), +is guaranteed to point to a newly created empty file. +You can then use `write-region' to write new data into the file." + (let (tempdir tempfile) + (unwind-protect + (let (file) + ;; First, create a temporary directory. + (while (condition-case () + (progn + (setq tempdir (make-temp-name + (concat + (file-name-directory prefix) + "DIR"))) + ;; return nil or signal an error. + (make-directory tempdir)) + ;; let's try again. + (file-already-exists t))) + (set-file-modes tempdir 448) + ;; Second, create a temporary file in the tempdir. + ;; There *is* a race condition between `make-temp-name' + ;; and `write-region', but we don't care it since we are + ;; in a private directory now. + (setq tempfile (make-temp-name (concat tempdir "/EMU"))) + (write-region "" nil tempfile nil 'silent) + (set-file-modes tempfile 384) + ;; Finally, make a hard-link from the tempfile. + (while (condition-case () + (progn + (setq file (make-temp-name prefix)) + ;; return nil or signal an error. + (add-name-to-file tempfile file)) + ;; let's try again. + (file-already-exists t))) + file) + ;; Cleanup the tempfile. + (and tempfile + (file-exists-p tempfile) + (delete-file tempfile)) + ;; Cleanup the tempdir. + (and tempdir + (file-directory-p tempdir) + (delete-directory tempdir)))))) + ;;;###autoload (defun epg-decrypt-start (context input-file) "Initiate a decrypt operation on INPUT-FILE. @@ -497,6 +587,18 @@ If you are unsure, use synchronous version of this function (epg-wait-for-status context '("BEGIN_DECRYPTION"))) ;;;###autoload +(defun epg-decrypt-file (context input-file) + "Decrypt INPUT-FILE and return the plain text." + (unwind-protect + (progn + (epg-decrypt-start context input-file) + (epg-wait-for-completion context) + (if (epg-context-result-for context 'error) + (error "Decryption failed")) + (epg-read-output context)) + (epg-reset context))) + +;;;###autoload (defun epg-decrypt-string (context string) "Decrypt STRING and return the plain text." (let ((input-file (epg-make-temp-file "epg-input")) @@ -504,11 +606,7 @@ If you are unsure, use synchronous version of this function (unwind-protect (progn (write-region string nil input-file) - (epg-decrypt-start context input-file) - (epg-wait-for-completion context) - (unless (epg-context-result-for context 'decrypt) - (epg-read-output context))) - (epg-reset context) + (epg-decrypt-file context input-file)) (if (file-exists-p input-file) (delete-file input-file))))) @@ -534,8 +632,7 @@ If you are unsure, use synchronous version of this function (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) string))) ;; Normal (or cleartext) signature. - (epg-start context - (list "--verify")) + (epg-start context (list "--verify")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) signature)))) @@ -573,7 +670,7 @@ If you are unsure, use synchronous version of this function `epg-sign-string' instead." (epg-context-set-output-file context (epg-make-temp-file "epg-output")) (epg-start context - (append (list (if (eq 'clearsign) + (append (list (if (eq mode 'clearsign) "--clearsign" (if (or (eq mode t) (eq mode 'detached)) "--detach-sign" @@ -596,6 +693,8 @@ Otherwise, it makes a normal signature." (progn (epg-sign-start context string mode) (epg-wait-for-completion context) + (if (epg-context-result-for context 'error) + (error "Sign failed")) (epg-read-output context)) (epg-reset context))) @@ -603,7 +702,7 @@ Otherwise, it makes a normal signature." (defun epg-encrypt-start (context string recipients &optional sign always-trust) "Initiate a encrypt operation on STRING. -If RECIPIENTS is nil, it does symmetric encryption. +If RECIPIENTS is nil, it performs symmetric encryption. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call @@ -625,7 +724,9 @@ If you are unsure, use synchronous version of this function (list "-r" recipient)) recipients)))) (if sign - (epg-wait-for-status context '("BEGIN_SIGNING"))) + (epg-wait-for-status context '("BEGIN_SIGNING")) + (if (null recipients) + (epg-wait-for-status context '("BEGIN_ENCRYPTION")))) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) string))) @@ -633,11 +734,13 @@ If you are unsure, use synchronous version of this function (defun epg-encrypt-string (context string recipients &optional sign always-trust) "Encrypt STRING. -If RECIPIENTS is nil, it does symmetric encryption." +If RECIPIENTS is nil, it performs symmetric encryption." (unwind-protect (progn (epg-encrypt-start context string recipients sign always-trust) (epg-wait-for-completion context) + (if (epg-context-result-for context 'error) + (error "Encrypt failed")) (epg-read-output context)) (epg-reset context)))