* epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index ca9b4c6..f4c2f83 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1,11 +1,40 @@
+;;; epg.el --- the EasyPG Library
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2006 Daiki Ueno
+
+;; Author: Daiki Ueno <ueno@unixuser.org>
+;; Keywords: PGP, GnuPG
+
+;; This file is part of EasyPG.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+

 (defgroup epg ()
 (defgroup epg ()

-  "EasyPG, yet another GnuPG interface.")
+  "The EasyPG Library")

 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
   :group 'epg
   :type 'string)
 
 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
   :group 'epg
   :type 'string)
 

+(defconst epg-version-number "0.0.0")
+

 (defvar epg-user-id nil
   "GnuPG ID of your default identity.")
 
 (defvar epg-user-id nil
   "GnuPG ID of your default identity.")
 

@@ -18,63 +47,119 @@
 (defvar epg-context nil)
 (defvar epg-debug nil)
 
 (defvar epg-context nil)
 (defvar epg-debug nil)
 

-(defvar epg-colons-pub-spec
-  '((trust "[^:]")
-    (length "[0-9]+" 0 string-to-number)
-    (algorithm "[0-9]+" 0 string-to-number)
-    (key-id "[^:]+")
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    nil
-    (ownertrust "[^:]")
-    nil
-    nil
-    (capability "[escaESCA]*"))
-  "The schema of keylisting output whose type is \"pub\".
-This is used by `epg-list-keys'.")
-
-(defvar epg-colons-sec-spec
-  '((trust "[^:]")
-    (length "[0-9]+" 0 string-to-number)
-    (algorithm "[0-9]+" 0 string-to-number)
-    (key-id "[^:]+")
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    nil
-    (ownertrust "[^:]"))
-"The schema of keylisting output whose type is \"sec\".
-This is used by `epg-list-keys'.")
-
-(defvar epg-colons-uid-spec
-  '((trust "[^:]")
-    nil
-    nil
-    nil
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    (hash "[^:]+")
-    nil
-    (user-id "[^:]+"))
-  "The schema of keylisting output whose type is \"uid\".
-This is used by `epg-list-keys'.")
-    
-(defun epg-make-context (&optional protocol armor textmode include-certs)
+;; from gnupg/include/cipher.h
+(defconst epg-cipher-algorithm-alist
+  '((0 . "NONE")
+    (1 . "IDEA")
+    (2 . "3DES")
+    (3 . "CAST5")
+    (4 . "BLOWFISH")
+    (7 . "AES")
+    (8 . "AES192")
+    (9 . "AES256")
+    (10 . "TWOFISH")
+    (110 . "DUMMY")))
+
+;; from gnupg/include/cipher.h
+(defconst epg-pubkey-algorithm-alist
+  '((1 . "RSA")
+    (2 . "RSA_E")
+    (3 . "RSA_S")
+    (16 . "ELGAMAL_E")
+    (17 . "DSA")
+    (20 . "ELGAMAL")))
+
+;; from gnupg/include/cipher.h
+(defconst epg-digest-algorithm-alist
+  '((1 . "MD5")
+    (2 . "SHA1")
+    (3 . "RMD160")
+    (8 . "SHA256")
+    (9 . "SHA384")
+    (10 . "SHA512")))
+
+;; from gnupg/include/cipher.h
+(defconst epg-compress-algorithm-alist
+  '((0 . "NONE")
+    (1 . "ZIP")
+    (2 . "ZLIB")
+    (3 . "BZIP2")))
+
+(defconst epg-invalid-recipients-alist
+  '((0 . "No specific reason given")
+    (1 . "Not Found")
+    (2 . "Ambigious specification")
+    (3 . "Wrong key usage")
+    (4 . "Key revoked")
+    (5 . "Key expired")
+    (6 . "No CRL known")
+    (7 . "CRL too old")
+    (8 . "Policy mismatch")
+    (9 . "Not a secret key")
+    (10 . "Key not trusted")))
+
+(defconst epg-delete-problem-alist
+  '((1 . "No such key")
+    (2 . "Must delete secret key first")
+    (3 . "Ambigious specification")))
+
+(defvar epg-key-validity-alist
+  '((?o . unknown)
+    (?i . invalid)
+    (?d . disabled)
+    (?r . revoked)
+    (?e . expired)
+    (?- . none)
+    (?q . undefined)
+    (?n . never)
+    (?m . marginal)
+    (?f . full)
+    (?u . ultimate)))
+
+(defvar epg-key-capablity-alist
+  '((?e . encrypt)
+    (?s . sign)
+    (?c . certify)
+    (?a . authentication)))
+
+(defvar epg-prompt-alist nil)
+
+(defun epg-make-data-from-file (file)
+  "Make a data object from FILE."
+  (vector file nil))
+
+(defun epg-make-data-from-string (string)
+  "Make a data object from STRING."
+  (vector nil string))
+
+(defun epg-data-file (data)
+  "Return the file of DATA."
+  (aref data 0))
+
+(defun epg-data-string (data)
+  "Return the string of DATA."
+  (aref data 1))
+
+(defun epg-make-context (&optional protocol armor textmode include-certs
+                                  cipher-algorithm digest-algorithm
+                                  compress-algorithm)

   "Return a context object."
   (vector protocol armor textmode include-certs
   "Return a context object."
   (vector protocol armor textmode include-certs

-         (cons #'epg-passphrase-callback-function nil)
-         (cons #'epg-progress-callback-function nil)
+         cipher-algorithm digest-algorithm compress-algorithm
+         #'epg-passphrase-callback-function
+         #'epg-progress-callback-function

          nil nil nil nil))
 
 (defun epg-context-protocol (context)
          nil nil nil nil))
 
 (defun epg-context-protocol (context)

-  "Return the protocol used within the context."
+  "Return the protocol used within CONTEXT."

   (aref context 0))
 
 (defun epg-context-armor (context)
   (aref context 0))
 
 (defun epg-context-armor (context)

-  "Return t if the output shouled be ASCII armored in the CONTEXT context."
+  "Return t if the output shouled be ASCII armored in CONTEXT."

   (aref context 1))
 
 (defun epg-context-textmode (context)
   (aref context 1))
 
 (defun epg-context-textmode (context)

-  "Return t if canonical text mode should be used in the CONTEXT context."
+  "Return t if canonical text mode should be used in CONTEXT."

   (aref context 2))
 
 (defun epg-context-include-certs (context)
   (aref context 2))
 
 (defun epg-context-include-certs (context)

@@ -82,78 +167,102 @@ This is used by `epg-list-keys'.")
 message."
   (aref context 3))
 
 message."
   (aref context 3))
 

-(defun epg-context-passphrase-callback-info (context)
-  "Return the function used to query passphrase."
+(defun epg-context-cipher-algorithm (context)
+  "Return the cipher algorithm in CONTEXT."

   (aref context 4))
 
   (aref context 4))
 

-(defun epg-context-progress-callback-info (context)
-  "Return the function which handles progress update."
+(defun epg-context-digest-algorithm (context)
+  "Return the digest algorithm in CONTEXT."

   (aref context 5))
 
   (aref context 5))
 

+(defun epg-context-compress-algorithm (context)
+  "Return the compress algorithm in CONTEXT."
+  (aref context 6))
+
+(defun epg-context-passphrase-callback (context)
+  "Return the function used to query passphrase."
+  (aref context 7))
+
+(defun epg-context-progress-callback (context)
+  "Return the function which handles progress update."
+  (aref context 8))
+

 (defun epg-context-signers (context)
   "Return the list of key-id for singning."
 (defun epg-context-signers (context)
   "Return the list of key-id for singning."

-  (aref context 6))
+  (aref context 9))

 
 (defun epg-context-process (context)
   "Return the process object of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-process (context)
   "Return the process object of `epg-gpg-program'.
 This function is for internal use only."

-  (aref context 7))
+  (aref context 10))

 
 (defun epg-context-output-file (context)
   "Return the output file of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-output-file (context)
   "Return the output file of `epg-gpg-program'.
 This function is for internal use only."

-  (aref context 8))
+  (aref context 11))

 
 (defun epg-context-result (context)
   "Return the result of the previous cryptographic operation."
 
 (defun epg-context-result (context)
   "Return the result of the previous cryptographic operation."

-  (aref context 9))
+  (aref context 12))

 
 (defun epg-context-set-protocol (context protocol)
 
 (defun epg-context-set-protocol (context protocol)

-  "Set the protocol used within the context."
+  "Set the protocol used within CONTEXT."

   (aset context 0 protocol))
 
 (defun epg-context-set-armor (context armor)
   (aset context 0 protocol))
 
 (defun epg-context-set-armor (context armor)

-  "Specify if the output shouled be ASCII armored in the CONTEXT context."
+  "Specify if the output shouled be ASCII armored in CONTEXT."

   (aset context 1 armor))
 
 (defun epg-context-set-textmode (context textmode)
   (aset context 1 armor))
 
 (defun epg-context-set-textmode (context textmode)

-  "Specify if canonical text mode should be used in the CONTEXT context."
+  "Specify if canonical text mode should be used in CONTEXT."

   (aset context 2 textmode))
 
 (defun epg-context-set-include-certs (context include-certs)
  "Set how many certificates should be included in an S/MIME signed message."
   (aset context 3 include-certs))
 
   (aset context 2 textmode))
 
 (defun epg-context-set-include-certs (context include-certs)
  "Set how many certificates should be included in an S/MIME signed message."
   (aset context 3 include-certs))
 

-(defun epg-context-set-passphrase-callback-info (context
-                                                passphrase-callback-info)
+(defun epg-context-set-cipher-algorithm (context cipher-algorithm)
+ "Set the cipher algorithm in CONTEXT."
+  (aset context 4 cipher-algorithm))
+
+(defun epg-context-set-digest-algorithm (context digest-algorithm)
+ "Set the digest algorithm in CONTEXT."
+  (aset context 5 digest-algorithm))
+
+(defun epg-context-set-compress-algorithm (context compress-algorithm)
+ "Set the compress algorithm in CONTEXT."
+  (aset context 6 compress-algorithm))
+
+(defun epg-context-set-passphrase-callback (context
+                                                passphrase-callback)

   "Set the function used to query passphrase."
   "Set the function used to query passphrase."

-  (aset context 4 passphrase-callback-info))
+  (aset context 7 passphrase-callback))

 
 

-(defun epg-context-set-progress-callback-info (context progress-callback-info)
+(defun epg-context-set-progress-callback (context progress-callback)

   "Set the function which handles progress update."
   "Set the function which handles progress update."

-  (aset context 5 progress-callback-info))
+  (aset context 8 progress-callback))

 
 (defun epg-context-set-signers (context signers)
  "Set the list of key-id for singning."
 
 (defun epg-context-set-signers (context signers)
  "Set the list of key-id for singning."

-  (aset context 6 signers))
+  (aset context 9 signers))

 
 (defun epg-context-set-process (context process)
   "Set the process object of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-set-process (context process)
   "Set the process object of `epg-gpg-program'.
 This function is for internal use only."

-  (aset context 7 process))
+  (aset context 10 process))

 
 (defun epg-context-set-output-file (context output-file)
   "Set the output file of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-set-output-file (context output-file)
   "Set the output file of `epg-gpg-program'.
 This function is for internal use only."

-  (aset context 8 output-file))
+  (aset context 11 output-file))

 
 (defun epg-context-set-result (context result)
   "Set the result of the previous cryptographic operation."
 
 (defun epg-context-set-result (context result)
   "Set the result of the previous cryptographic operation."

-  (aset context 9 result))
+  (aset context 12 result))

 
 (defun epg-make-signature (status key-id user-id)
   "Return a signature object."
 
 (defun epg-make-signature (status key-id user-id)
   "Return a signature object."

-  (vector status key-id user-id nil))
+  (vector status key-id user-id nil nil))

 
 (defun epg-signature-status (signature)
   "Return the status code of SIGNATURE."
 
 (defun epg-signature-status (signature)
   "Return the status code of SIGNATURE."

@@ -171,6 +280,10 @@ This function is for internal use only."
   "Return the validity of SIGNATURE."
   (aref signature 3))
 
   "Return the validity of SIGNATURE."
   (aref signature 3))
 

+(defun epg-signature-fingerprint (signature)
+  "Return the fingerprint of SIGNATURE."
+  (aref signature 4))
+

 (defun epg-signature-set-status (signature status)
  "Set the status code of SIGNATURE."
   (aset signature 0 status))
 (defun epg-signature-set-status (signature status)
  "Set the status code of SIGNATURE."
   (aset signature 0 status))

@@ -187,6 +300,101 @@ This function is for internal use only."
  "Set the validity of SIGNATURE."
   (aset signature 3 validity))
 
  "Set the validity of SIGNATURE."
   (aset signature 3 validity))
 

+(defun epg-signature-set-fingerprint (signature fingerprint)
+ "Set the fingerprint of SIGNATURE."
+  (aset signature 4 fingerprint))
+
+(defun epg-make-key (owner-trust)
+  "Return a key object."
+  (vector owner-trust nil nil))
+
+(defun epg-key-owner-trust (key)
+  "Return the owner trust of KEY."
+  (aref key 0))
+
+(defun epg-key-sub-key-list (key)
+  "Return the sub key list of KEY."
+  (aref key 1))
+
+(defun epg-key-user-id-list (key)
+  "Return the user ID list of KEY."
+  (aref key 2))
+
+(defun epg-key-set-sub-key-list (key sub-key-list)
+  "Set the sub key list of KEY."
+  (aset key 1 sub-key-list))
+
+(defun epg-key-set-user-id-list (key user-id-list)
+  "Set the user ID list of KEY."
+  (aset key 2 user-id-list))
+
+(defun epg-make-sub-key (validity capability secret algorithm length id
+                                 creation-time expiration-time)
+  "Return a sub key object."
+  (vector validity capability secret algorithm length id creation-time
+         expiration-time nil))
+
+(defun epg-sub-key-validity (sub-key)
+  "Return the validity of SUB-KEY."
+  (aref sub-key 0))
+
+(defun epg-sub-key-capability (sub-key)
+  "Return the capability of SUB-KEY."
+  (aref sub-key 1))
+
+(defun epg-sub-key-secret (sub-key)
+  "Return non-nil if SUB-KEY is a secret key."
+  (aref sub-key 2))
+
+(defun epg-sub-key-algorithm (sub-key)
+  "Return the algorithm of SUB-KEY."
+  (aref sub-key 3))
+
+(defun epg-sub-key-length (sub-key)
+  "Return the length of SUB-KEY."
+  (aref sub-key 4))
+
+(defun epg-sub-key-id (sub-key)
+  "Return the ID of SUB-KEY."
+  (aref sub-key 5))
+
+(defun epg-sub-key-creation-time (sub-key)
+  "Return the creation time of SUB-KEY."
+  (aref sub-key 6))
+
+(defun epg-sub-key-expiration-time (sub-key)
+  "Return the expiration time of SUB-KEY."
+  (aref sub-key 7))
+
+(defun epg-sub-key-fingerprint (sub-key)
+  "Return the fingerprint of SUB-KEY."
+  (aref sub-key 8))
+
+(defun epg-sub-key-set-fingerprint (sub-key fingerprint)
+  "Set the fingerprint of SUB-KEY.
+This function is for internal use only."
+  (aset sub-key 8 fingerprint))
+
+(defun epg-make-user-id (validity name)
+  "Return a user ID object."
+  (vector validity name nil))
+
+(defun epg-user-id-validity (user-id)
+  "Return the validity of USER-ID."
+  (aref user-id 0))
+
+(defun epg-user-id-name (user-id)
+  "Return the name of USER-ID."
+  (aref user-id 1))
+
+(defun epg-user-id-signature-list (user-id)
+  "Return the signature list of USER-ID."
+  (aref user-id 2))
+
+(defun epg-user-id-set-signature-list (user-id signature-list)
+  "Set the signature list of USER-ID."
+  (aset user-id 2 signature-list))
+

 (defun epg-context-result-for (context name)
   (cdr (assq name (epg-context-result context))))
 
 (defun epg-context-result-for (context name)
   (cdr (assq name (epg-context-result context))))
 

@@ -201,8 +409,7 @@ This function is for internal use only."
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"

-                            "--command-fd" "0"
-                            "--yes") ; overwrite
+                            "--command-fd" "0")

                       (if (epg-context-armor context) '("--armor"))
                       (if (epg-context-textmode context) '("--textmode"))
                       (if (epg-context-output-file context)
                       (if (epg-context-armor context) '("--armor"))
                       (if (epg-context-textmode context) '("--textmode"))
                       (if (epg-context-output-file context)

@@ -213,6 +420,12 @@ This function is for internal use only."
         (orig-mode (default-file-modes))
         (buffer (generate-new-buffer " *epg*"))
         process)
         (orig-mode (default-file-modes))
         (buffer (generate-new-buffer " *epg*"))
         process)

+    (if epg-debug
+       (save-excursion
+         (set-buffer (get-buffer-create  " *epg-debug*"))
+         (goto-char (point-max))
+         (insert (format "%s %s\n" epg-gpg-program
+                         (mapconcat #'identity args " ")))))

     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
       (setq epg-read-point (point-min))
     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
       (setq epg-read-point (point-min))

@@ -260,7 +473,8 @@ This function is for internal use only."
 
 (defun epg-read-output (context)
   (with-temp-buffer
 
 (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-textmode context)
                                          'raw-text
     (if (file-exists-p (epg-context-output-file context))
        (let ((coding-system-for-read (if (epg-context-textmode context)
                                          'raw-text

@@ -275,8 +489,9 @@ This function is for internal use only."
                epg-pending-status-list)
       (accept-process-output (epg-context-process context) 1))))
 
                epg-pending-status-list)
       (accept-process-output (epg-context-process context) 1))))
 

-(defun epg-wait-for-completion (context)
-  (if (eq (process-status (epg-context-process context)) 'run)
+(defun epg-wait-for-completion (context &optional no-eof)
+  (if (and (not no-eof)
+          (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
       (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

@@ -287,10 +502,12 @@ This function is for internal use only."
   (if (and (epg-context-process context)
           (buffer-live-p (process-buffer (epg-context-process context))))
       (kill-buffer (process-buffer (epg-context-process context))))
   (if (and (epg-context-process context)
           (buffer-live-p (process-buffer (epg-context-process context))))
       (kill-buffer (process-buffer (epg-context-process context))))

-  (epg-context-set-process context nil)
-  (if (file-exists-p (epg-context-output-file context))
-      (delete-file (epg-context-output-file context)))
-  (aset context 9 nil))
+  (epg-context-set-process context nil))
+
+(defun epg-delete-output-file (context)
+  (if (and (epg-context-output-file context)
+          (file-exists-p (epg-context-output-file context)))
+      (delete-file (epg-context-output-file context))))

 
 (defun epg-status-USERID_HINT (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
 
 (defun epg-status-USERID_HINT (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)

@@ -314,9 +531,11 @@ This function is for internal use only."
 
 (defun epg-status-GET_HIDDEN (process string)
   (let ((passphrase
 
 (defun epg-status-GET_HIDDEN (process string)
   (let ((passphrase

-        (funcall (car (epg-context-passphrase-callback-info epg-context))
-                 epg-key-id
-                 (cdr (epg-context-passphrase-callback-info epg-context))))
+        (funcall (if (consp (epg-context-passphrase-callback epg-context))
+                     (car (epg-context-passphrase-callback epg-context))
+                   (epg-context-passphrase-callback epg-context))
+                 (if (consp (epg-context-passphrase-callback epg-context))
+                     (cdr (epg-context-passphrase-callback epg-context)))))

        string)
     (if passphrase
        (unwind-protect
        string)
     (if passphrase
        (unwind-protect

@@ -328,6 +547,17 @@ This function is for internal use only."
          (if string
              (fillarray string 0))))))
 
          (if string
              (fillarray string 0))))))
 

+(defun epg-status-GET_BOOL (process string)
+  (let ((entry (assoc string epg-prompt-alist)))
+    (if (y-or-n-p (if entry (cdr entry) (concat string "? ")))
+       (process-send-string process "y\n")
+      (process-send-string process "n\n"))))
+
+(defun epg-status-GET_LINE (process string)
+  (let* ((entry (assoc string epg-prompt-alist))
+        (string (read-string (if entry (cdr entry) (concat string ": ")))))
+    (process-send-string process (concat string "\n"))))
+

 (defun epg-status-GOODSIG (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (epg-context-set-result-for
 (defun epg-status-GOODSIG (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (epg-context-set-result-for

@@ -378,11 +608,18 @@ This function is for internal use only."
                                 (match-string 2 string))
             (epg-context-result-for epg-context 'verify)))))
 
                                 (match-string 2 string))
             (epg-context-result-for epg-context 'verify)))))
 

+(defun epg-status-VALIDSIG (process string)
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good)
+            (string-match "\\`\\([^ ]+\\) " string))
+       (epg-signature-set-fingerprint signature (match-string 1 string)))))
+

 (defun epg-status-TRUST_UNDEFINED (process string)
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
     (if (and signature
             (eq (epg-signature-status signature) 'good))
 (defun epg-status-TRUST_UNDEFINED (process string)
   (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))))
+       (epg-signature-set-validity signature 'undefined))))

 
 (defun epg-status-TRUST_NEVER (process string)
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
 
 (defun epg-status-TRUST_NEVER (process string)
   (let ((signature (car (epg-context-result-for epg-context 'verify))))

@@ -406,17 +643,20 @@ This function is for internal use only."
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
     (if (and signature
             (eq (epg-signature-status signature) 'good))
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
     (if (and signature
             (eq (epg-signature-status signature) 'good))

-       (epg-signature-set-validity signature 'full))))
+       (epg-signature-set-validity signature 'ultimate))))

 
 (defun epg-status-PROGRESS (process string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
                    string)
 
 (defun epg-status-PROGRESS (process string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
                    string)

-      (funcall (car (epg-context-progress-callback-info epg-context))
+      (funcall (if (consp (epg-context-progress-callback epg-context))
+                  (car (epg-context-progress-callback epg-context))
+                (epg-context-progress-callback epg-context))

               (match-string 1 string)
               (match-string 2 string)
               (string-to-number (match-string 3 string))
               (string-to-number (match-string 4 string))
               (match-string 1 string)
               (match-string 2 string)
               (string-to-number (match-string 3 string))
               (string-to-number (match-string 4 string))

-              (cdr (epg-context-progress-callback-info epg-context)))))
+              (if (consp (epg-context-progress-callback epg-context))
+                  (cdr (epg-context-progress-callback epg-context))))))

 
 (defun epg-status-DECRYPTION_FAILED (process string)
   (epg-context-set-result-for
 
 (defun epg-status-DECRYPTION_FAILED (process string)
   (epg-context-set-result-for

@@ -454,74 +694,140 @@ This function is for internal use only."
    (cons 'bad-armor
         (epg-context-result-for epg-context 'error))))
 
    (cons 'bad-armor
         (epg-context-result-for epg-context 'error))))
 

-(defun epg-passphrase-callback-function (key-id handback)
+(defun epg-status-INV_RECP (process string)
+  (if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string)
+      (epg-context-set-result-for
+       epg-context 'error
+       (cons (list 'invalid-recipient
+                  (string-to-number (match-string 1 string))
+                  (match-string 2 string))
+            (epg-context-result-for epg-context 'error)))))
+
+(defun epg-status-NO_RECP (process string)
+  (epg-context-set-result-for
+   epg-context 'error
+   (cons 'no-recipients
+        (epg-context-result-for epg-context 'error))))
+
+(defun epg-status-DELETE_PROBLEM (process string)
+  (if (string-match "\\`\\([0-9]+\\)" string)
+      (epg-context-set-result-for
+       epg-context 'error
+       (cons (cons 'delete-problem (string-to-number (match-string 1 string)))
+            (epg-context-result-for epg-context 'error)))))
+
+(defun epg-passphrase-callback-function (handback)

   (read-passwd
   (read-passwd

-   (if (eq key-id 'SYM)
+   (if (eq epg-key-id 'SYM)

        "Passphrase for symmetric encryption: "
        "Passphrase for symmetric encryption: "

-     (if (eq key-id 'PIN)
+     (if (eq epg-key-id 'PIN)

         "Passphrase for PIN: "
         "Passphrase for PIN: "

-       (format "Passphrase for %s: "
-              (let ((entry (assoc key-id epg-user-id-alist)))
-                (if entry
-                    (cdr entry)
-                  key-id)))))))
+       (let ((entry (assoc epg-key-id epg-user-id-alist)))
+        (if entry
+            (format "Passphrase for %s %s: " epg-key-id (cdr entry))
+          (format "Passphrase for %s: " epg-key-id)))))))

 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))
 
 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))
 

-(defun epg-list-keys (name &optional secret)
-  "List keys associated with STRING."
-  (let ((args (list "--with-colons" "--no-greeting" "--batch"
-                   "--fixed-list-mode"
-                   (if secret "--list-secret-keys" "--list-keys")
-                   name))
-       keys type symbol pointer)
+(defun epg-configuration ()
+  "Return a list of internal configuration parameters of `epg-gpg-program'."
+  (let (config type)
+    (with-temp-buffer
+      (apply #'call-process epg-gpg-program nil (list t nil) nil
+            '("--with-colons" "--list-config"))
+      (goto-char (point-min))
+      (while (re-search-forward "^cfg:\\([^:]+\\):\\(.*\\)" nil t)
+       (setq type (intern (match-string 1))
+             config (cons (cons type
+                                (if (memq type
+                                          '(pubkey cipher digest compress))
+                                    (mapcar #'string-to-number
+                                            (delete "" (split-string
+                                                        (match-string 2)
+                                                        ";")))
+                                  (match-string 2)))
+                          config))))
+    config))
+
+(defun epg-list-keys-1 (name mode)
+  (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
+                           "--fixed-list-mode" "--with-fingerprint"
+                           "--with-fingerprint"
+                           (if mode "--list-secret-keys" "--list-keys"))
+                     (if name (list name))))
+       keys string field index)

     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil args)
       (goto-char (point-min))
     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil args)
       (goto-char (point-min))

-      (while (looking-at "\\([a-z][a-z][a-z]\\):\\(.*\\)")
-       (setq type (match-string 1)
-             symbol (intern-soft (format "epg-colons-%s-spec" type)))
-       (if (member type '("pub" "sec"))
-           (setq keys (cons nil keys)))
-       (if (and symbol
-                (boundp symbol))
-           (setcar keys (cons (cons (intern type)
-                                    (epg-parse-colons
-                                     (symbol-value symbol)
-                                     (match-string 2)))
-                              (car keys))))
-       (forward-line)))
-    (setq pointer keys)
-    (while pointer
-      (setcar pointer (nreverse (car pointer)))
-      (setq pointer (cdr pointer)))
+      (while (re-search-forward "^[a-z][a-z][a-z]:.*" nil t)
+       (setq keys (cons (make-vector 15 nil) keys)
+             string (match-string 0)
+             index 0
+             field 0)
+       (while (eq index
+                  (string-match "\\([^:]+\\)?:" string index))
+         (setq index (match-end 0))
+         (aset (car keys) field (match-string 1 string))
+         (setq field (1+ field))))
+      (nreverse keys))))
+
+(defun epg-make-sub-key-1 (line)
+  (epg-make-sub-key
+   (if (aref line 1)
+       (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))
+   (delq nil
+        (mapcar (lambda (char) (cdr (assq char epg-key-capablity-alist)))
+                (aref line 11)))
+   (member (aref line 0) '("sec" "ssb"))
+   (string-to-number (aref line 3))
+   (string-to-number (aref line 2))
+   (aref line 4)
+   (aref line 5)
+   (aref line 6)))
+
+(defun epg-list-keys (&optional name mode)
+  (let ((lines (epg-list-keys-1 name mode))
+       keys)
+    (while lines
+      (cond
+       ((member (aref (car lines) 0) '("pub" "sec"))
+       (when (car keys)
+         (epg-key-set-sub-key-list
+          (car keys)
+          (nreverse (epg-key-sub-key-list (car keys))))
+         (epg-key-set-user-id-list
+          (car keys)
+          (nreverse (epg-key-user-id-list (car keys)))))
+       (setq keys (cons (epg-make-key
+                         (if (aref (car lines) 8)
+                             (cdr (assq (string-to-char (aref (car lines) 8))
+                                        epg-key-validity-alist))))
+                        keys))
+       (epg-key-set-sub-key-list
+        (car keys)
+        (cons (epg-make-sub-key-1 (car lines))
+              (epg-key-sub-key-list (car keys)))))
+       ((member (aref (car lines) 0) '("sub" "ssb"))
+       (epg-key-set-sub-key-list
+        (car keys)
+        (cons (epg-make-sub-key-1 (car lines))
+              (epg-key-sub-key-list (car keys)))))
+       ((equal (aref (car lines) 0) "uid")
+       (epg-key-set-user-id-list
+        (car keys)
+        (cons (epg-make-user-id
+               (if (aref (car lines) 1)
+                   (cdr (assq (string-to-char (aref (car lines) 1))
+                              epg-key-validity-alist)))
+               (aref (car lines) 9))
+              (epg-key-user-id-list (car keys)))))
+       ((equal (aref (car lines) 0) "fpr")
+       (epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))
+                                    (aref (car lines) 9))))
+      (setq lines (cdr lines)))

     (nreverse keys)))
 
     (nreverse keys)))
 

-(defun epg-parse-colons (alist string)
-  (let ((index 0)
-       result)
-    (while (and alist
-               (or (null (car alist))
-                   (eq index
-                       (string-match
-                        (concat "\\(" (nth 1 (car alist)) "\\)?:")
-                        string index))))
-      (if (car alist)
-         (progn
-           (setq index (match-end 0))
-           (if (match-beginning 1)
-               (setq result
-                     (cons (cons (car (car alist))
-                                 (funcall (or (nth 3 (car alist)) #'identity)
-                                          (match-string
-                                           (1+ (or (nth 2 (car alist)) 0))
-                                           string)))
-                           result))))
-       (setq index (1+ index)))
-      (setq alist (cdr alist)))
-    (nreverse result)))
-

 (if (fboundp 'make-temp-file)
     (defalias 'epg-make-temp-file 'make-temp-file)
   ;; stolen from poe.el.
 (if (fboundp 'make-temp-file)
     (defalias 'epg-make-temp-file 'make-temp-file)
   ;; stolen from poe.el.

@@ -572,93 +878,153 @@ You can then use `write-region' to write new data into the file."
             (delete-directory tempdir))))))
 
 ;;;###autoload
             (delete-directory tempdir))))))
 
 ;;;###autoload

-(defun epg-decrypt-start (context input-file)
-  "Initiate a decrypt operation on INPUT-FILE.
+(defun epg-start-decrypt (context cipher)
+  "Initiate a decrypt operation on CIPHER.
+CIPHER is a data object.

 
 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 
 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function

-`epg-decrypt-string' instead."
-  (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
-  (epg-start context
-            (list "--decrypt" input-file))
+`epg-decrypt-file' or `epg-decrypt-string' instead."
+  (unless (epg-data-file cipher)
+    (error "Not a file"))
+  (epg-context-set-result context nil)
+  (epg-start context (list "--decrypt" (epg-data-file cipher)))

   (epg-wait-for-status context '("BEGIN_DECRYPTION")))
 
 ;;;###autoload
   (epg-wait-for-status context '("BEGIN_DECRYPTION")))
 
 ;;;###autoload

-(defun epg-decrypt-file (context input-file)
-  "Decrypt INPUT-FILE and return the plain text."
+(defun epg-decrypt-file (context cipher plain)
+  "Decrypt a file CIPHER and store the result to a file PLAIN.
+If PLAIN is nil, it returns the result as a string."

   (unwind-protect
       (progn
   (unwind-protect
       (progn

-       (epg-decrypt-start context input-file)
-       (epg-wait-for-completion context)
+       (if plain
+           (epg-context-set-output-file context plain)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (epg-start-decrypt context (epg-make-data-from-file cipher))
+       (epg-wait-for-completion context t)

        (if (epg-context-result-for context 'error)
        (if (epg-context-result-for context 'error)

-           (error "Decryption failed"))
-       (epg-read-output context))
-    (epg-reset context)
-    (if (file-exists-p input-file)
-       (delete-file input-file))))
+           (error "Decrypt failed: %S"
+                  (epg-context-result-for context 'error)))
+       (unless plain
+         (epg-read-output context)))
+    (unless plain
+      (epg-delete-output-file context))
+    (epg-reset context)))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-decrypt-string (context string)
-  "Decrypt STRING and return the plain text."
+(defun epg-decrypt-string (context cipher)
+  "Decrypt a string CIPHER and return the plain text."

   (let ((input-file (epg-make-temp-file "epg-input"))
        (coding-system-for-write 'binary))
     (unwind-protect
        (progn
   (let ((input-file (epg-make-temp-file "epg-input"))
        (coding-system-for-write 'binary))
     (unwind-protect
        (progn

-         (write-region string nil input-file)
-         (epg-decrypt-file context input-file))
+         (write-region cipher nil input-file)
+         (epg-context-set-output-file context
+                                      (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-read-output context))
+      (epg-delete-output-file context)

       (if (file-exists-p input-file)
       (if (file-exists-p input-file)

-         (delete-file input-file)))))
+         (delete-file input-file))
+      (epg-reset context))))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-verify-start (context signature &optional string)
+(defun epg-start-verify (context signature &optional signed-text)

   "Initiate a verify operation on SIGNATURE.
   "Initiate a verify operation on SIGNATURE.

+SIGNATURE and SIGNED-TEXT are a data object if they are specified.

 
 

-For a detached signature, both SIGNATURE and STRING should be string.
-For a normal or a clear text signature, STRING should be nil.
+For a detached signature, both SIGNATURE and SIGNED-TEXT should be set.
+For a normal or a clear text signature, SIGNED-TEXT should be nil.

 
 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 
 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function

-`epg-verify-string' instead."
-  (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
-  (if string
+`epg-verify-file' or `epg-verify-string' instead."
+  (epg-context-set-result context nil)
+  (if signed-text

       ;; Detached signature.
       ;; Detached signature.

-      (progn
-       (epg-start context
-                  (append (list "--verify")
-                          (list signature "-")))
+      (if (epg-data-file signed-text)
+         (epg-start context (list "--verify" (epg-data-file signature)
+                                  (epg-data-file signed-text)))
+       (epg-start context (list "--verify" (epg-data-file signature) "-"))

        (if (eq (process-status (epg-context-process context)) 'run)
        (if (eq (process-status (epg-context-process context)) 'run)

-           (process-send-string (epg-context-process context) string)))
+           (process-send-string (epg-context-process context)
+                                (epg-data-string signed-text))))

     ;; Normal (or cleartext) signature.
     ;; Normal (or cleartext) signature.

-    (epg-start context (list "--verify"))
-    (if (eq (process-status (epg-context-process context)) 'run)
-       (process-send-string (epg-context-process context) signature))))
+    (if (epg-data-file signature)
+       (epg-start context (list "--verify" (epg-data-file signature)))
+      (epg-start context (list "--verify"))
+      (if (eq (process-status (epg-context-process context)) 'run)
+         (process-send-string (epg-context-process context)
+                              (epg-data-string signature))))))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-verify-string (context signature &optional string)
-  "Verify SIGNATURE.
+(defun epg-verify-file (context signature &optional signed-text plain)
+  "Verify a file SIGNATURE.
+SIGNED-TEXT and PLAIN are also a file if they are specified.

 
 

-For a detached signature, both SIGNATURE and STRING should be string.
-For a normal or a clear text signature, STRING should be nil."
-  (let ((input-file (epg-make-temp-file "epg-input"))
-       (coding-system-for-write 'binary))
+For a detached signature, both SIGNATURE and SIGNED-TEXT should be string.
+For a normal or a clear text signature, SIGNED-TEXT should be nil."
+  (unwind-protect
+      (progn
+       (if plain
+           (epg-context-set-output-file context plain)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (if signed-text
+           (epg-start-verify context
+                             (epg-make-data-from-file signature)
+                             (epg-make-data-from-file signed-text))
+         (epg-start-verify context
+                           (epg-make-data-from-file signature)))
+       (epg-wait-for-completion context t)
+       (unless plain
+         (epg-read-output context)))
+    (unless plain
+      (epg-delete-output-file context))
+    (epg-reset context)))
+
+;;;###autoload
+(defun epg-verify-string (context signature &optional signed-text)
+  "Verify a string SIGNATURE.
+SIGNED-TEXT is a string if it is specified.
+
+For a detached signature, both SIGNATURE and SIGNED-TEXT should be string.
+For a normal or a clear text signature, SIGNED-TEXT should be nil."
+  (let ((coding-system-for-write 'binary)
+       input-file)

     (unwind-protect
        (progn
     (unwind-protect
        (progn

-         (if string
-             (write-region signature nil input-file))
-         (epg-verify-start context input-file string)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output"))
+         (if signed-text
+             (progn
+               (setq input-file (epg-make-temp-file "epg-signature"))
+               (write-region signature nil input-file)
+               (epg-start-verify context
+                                 (epg-make-data-from-file input-file)
+                                 (epg-make-data-from-string signed-text)))
+           (epg-start-verify context (epg-make-data-from-string signature)))

          (epg-wait-for-completion context)
          (epg-wait-for-completion context)

-         (epg-context-result-for context 'verify))
-      (epg-reset context)
-      (if (file-exists-p input-file)
-         (delete-file input-file)))))
+         (epg-read-output context))
+      (epg-delete-output-file context)
+      (if (and input-file
+              (file-exists-p input-file))
+         (delete-file input-file))
+      (epg-reset context))))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-sign-start (context string &optional mode)
-  "Initiate a sign operation on STRING.
+(defun epg-start-sign (context plain &optional mode)
+  "Initiate a sign operation on PLAIN.
+PLAIN is a data object.

 
 If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
 If MODE is t or 'detached, it makes a detached signature.
 
 If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
 If MODE is t or 'detached, it makes a detached signature.

@@ -668,8 +1034,8 @@ 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-gpg-program' by using `epg-wait-for-completion' and call
 `epg-reset' to clear a temporaly output file.
 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-sign-file' or `epg-sign-string' instead."
+  (epg-context-set-result context nil)

   (epg-start context
             (append (list (if (eq mode 'clearsign)
                               "--clearsign"
   (epg-start context
             (append (list (if (eq mode 'clearsign)
                               "--clearsign"

@@ -679,38 +1045,71 @@ If you are unsure, use synchronous version of this function
                     (apply #'nconc
                            (mapcar (lambda (signer)
                                      (list "-u" signer))
                     (apply #'nconc
                            (mapcar (lambda (signer)
                                      (list "-u" signer))

-                                   (epg-context-signers context)))))
+                                   (epg-context-signers context)))
+                    (if (epg-data-file plain)
+                        (list (epg-data-file plain)))))

   (epg-wait-for-status context '("BEGIN_SIGNING"))
   (epg-wait-for-status context '("BEGIN_SIGNING"))

-  (if (eq (process-status (epg-context-process context)) 'run)
-      (process-send-string (epg-context-process context) string)))
+  (if (and (epg-data-string plain)
+          (eq (process-status (epg-context-process context)) 'run))
+      (process-send-string (epg-context-process context)
+                          (epg-data-string plain))))
+
+;;;###autoload
+(defun epg-sign-file (context plain signature &optional mode)
+  "Sign a file PLAIN and store the result to a file SIGNATURE.
+If SIGNATURE is nil, it returns the result as a string.
+If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
+If MODE is t or 'detached, it makes a detached signature.
+Otherwise, it makes a normal signature."
+  (unwind-protect
+      (progn
+       (if signature
+           (epg-context-set-output-file context signature)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (epg-start-sign context (epg-make-data-from-file plain) mode)
+       (epg-wait-for-completion context t)
+       (if (epg-context-result-for context 'error)
+           (error "Sign failed: %S"
+                  (epg-context-result-for context 'error)))
+       (unless signature
+         (epg-read-output context)))
+    (unless signature
+      (epg-delete-output-file context))
+    (epg-reset context)))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-sign-string (context string &optional mode)
-  "Sign STRING and return the output as string.
+(defun epg-sign-string (context plain &optional mode)
+  "Sign a string PLAIN and return the output as string.

 If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
 If MODE is t or 'detached, it makes a detached signature.
 Otherwise, it makes a normal signature."
   (unwind-protect
       (progn
 If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
 If MODE is t or 'detached, it makes a detached signature.
 Otherwise, it makes a normal signature."
   (unwind-protect
       (progn

-       (epg-sign-start context string mode)
+       (epg-context-set-output-file context
+                                    (epg-make-temp-file "epg-output"))
+       (epg-start-sign context (epg-make-data-from-string plain) mode)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Sign failed"))
+           (error "Sign failed: %S"
+                  (epg-context-result-for context 'error)))

        (epg-read-output context))
        (epg-read-output context))

+    (epg-delete-output-file context)

     (epg-reset context)))
 
 ;;;###autoload
     (epg-reset context)))
 
 ;;;###autoload

-(defun epg-encrypt-start (context string recipients
+(defun epg-start-encrypt (context plain recipients

                                  &optional sign always-trust)
                                  &optional sign always-trust)

-  "Initiate a encrypt operation on STRING.
+  "Initiate an encrypt operation on PLAIN.
+PLAIN is a data object.

 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 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
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function

-`epg-encrypt-string' instead."
-  (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
+`epg-encrypt-file' or `epg-encrypt-string' instead."
+  (epg-context-set-result context nil)

   (epg-start context
             (append (if always-trust '("--always-trust"))
                     (if recipients '("--encrypt") '("--symmetric"))
   (epg-start context
             (append (if always-trust '("--always-trust"))
                     (if recipients '("--encrypt") '("--symmetric"))

@@ -723,26 +1122,167 @@ If you are unsure, use synchronous version of this function
                     (apply #'nconc
                            (mapcar (lambda (recipient)
                                      (list "-r" recipient))
                     (apply #'nconc
                            (mapcar (lambda (recipient)
                                      (list "-r" recipient))

-                                   recipients))))
+                                   recipients))
+                    (if (epg-data-file plain)
+                        (list (epg-data-file plain)))))

   (if sign
   (if sign

-      (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)))
+      (epg-wait-for-status context '("BEGIN_SIGNING")))
+  (epg-wait-for-status context '("BEGIN_ENCRYPTION"))
+  (if (and (epg-data-string plain)
+          (eq (process-status (epg-context-process context)) 'run))
+      (process-send-string (epg-context-process context)
+                          (epg-data-string plain))))
+
+;;;###autoload
+(defun epg-encrypt-file (context plain recipients
+                                cipher &optional sign always-trust)
+  "Encrypt a file PLAIN and store the result to a file CIPHER.
+If CIPHER is nil, it returns the result as a string.
+If RECIPIENTS is nil, it performs symmetric encryption."
+  (unwind-protect
+      (progn
+       (if cipher
+           (epg-context-set-output-file context cipher)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (epg-start-encrypt context (epg-make-data-from-file plain)
+                          recipients sign always-trust)
+       (epg-wait-for-completion context t)
+       (if (epg-context-result-for context 'error)
+           (error "Encrypt failed: %S"
+                  (epg-context-result-for context 'error)))
+       (unless cipher
+         (epg-read-output context)))
+    (unless cipher
+      (epg-delete-output-file context))
+    (epg-reset context)))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-encrypt-string (context string recipients
+(defun epg-encrypt-string (context plain recipients

                                   &optional sign always-trust)
                                   &optional sign always-trust)

-  "Encrypt STRING.
+  "Encrypt a string PLAIN.

 If RECIPIENTS is nil, it performs symmetric encryption."
   (unwind-protect
       (progn
 If RECIPIENTS is nil, it performs symmetric encryption."
   (unwind-protect
       (progn

-       (epg-encrypt-start context string recipients sign always-trust)
+       (epg-context-set-output-file context
+                                    (epg-make-temp-file "epg-output"))
+       (epg-start-encrypt context (epg-make-data-from-string plain)
+                          recipients sign always-trust)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Encrypt failed"))
+           (error "Encrypt failed: %S"
+                  (epg-context-result-for context 'error)))

        (epg-read-output context))
        (epg-read-output context))

+    (epg-delete-output-file context)
+    (epg-reset context)))
+
+;;;###autoload
+(defun epg-start-export-keys (context keys)
+  "Initiate an export keys operation.
+
+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
+`epg-reset' to clear a temporaly output file.
+If you are unsure, use synchronous version of this function
+`epg-export-keys-to-file' or `epg-export-keys-to-string' instead."
+  (epg-context-set-result context nil)
+  (epg-start context (cons "--export"
+                          (mapcar
+                           (lambda (key)
+                             (epg-sub-key-id
+                              (car (epg-key-sub-key-list key))))
+                           keys))))
+
+;;;###autoload
+(defun epg-export-keys-to-file (context keys file)
+  "Extract public KEYS."
+  (unwind-protect
+      (progn
+       (if keys
+           (epg-context-set-output-file context file)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (epg-start-export-keys context keys)
+       (epg-wait-for-completion context)
+       (if (epg-context-result-for context 'error)
+           (error "Export keys failed"))
+       (unless file
+         (epg-read-output context)))
+    (unless file
+      (epg-delete-output-file context))
+    (epg-reset context)))
+
+;;;###autoload
+(defun epg-export-keys-to-string (context keys)
+  "Extract public KEYS and return them as a string."
+  (epg-export-keys-to-file context keys nil))
+
+;;;###autoload
+(defun epg-start-import-keys (context keys)
+  "Initiate an import keys operation.
+KEYS is a data object.
+
+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
+`epg-reset' to clear a temporaly output file.
+If you are unsure, use synchronous version of this function
+`epg-import-keys-from-file' or `epg-import-keys-from-string' instead."
+  (epg-context-set-result context nil)
+  (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
+  (epg-start context (list "--import" (epg-data-file keys)))
+  (if (and (epg-data-string keys)
+          (eq (process-status (epg-context-process context)) 'run))
+      (process-send-string (epg-context-process context)
+                          (epg-data-string keys))))
+  
+(defun epg-import-keys-1 (context keys)
+  (unwind-protect
+      (progn
+       (epg-start-import-keys context keys)
+       (epg-wait-for-completion context (epg-data-file keys))
+       (if (epg-context-result-for context 'error)
+           (error "Import keys failed"))
+       (epg-read-output context))
+    (epg-reset context)))
+
+;;;###autoload
+(defun epg-import-keys-from-file (context keys)
+  "Add keys from a file KEYS."
+  (epg-import-keys-1 context (epg-make-data-from-file keys)))
+
+;;;###autoload
+(defun epg-import-keys-from-string (context keys)
+  "Add keys from a string KEYS."
+  (epg-import-keys-1 context (epg-make-data-from-string keys)))
+
+;;;###autoload
+(defun epg-start-delete-keys (context keys &optional allow-secret)
+  "Initiate an delete keys operation.
+
+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
+`epg-reset' to clear a temporaly output file.
+If you are unsure, use synchronous version of this function
+`epg-delete-keys' instead."
+  (epg-context-set-result context nil)
+  (epg-start context (cons (if allow-secret
+                              "--delete-secret-key"
+                            "--delete-key")
+                          (mapcar
+                           (lambda (key)
+                             (epg-sub-key-id
+                              (car (epg-key-sub-key-list key))))
+                           keys))))
+
+;;;###autoload
+(defun epg-delete-keys (context keys &optional allow-secret)
+  "Delete KEYS from the key ring."
+  (unwind-protect
+      (progn
+       (epg-start-delete-keys context keys)
+       (epg-wait-for-completion context t)
+       (if (epg-context-result-for context 'error)
+           (error "Delete key failed")))

     (epg-reset context)))
 
 (provide 'epg)
     (epg-reset context)))
 
 (provide 'epg)