Imported Upstream version 1.5.0upstream/1.5.0

1 files changed, 49 insertions, 13 deletions

diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 5c4de6b..d47f4ba 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1,7 +1,7 @@
 /* gpgme.h - Public interface to GnuPG Made Easy.                   -*- c -*-
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009
-                 2010, 2011, 2012, 2013 g10 Code GmbH
+                 2010, 2011, 2012, 2013, 2014 g10 Code GmbH
 
    This file is part of GPGME.
 
@@ -227,7 +227,7 @@ typedef enum
 gpgme_data_type_t;
 
 
-/* Public key algorithms from libgcrypt.  */
+/* Public key algorithms.  */
 typedef enum
   {
     GPGME_PK_RSA   = 1,
@@ -235,6 +235,7 @@ typedef enum
     GPGME_PK_RSA_S = 3,
     GPGME_PK_ELG_E = 16,
     GPGME_PK_DSA   = 17,
+    GPGME_PK_ECC   = 18,
     GPGME_PK_ELG   = 20,
     GPGME_PK_ECDSA = 301,
     GPGME_PK_ECDH  = 302
@@ -242,7 +243,7 @@ typedef enum
 gpgme_pubkey_algo_t;
 
 
-/* Hash algorithms from libgcrypt.  */
+/* Hash algorithms (the values match those from libgcrypt).  */
 typedef enum
   {
     GPGME_MD_NONE          = 0,
@@ -255,6 +256,7 @@ typedef enum
     GPGME_MD_SHA256        = 8,
     GPGME_MD_SHA384        = 9,
     GPGME_MD_SHA512        = 10,
+    GPGME_MD_SHA224        = 11,
     GPGME_MD_MD4           = 301,
     GPGME_MD_CRC32	   = 302,
     GPGME_MD_CRC32_RFC1510 = 303,
@@ -354,6 +356,7 @@ typedef enum
     GPGME_PROTOCOL_ASSUAN  = 3,  /* Low-level access to an Assuan server.  */
     GPGME_PROTOCOL_G13     = 4,
     GPGME_PROTOCOL_UISERVER= 5,
+    GPGME_PROTOCOL_SPAWN   = 6,  /* Direct access to any program.  */
     GPGME_PROTOCOL_DEFAULT = 254,
     GPGME_PROTOCOL_UNKNOWN = 255
   }
@@ -452,7 +455,7 @@ typedef enum
 
     GPGME_STATUS_BADARMOR = 7,
 
-    GPGME_STATUS_RSA_OR_IDEA = 8,
+    GPGME_STATUS_RSA_OR_IDEA = 8,      /* (legacy) */
     GPGME_STATUS_KEYEXPIRED = 9,
     GPGME_STATUS_KEYREVOKED = 10,
 
@@ -462,10 +465,10 @@ typedef enum
     GPGME_STATUS_TRUST_FULLY = 14,
     GPGME_STATUS_TRUST_ULTIMATE = 15,
 
-    GPGME_STATUS_SHM_INFO = 16,
-    GPGME_STATUS_SHM_GET = 17,
-    GPGME_STATUS_SHM_GET_BOOL = 18,
-    GPGME_STATUS_SHM_GET_HIDDEN = 19,
+    GPGME_STATUS_SHM_INFO = 16,        /* (legacy) */
+    GPGME_STATUS_SHM_GET = 17,         /* (legacy) */
+    GPGME_STATUS_SHM_GET_BOOL = 18,    /* (legacy) */
+    GPGME_STATUS_SHM_GET_HIDDEN = 19,  /* (legacy) */
 
     GPGME_STATUS_NEED_PASSPHRASE = 20,
     GPGME_STATUS_VALIDSIG = 21,
@@ -507,15 +510,15 @@ typedef enum
     GPGME_STATUS_NOTATION_NAME = 55,
     GPGME_STATUS_NOTATION_DATA = 56,
     GPGME_STATUS_POLICY_URL = 57,
-    GPGME_STATUS_BEGIN_STREAM = 58,
-    GPGME_STATUS_END_STREAM = 59,
+    GPGME_STATUS_BEGIN_STREAM = 58,    /* (legacy) */
+    GPGME_STATUS_END_STREAM = 59,      /* (legacy) */
     GPGME_STATUS_KEY_CREATED = 60,
     GPGME_STATUS_USERID_HINT = 61,
     GPGME_STATUS_UNEXPECTED = 62,
     GPGME_STATUS_INV_RECP = 63,
     GPGME_STATUS_NO_RECP = 64,
     GPGME_STATUS_ALREADY_SIGNED = 65,
-    GPGME_STATUS_SIGEXPIRED = 66,
+    GPGME_STATUS_SIGEXPIRED = 66,      /* (legacy) */
     GPGME_STATUS_EXPSIG = 67,
     GPGME_STATUS_EXPKEYSIG = 68,
     GPGME_STATUS_TRUNCATED = 69,
@@ -534,7 +537,13 @@ typedef enum
     GPGME_STATUS_INV_SGNR = 82,
     GPGME_STATUS_NO_SGNR = 83,
     GPGME_STATUS_SUCCESS = 84,
-    GPGME_STATUS_DECRYPTION_INFO = 85
+    GPGME_STATUS_DECRYPTION_INFO = 85,
+    GPGME_STATUS_PLAINTEXT_LENGTH = 86,
+    GPGME_STATUS_MOUNTPOINT = 87,
+    GPGME_STATUS_PINENTRY_LAUNCHED = 88,
+    GPGME_STATUS_ATTRIBUTE = 89,
+    GPGME_STATUS_BEGIN_SIGNING = 90,
+    GPGME_STATUS_KEY_NOT_CREATED = 91
   }
 gpgme_status_code_t;
 
@@ -626,6 +635,9 @@ struct _gpgme_subkey
 
   /* The serial number of a smart card holding this key or NULL.  */
   char *card_number;
+
+  /* The name of the curve for ECC algorithms or NULL.  */
+  char *curve;
 };
 typedef struct _gpgme_subkey *gpgme_subkey_t;
 
@@ -1282,7 +1294,8 @@ typedef enum
     GPGME_ENCRYPT_ALWAYS_TRUST = 1,
     GPGME_ENCRYPT_NO_ENCRYPT_TO = 2,
     GPGME_ENCRYPT_PREPARE = 4,
-    GPGME_ENCRYPT_EXPECT_SIGN = 8
+    GPGME_ENCRYPT_EXPECT_SIGN = 8,
+    GPGME_ENCRYPT_NO_COMPRESS = 16
   }
 gpgme_encrypt_flags_t;
 
@@ -1694,6 +1707,26 @@ gpgme_error_t gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 				  gpgme_edit_cb_t fnc, void *fnc_value,
 				  gpgme_data_t out);
 
+
+/* Flags for the spawn operations.  */
+#define GPGME_SPAWN_DETACHED      1
+#define GPGME_SPAWN_ALLOW_SET_FG  2
+
+
+/* Run the command FILE with the arguments in ARGV.  Connect stdin to
+   DATAIN, stdout to DATAOUT, and STDERR to DATAERR.  If one the data
+   streams is NULL, connect to /dev/null instead.  */
+gpgme_error_t gpgme_op_spawn_start (gpgme_ctx_t ctx,
+                                    const char *file, const char *argv[],
+                                    gpgme_data_t datain,
+                                    gpgme_data_t dataout, gpgme_data_t dataerr,
+                                    unsigned int flags);
+gpgme_error_t gpgme_op_spawn (gpgme_ctx_t ctx,
+                              const char *file, const char *argv[],
+                              gpgme_data_t datain,
+                              gpgme_data_t dataout, gpgme_data_t dataerr,
+                              unsigned int flags);
+
 
 /* Key management functions.  */
 struct _gpgme_op_keylist_result
@@ -2090,6 +2123,9 @@ const char *gpgme_check_version_internal (const char *req_version,
   gpgme_check_version_internal (req_version,				\
 				offsetof (struct _gpgme_signature, validity))
 
+/* Return the default values for various directories.  */
+const char *gpgme_get_dirinfo (const char *what);
+
 /* Get the information about the configured and installed engines.  A
    pointer to the first engine in the statically allocated linked list
    is returned in *INFO.  If an error occurs, it is returned.  The