X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=2a54aeb4b436334dc68ff99ea3cfd5fb22aecc83;hb=58233b5691a062fd5cda30eb10ce62feb28b3738;hp=02a98a1ab8d91d6fbaa22233d814399244204a8a;hpb=b67d349d2dc07472a63ac21988f363b02e111fb0;p=elisp%2Fepg.git

diff --git a/epg.el b/epg.el
index 02a98a1..2a54aeb 100644
--- a/epg.el
+++ b/epg.el
@@ -158,6 +158,8 @@
 
 (defvar epg-prompt-alist nil)
 
+(put 'epg-error 'error-conditions '(epg-error error))
+
 (defun epg-make-data-from-file (file)
   "Make a data object from FILE."
   (cons 'epg-data (vector file nil)))
@@ -1041,12 +1043,14 @@ This function is for internal use only."
   (let* ((args (append (list "--no-tty"
 			     "--status-fd" "1"
 			     "--yes")
+		       (if (string-match ":" (or (getenv "GPG_AGENT_INFO") ""))
+			   '("--use-agent"))
 		       (if (epg-context-progress-callback context)
-			   (list "--enable-progress-filter"))
+			   '("--enable-progress-filter"))
 		       (if epg-gpg-home-directory
 			   (list "--homedir" epg-gpg-home-directory))
 		       (unless (eq (epg-context-protocol context) 'CMS)
-			 (list "--command-fd" "0"))
+			 '("--command-fd" "0"))
 		       (if (epg-context-armor context) '("--armor"))
 		       (if (epg-context-textmode context) '("--textmode"))
 		       (if (epg-context-output-file context)
@@ -1439,21 +1443,21 @@ This function is for internal use only."
 		   (cdr (epg-context-progress-callback context))))))
 
 (defun epg--status-DECRYPTION_FAILED (context string)
-  (epg-context-set-result-for
-   context 'error
-   (cons '(decryption-failed)
-	 (epg-context-result-for context 'error))))
+  (epg-context-set-result-for context 'decryption-failed t))
+
+(defun epg--status-DECRYPTION_OKAY (context string)
+  (epg-context-set-result-for context 'decryption-okay t))
 
 (defun epg--status-NODATA (context string)
   (epg-context-set-result-for
    context 'error
-   (cons (list 'no-data (cons 'reason (string-to-number string)))
+   (cons (cons 'no-data (string-to-number string))
 	 (epg-context-result-for context 'error))))
 
 (defun epg--status-UNEXPECTED (context string)
   (epg-context-set-result-for
    context 'error
-   (cons (list 'unexpected (cons 'reason (string-to-number string)))
+   (cons (cons 'unexpected (string-to-number string))
 	 (epg-context-result-for context 'error))))
 
 (defun epg--status-KEYEXPIRED (context string)
@@ -1496,8 +1500,8 @@ This function is for internal use only."
   (if (string-match "\\`\\([0-9]+\\)" string)
       (epg-context-set-result-for
        context 'error
-       (cons (list 'delete-problem
-		   (cons 'reason (string-to-number (match-string 1 string))))
+       (cons (cons 'delete-problem
+		   (string-to-number (match-string 1 string)))
 	     (epg-context-result-for context 'error)))))
 
 (defun epg--status-SIG_CREATED (context string)
@@ -1817,7 +1821,7 @@ You can then use `write-region' to write new data into the file."
 	       (epg-context-result-for epg-context 'error)))))
   (if (eq (process-status (epg-context-process context)) 'run)
       (delete-process (epg-context-process context))))
-  
+
 ;;;###autoload
 (defun epg-start-decrypt (context cipher)
   "Initiate a decrypt operation on CIPHER.
@@ -1837,6 +1841,19 @@ If you are unsure, use synchronous version of this function
   (unless (eq (epg-context-protocol context) 'CMS)
     (epg-wait-for-status context '("BEGIN_DECRYPTION"))))
 
+(defun epg--check-error-for-decrypt (context)
+  (if (epg-context-result-for context 'decryption-failed)
+      (signal 'epg-error (list "Decryption failed")))
+  (if (epg-context-result-for context 'no-secret-key)
+      (signal 'epg-error
+	      (list "No secret key"
+		    (epg-context-result-for context 'no-secret-key))))
+    (unless (epg-context-result-for context 'decryption-okay)
+      (let* ((error (epg-context-result-for context 'error)))
+	(if (assq 'no-data error)
+	    (signal 'epg-error (list "No data")))
+	(signal 'epg-error (list "Can't decrypt" error)))))
+
 ;;;###autoload
 (defun epg-decrypt-file (context cipher plain)
   "Decrypt a file CIPHER and store the result to a file PLAIN.
@@ -1849,9 +1866,7 @@ If PLAIN is nil, it returns the result as a string."
 				       (epg--make-temp-file "epg-output")))
 	(epg-start-decrypt context (epg-make-data-from-file cipher))
 	(epg-wait-for-completion context)
-	(if (epg-context-result-for context 'error)
-	    (error "Decrypt failed: %S"
-		   (epg-context-result-for context 'error)))
+	(epg--check-error-for-decrypt context)
 	(unless plain
 	  (epg-read-output context)))
     (unless plain
@@ -1870,9 +1885,7 @@ If PLAIN is nil, it returns the result as a string."
 				       (epg--make-temp-file "epg-output"))
 	  (epg-start-decrypt context (epg-make-data-from-file input-file))
 	  (epg-wait-for-completion context)
-	  (if (epg-context-result-for context 'error)
-	      (error "Decrypt failed: %S"
-		     (epg-context-result-for context 'error)))
+	  (epg--check-error-for-decrypt context)
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if (file-exists-p input-file)
@@ -2319,7 +2332,7 @@ If you are unsure, use synchronous version of this function
 	(let ((entry (assq 'delete-problem
 			   (epg-context-result-for context 'error))))
 	  (if entry
-	      (if (setq entry (assq (cdr (assq 'reason (cdr entry)))
+	      (if (setq entry (assq (cdr entry)
 				    epg-delete-problem-reason-alist))
 		  (error "Delete keys failed: %s" (cdr entry)))
 	    (error "Delete keys failed" (cdr entry)))))