diff --git a/lib/gpg/VERSION b/lib/gpg/VERSION
index cec8408..5a6842f 100644
--- a/lib/gpg/VERSION
+++ b/lib/gpg/VERSION
@@ -1,2 +1,2 @@
gnupg
-2.2.28
+2.3.6
diff --git a/lib/gpg/bin/dirmngr.exe b/lib/gpg/bin/dirmngr.exe
index 01a0828..03f9b10 100644
Binary files a/lib/gpg/bin/dirmngr.exe and b/lib/gpg/bin/dirmngr.exe differ
diff --git a/lib/gpg/bin/gpg-agent.exe b/lib/gpg/bin/gpg-agent.exe
index 873a64e..6f2f497 100644
Binary files a/lib/gpg/bin/gpg-agent.exe and b/lib/gpg/bin/gpg-agent.exe differ
diff --git a/lib/gpg/bin/gpg-connect-agent.exe b/lib/gpg/bin/gpg-connect-agent.exe
index 30e51e0..ff5a4ff 100644
Binary files a/lib/gpg/bin/gpg-connect-agent.exe and b/lib/gpg/bin/gpg-connect-agent.exe differ
diff --git a/lib/gpg/bin/gpg-preset-passphrase.exe b/lib/gpg/bin/gpg-preset-passphrase.exe
index 5d60a68..e0fa2ae 100644
Binary files a/lib/gpg/bin/gpg-preset-passphrase.exe and b/lib/gpg/bin/gpg-preset-passphrase.exe differ
diff --git a/lib/gpg/bin/gpg-wks-client.exe b/lib/gpg/bin/gpg-wks-client.exe
index 70eebc2..3e50da4 100644
Binary files a/lib/gpg/bin/gpg-wks-client.exe and b/lib/gpg/bin/gpg-wks-client.exe differ
diff --git a/lib/gpg/bin/gpg.exe b/lib/gpg/bin/gpg.exe
index affba47..3b5c005 100644
Binary files a/lib/gpg/bin/gpg.exe and b/lib/gpg/bin/gpg.exe differ
diff --git a/lib/gpg/bin/gpgconf.exe b/lib/gpg/bin/gpgconf.exe
index 8469265..c5b6fe1 100644
Binary files a/lib/gpg/bin/gpgconf.exe and b/lib/gpg/bin/gpgconf.exe differ
diff --git a/lib/gpg/bin/gpgme-w32spawn.exe b/lib/gpg/bin/gpgme-w32spawn.exe
index 73b1f03..b149295 100644
Binary files a/lib/gpg/bin/gpgme-w32spawn.exe and b/lib/gpg/bin/gpgme-w32spawn.exe differ
diff --git a/lib/gpg/bin/gpgsm.exe b/lib/gpg/bin/gpgsm.exe
index d8e0dfb..bd4976e 100644
Binary files a/lib/gpg/bin/gpgsm.exe and b/lib/gpg/bin/gpgsm.exe differ
diff --git a/lib/gpg/bin/gpgtar.exe b/lib/gpg/bin/gpgtar.exe
index 9a0e668..c9df9ee 100644
Binary files a/lib/gpg/bin/gpgtar.exe and b/lib/gpg/bin/gpgtar.exe differ
diff --git a/lib/gpg/bin/gpgv.exe b/lib/gpg/bin/gpgv.exe
index ce61741..a8716ed 100644
Binary files a/lib/gpg/bin/gpgv.exe and b/lib/gpg/bin/gpgv.exe differ
diff --git a/lib/gpg/bin/libassuan-0.dll b/lib/gpg/bin/libassuan-0.dll
index dc957d2..719b9e9 100644
Binary files a/lib/gpg/bin/libassuan-0.dll and b/lib/gpg/bin/libassuan-0.dll differ
diff --git a/lib/gpg/bin/libgcrypt-20.dll b/lib/gpg/bin/libgcrypt-20.dll
index f864e6c..76cf81c 100644
Binary files a/lib/gpg/bin/libgcrypt-20.dll and b/lib/gpg/bin/libgcrypt-20.dll differ
diff --git a/lib/gpg/bin/libgpg-error-0.dll b/lib/gpg/bin/libgpg-error-0.dll
index cf19cff..81fe2c5 100644
Binary files a/lib/gpg/bin/libgpg-error-0.dll and b/lib/gpg/bin/libgpg-error-0.dll differ
diff --git a/lib/gpg/bin/libgpgme-11.dll b/lib/gpg/bin/libgpgme-11.dll
index 6e07276..ecd10f3 100644
Binary files a/lib/gpg/bin/libgpgme-11.dll and b/lib/gpg/bin/libgpgme-11.dll differ
diff --git a/lib/gpg/bin/libksba-8.dll b/lib/gpg/bin/libksba-8.dll
index 964096a..ef3a69c 100644
Binary files a/lib/gpg/bin/libksba-8.dll and b/lib/gpg/bin/libksba-8.dll differ
diff --git a/lib/gpg/bin/libnpth-0.dll b/lib/gpg/bin/libnpth-0.dll
index 30a1fd2..929690a 100644
Binary files a/lib/gpg/bin/libnpth-0.dll and b/lib/gpg/bin/libnpth-0.dll differ
diff --git a/lib/gpg/bin/libsqlite3-0.dll b/lib/gpg/bin/libsqlite3-0.dll
index 1d87e26..578dcb1 100644
Binary files a/lib/gpg/bin/libsqlite3-0.dll and b/lib/gpg/bin/libsqlite3-0.dll differ
diff --git a/lib/gpg/bin/pinentry-basic.exe b/lib/gpg/bin/pinentry-basic.exe
index c220809..f91bde0 100644
Binary files a/lib/gpg/bin/pinentry-basic.exe and b/lib/gpg/bin/pinentry-basic.exe differ
diff --git a/lib/gpg/bin/scdaemon.exe b/lib/gpg/bin/scdaemon.exe
index c64e841..97ecbc0 100644
Binary files a/lib/gpg/bin/scdaemon.exe and b/lib/gpg/bin/scdaemon.exe differ
diff --git a/lib/gpg/bin/zlib1.dll b/lib/gpg/bin/zlib1.dll
index 2fcf41e..359fd53 100644
Binary files a/lib/gpg/bin/zlib1.dll and b/lib/gpg/bin/zlib1.dll differ
diff --git a/lib/gpg/include/gcrypt.h b/lib/gpg/include/gcrypt.h
index eb2a65a..b06d78d 100644
--- a/lib/gpg/include/gcrypt.h
+++ b/lib/gpg/include/gcrypt.h
@@ -1,5 +1,6 @@
/* gcrypt.h - GNU Cryptographic Library Interface -*- c -*-
- * Copyright (C) 2012-2021 g10 Code GmbH
+ * Copyright (C) 2012-2022 g10 Code GmbH
+ * Copyright (C) 2013-2022 Jussi Kivilinna
* Copyright (C) 1998-2018 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
@@ -16,7 +17,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see .
- * SPDX-License-Identifier: LGPL-2.1-or-later
*
* File: src/gcrypt.h. Generated from gcrypt.h.in by configure.
*/
@@ -33,20 +33,11 @@
#include
#if defined _WIN32 || defined __WIN32__
-# include
-# include
-# include
# ifndef __GNUC__
typedef long ssize_t;
typedef int pid_t;
# endif /*!__GNUC__*/
-#else
-# include
-# include
-#
-#endif /*!_WIN32*/
-
-typedef int gcry_socklen_t;
+#endif /*_WIN32*/
/* This is required for error code compatibility. */
#define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT
@@ -63,11 +54,11 @@ extern "C" {
return the same version. The purpose of this macro is to let
autoconf (using the AM_PATH_GCRYPT macro) check that this header
matches the installed library. */
-#define GCRYPT_VERSION "1.8.8"
+#define GCRYPT_VERSION "1.10.1"
/* The version number of this header. It may be used to handle minor
API incompatibilities. */
-#define GCRYPT_VERSION_NUMBER 0x010808
+#define GCRYPT_VERSION_NUMBER 0x010a01
/* Internal: We can't use the convenience macros for the multi
@@ -128,7 +119,7 @@ extern "C" {
#ifdef _GCRYPT_IN_LIBGCRYPT
#define _GCRY_ATTR_INTERNAL
#else
-#define _GCRY_ATTR_INTERNAL _GCRY_GCC_ATTR_DEPRECATED
+#define _GCRY_ATTR_INTERNAL _GCRY_GCC_ATTR_DEPRECATED
#endif
/* Wrappers for the libgpg-error library. */
@@ -333,7 +324,13 @@ enum gcry_ctl_cmds
GCRYCTL_DRBG_REINIT = 74,
GCRYCTL_SET_TAGLEN = 75,
GCRYCTL_GET_TAGLEN = 76,
- GCRYCTL_REINIT_SYSCALL_CLAMP = 77
+ GCRYCTL_REINIT_SYSCALL_CLAMP = 77,
+ GCRYCTL_AUTO_EXPAND_SECMEM = 78,
+ GCRYCTL_SET_ALLOW_WEAK_KEY = 79,
+ GCRYCTL_SET_DECRYPTION_TAG = 80,
+ GCRYCTL_FIPS_SERVICE_INDICATOR_CIPHER = 81,
+ GCRYCTL_FIPS_SERVICE_INDICATOR_KDF = 82,
+ GCRYCTL_NO_FIPS_MODE = 83
};
/* Perform various operations defined by CMD. */
@@ -387,7 +384,7 @@ gcry_error_t gcry_sexp_build (gcry_sexp_t *retsexp, size_t *erroff,
/* Like gcry_sexp_build, but uses an array instead of variable
function arguments. */
gcry_error_t gcry_sexp_build_array (gcry_sexp_t *retsexp, size_t *erroff,
- const char *format, void **arg_list);
+ const char *format, void **arg_list);
/* Release the S-expression object SEXP */
void gcry_sexp_release (gcry_sexp_t sexp);
@@ -588,6 +585,9 @@ gcry_mpi_t gcry_mpi_set (gcry_mpi_t w, const gcry_mpi_t u);
/* Store the unsigned integer value U in W. */
gcry_mpi_t gcry_mpi_set_ui (gcry_mpi_t w, unsigned long u);
+/* Store U as an unsigned int at W or return GPG_ERR_ERANGE. */
+gpg_error_t gcry_mpi_get_ui (unsigned int *w, gcry_mpi_t u);
+
/* Swap the values of A and B. */
void gcry_mpi_swap (gcry_mpi_t a, gcry_mpi_t b);
@@ -841,6 +841,7 @@ gcry_mpi_t _gcry_mpi_get_const (int no);
#define mpi_snatch( w, u) gcry_mpi_snatch( (w), (u) )
#define mpi_set( w, u) gcry_mpi_set( (w), (u) )
#define mpi_set_ui( w, u) gcry_mpi_set_ui( (w), (u) )
+#define mpi_get_ui( w, u) gcry_mpi_get_ui( (w), (u) )
#define mpi_abs( w ) gcry_mpi_abs( (w) )
#define mpi_neg( w, u) gcry_mpi_neg( (w), (u) )
#define mpi_cmp( u, v ) gcry_mpi_cmp( (u), (v) )
@@ -940,7 +941,9 @@ enum gcry_cipher_algos
GCRY_CIPHER_SALSA20 = 313,
GCRY_CIPHER_SALSA20R12 = 314,
GCRY_CIPHER_GOST28147 = 315,
- GCRY_CIPHER_CHACHA20 = 316
+ GCRY_CIPHER_CHACHA20 = 316,
+ GCRY_CIPHER_GOST28147_MESH = 317, /* With CryptoPro key meshing. */
+ GCRY_CIPHER_SM4 = 318
};
/* The Rijndael algorithm is basically AES, so provide some macros. */
@@ -967,7 +970,10 @@ enum gcry_cipher_modes
GCRY_CIPHER_MODE_POLY1305 = 10, /* Poly1305 based AEAD mode. */
GCRY_CIPHER_MODE_OCB = 11, /* OCB3 mode. */
GCRY_CIPHER_MODE_CFB8 = 12, /* Cipher feedback (8 bit mode). */
- GCRY_CIPHER_MODE_XTS = 13 /* XTS mode. */
+ GCRY_CIPHER_MODE_XTS = 13, /* XTS mode. */
+ GCRY_CIPHER_MODE_EAX = 14, /* EAX mode. */
+ GCRY_CIPHER_MODE_SIV = 15, /* SIV mode. */
+ GCRY_CIPHER_MODE_GCM_SIV = 16 /* GCM-SIV mode. */
};
/* Flags used with the open function. */
@@ -976,7 +982,8 @@ enum gcry_cipher_flags
GCRY_CIPHER_SECURE = 1, /* Allocate in secure memory. */
GCRY_CIPHER_ENABLE_SYNC = 2, /* Enable CFB sync mode. */
GCRY_CIPHER_CBC_CTS = 4, /* Enable CBC cipher text stealing (CTS). */
- GCRY_CIPHER_CBC_MAC = 8 /* Enable CBC message auth. code (MAC). */
+ GCRY_CIPHER_CBC_MAC = 8, /* Enable CBC message auth. code (MAC). */
+ GCRY_CIPHER_EXTENDED = 16 /* Enable extended AES-WRAP. */
};
/* GCM works only with blocks of 128 bits */
@@ -991,6 +998,9 @@ enum gcry_cipher_flags
/* XTS works only with blocks of 128 bits. */
#define GCRY_XTS_BLOCK_LEN (128 / 8)
+/* SIV and GCM-SIV works only with blocks of 128 bits */
+#define GCRY_SIV_BLOCK_LEN (128 / 8)
+
/* Create a handle for algorithm ALGO to be used in MODE. FLAGS may
be given as an bitwise OR of the gcry_cipher_flags values. */
gcry_error_t gcry_cipher_open (gcry_cipher_hd_t *handle,
@@ -1093,6 +1103,11 @@ size_t gcry_cipher_get_algo_blklen (int algo);
#define gcry_cipher_test_algo(a) \
gcry_cipher_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL )
+/* Setup tag for decryption (for SIV and GCM-SIV mode). */
+#define gcry_cipher_set_decryption_tag(a, tag, taglen) \
+ gcry_cipher_ctl ((a), GCRYCTL_SET_DECRYPTION_TAG, \
+ (void *)(tag), (taglen))
+
/************************************
* *
@@ -1192,6 +1207,28 @@ gcry_sexp_t gcry_pk_get_param (int algo, const char *name);
/* Return an S-expression representing the context CTX. */
gcry_error_t gcry_pubkey_get_sexp (gcry_sexp_t *r_sexp,
int mode, gcry_ctx_t ctx);
+
+/************************************
+ * *
+ * Modern ECC Functions *
+ * *
+ ************************************/
+
+/* The curves we support. */
+enum gcry_ecc_curves
+ {
+ GCRY_ECC_CURVE25519 = 1,
+ GCRY_ECC_CURVE448 = 2
+ };
+
+/* Get the length of point to prepare buffer for the result. */
+unsigned int gcry_ecc_get_algo_keylen (int curveid);
+
+/* Convenience function to compute scalar multiplication of the
+ * Montgomery form of curve. */
+gpg_error_t gcry_ecc_mul_point (int curveid, unsigned char *result,
+ const unsigned char *scalar,
+ const unsigned char *point);
@@ -1241,7 +1278,10 @@ enum gcry_md_algos
GCRY_MD_BLAKE2S_256 = 322,
GCRY_MD_BLAKE2S_224 = 323,
GCRY_MD_BLAKE2S_160 = 324,
- GCRY_MD_BLAKE2S_128 = 325
+ GCRY_MD_BLAKE2S_128 = 325,
+ GCRY_MD_SM3 = 326,
+ GCRY_MD_SHA512_256 = 327,
+ GCRY_MD_SHA512_224 = 328
};
/* Flags used with the open function. */
@@ -1408,6 +1448,7 @@ typedef struct gcry_mac_handle *gcry_mac_hd_t;
enum gcry_mac_algos
{
GCRY_MAC_NONE = 0,
+ GCRY_MAC_GOST28147_IMIT = 1,
GCRY_MAC_HMAC_SHA256 = 101,
GCRY_MAC_HMAC_SHA224 = 102,
@@ -1427,6 +1468,18 @@ enum gcry_mac_algos
GCRY_MAC_HMAC_SHA3_256 = 116,
GCRY_MAC_HMAC_SHA3_384 = 117,
GCRY_MAC_HMAC_SHA3_512 = 118,
+ GCRY_MAC_HMAC_GOSTR3411_CP = 119,
+ GCRY_MAC_HMAC_BLAKE2B_512 = 120,
+ GCRY_MAC_HMAC_BLAKE2B_384 = 121,
+ GCRY_MAC_HMAC_BLAKE2B_256 = 122,
+ GCRY_MAC_HMAC_BLAKE2B_160 = 123,
+ GCRY_MAC_HMAC_BLAKE2S_256 = 124,
+ GCRY_MAC_HMAC_BLAKE2S_224 = 125,
+ GCRY_MAC_HMAC_BLAKE2S_160 = 126,
+ GCRY_MAC_HMAC_BLAKE2S_128 = 127,
+ GCRY_MAC_HMAC_SM3 = 128,
+ GCRY_MAC_HMAC_SHA512_256 = 129,
+ GCRY_MAC_HMAC_SHA512_224 = 130,
GCRY_MAC_CMAC_AES = 201,
GCRY_MAC_CMAC_3DES = 202,
@@ -1439,6 +1492,7 @@ enum gcry_mac_algos
GCRY_MAC_CMAC_RFC2268 = 209,
GCRY_MAC_CMAC_IDEA = 210,
GCRY_MAC_CMAC_GOST28147 = 211,
+ GCRY_MAC_CMAC_SM4 = 212,
GCRY_MAC_GMAC_AES = 401,
GCRY_MAC_GMAC_CAMELLIA = 402,
@@ -1538,7 +1592,16 @@ enum gcry_kdf_algos
GCRY_KDF_ITERSALTED_S2K = 19,
GCRY_KDF_PBKDF1 = 33,
GCRY_KDF_PBKDF2 = 34,
- GCRY_KDF_SCRYPT = 48
+ GCRY_KDF_SCRYPT = 48,
+ GCRY_KDF_ARGON2 = 64,
+ GCRY_KDF_BALLOON = 65
+ };
+
+enum gcry_kdf_subalgo_argon2
+ {
+ GCRY_KDF_ARGON2D = 0,
+ GCRY_KDF_ARGON2I = 1,
+ GCRY_KDF_ARGON2ID = 2
};
/* Derive a key from a passphrase. */
@@ -1548,8 +1611,33 @@ gpg_error_t gcry_kdf_derive (const void *passphrase, size_t passphraselen,
unsigned long iterations,
size_t keysize, void *keybuffer);
+/* Another API to derive a key from a passphrase. */
+typedef struct gcry_kdf_handle *gcry_kdf_hd_t;
+typedef void (*gcry_kdf_job_fn_t) (void *priv);
+typedef int (*gcry_kdf_dispatch_job_fn_t) (void *jobs_context,
+ gcry_kdf_job_fn_t job_fn,
+ void *job_priv);
+typedef int (*gcry_kdf_wait_all_jobs_fn_t) (void *jobs_context);
+/* Exposed structure for KDF computation to decouple thread functionality. */
+typedef struct gcry_kdf_thread_ops
+{
+ void *jobs_context;
+ gcry_kdf_dispatch_job_fn_t dispatch_job;
+ gcry_kdf_wait_all_jobs_fn_t wait_all_jobs;
+} gcry_kdf_thread_ops_t;
+
+gcry_error_t gcry_kdf_open (gcry_kdf_hd_t *hd, int algo, int subalgo,
+ const unsigned long *param, unsigned int paramlen,
+ const void *passphrase, size_t passphraselen,
+ const void *salt, size_t saltlen,
+ const void *key, size_t keylen,
+ const void *ad, size_t adlen);
+gcry_error_t gcry_kdf_compute (gcry_kdf_hd_t h,
+ const gcry_kdf_thread_ops_t *ops);
+gcry_error_t gcry_kdf_final (gcry_kdf_hd_t h, size_t resultlen, void *result);
+void gcry_kdf_close (gcry_kdf_hd_t h);
/************************************
* *
@@ -1600,8 +1688,7 @@ void *gcry_random_bytes (size_t nbytes, enum gcry_random_level level)
_GCRY_GCC_ATTR_MALLOC;
/* Return NBYTES of allocated random using a random numbers of quality
- LEVEL. The random numbers are created returned in "secure"
- memory. */
+ LEVEL. The random is returned in "secure" memory. */
void *gcry_random_bytes_secure (size_t nbytes, enum gcry_random_level level)
_GCRY_GCC_ATTR_MALLOC;
@@ -1784,6 +1871,32 @@ int gcry_is_secure (const void *a) _GCRY_GCC_ATTR_PURE;
/* Return true if Libgcrypt is in FIPS mode. */
#define gcry_fips_mode_active() !!gcry_control (GCRYCTL_FIPS_MODE_P, 0)
+/* Variant of gcry_pk_sign which takes as additional parameter a HD
+ * handle for hash and an optional context. The hash algorithm used by the
+ * handle needs to be enabled and input needs to be supplied beforehand.
+ * DATA-TMPL specifies a template to compose an S-expression to be signed.
+ * A template should include '(hash %s %b)' or '(hash ALGONAME %b)'.
+ * For the former case, '%s' is substituted by the string of algorithm
+ * of gcry_md_get_algo (HD) and when gcry_md_read is called, ALGO=0 is
+ * used internally. For the latter case, hash algorithm by ALGONAME
+ * is used when gcry_md_read is called internally.
+ * The hash handle must not yet been finalized; the function
+ * takes a copy of the state and does a finalize on the copy. This
+ * function shall be used if a policy requires that hashing and signing
+ * is done by the same function. CTX is currently not used and should
+ * be passed as NULL. */
+gcry_error_t gcry_pk_hash_sign (gcry_sexp_t *result,
+ const char *data_tmpl, gcry_sexp_t skey,
+ gcry_md_hd_t hd, gcry_ctx_t ctx);
+
+/* Variant of gcry_pk_verify which takes as additional parameter a HD
+ * handle for hash and an optional context. Similar to gcry_pk_hash_sign. */
+gcry_error_t gcry_pk_hash_verify (gcry_sexp_t sigval,
+ const char *data_tmpl, gcry_sexp_t pkey,
+ gcry_md_hd_t hd, gcry_ctx_t ctx);
+
+gcry_error_t gcry_pk_random_override_new (gcry_ctx_t *r_ctx,
+ const unsigned char *p, size_t len);
#if 0 /* (Keep Emacsens' auto-indent happy.) */
{
diff --git a/lib/gpg/include/gpg-error.h b/lib/gpg/include/gpg-error.h
index 9ea859b..1210008 100644
--- a/lib/gpg/include/gpg-error.h
+++ b/lib/gpg/include/gpg-error.h
@@ -66,12 +66,12 @@
#include
/* The version string of this header. */
-#define GPG_ERROR_VERSION "1.42"
-#define GPGRT_VERSION "1.42"
+#define GPG_ERROR_VERSION "1.45"
+#define GPGRT_VERSION "1.45"
/* The version number of this header. */
-#define GPG_ERROR_VERSION_NUMBER 0x012a00
-#define GPGRT_VERSION_NUMBER 0x012a00
+#define GPG_ERROR_VERSION_NUMBER 0x012d00
+#define GPGRT_VERSION_NUMBER 0x012d00
#ifdef __GNUC__
@@ -1103,6 +1103,22 @@ size_t gpgrt_w32_iconv (gpgrt_w32_iconv_t cd,
# define iconv(a,b,c,d,e) gpgrt_w32_iconv ((a),(b),(c),(d),(e))
#endif /*GPGRT_ENABLE_W32_ICONV_MACROS*/
+/* Release a wchar_t * buffer. */
+void gpgrt_free_wchar (wchar_t *wstring);
+
+/* Convert an UTF-8 encoded file name to wchar.
+ * Prepend a '\\?\' prefix if needed. */
+wchar_t *gpgrt_fname_to_wchar (const char *fname);
+
+/* Convert an UTF8 string to a WCHAR string. Caller should use
+ * gpgrt_free_wchar to release the result.
+ * Returns NULL on error and sets ERRNO. */
+wchar_t *gpgrt_utf8_to_wchar (const char *string);
+
+/* Convert a WCHAR string to UTF-8. Caller should use gpgrt_free to
+ * release the result. Returns NULL on error and sets ERRNO. */
+char *gpgrt_wchar_to_utf8 (const wchar_t *wstring);
+
/* Query a string in the registry. */
char *gpgrt_w32_reg_query_string (const char *root,
const char *dir,
@@ -1889,7 +1905,8 @@ typedef struct
#define ARGPARSE_FLAG_USER 2048 /* Use user config file. */
#define ARGPARSE_FLAG_VERBOSE 4096 /* Print additional argparser info. */
#define ARGPARSE_FLAG_USERVERS 8192 /* Try version-ed user config files. */
-#define ARGPARSE_FLAG_WITHATTR 16384 /* Return attribute bits. */
+#define ARGPARSE_FLAG_WITHATTR 16384 /* Return attribute bits. (Make sure */
+ /* to act upon ARGPARSE_OPT_IGNORE.) */
/* Constants for (gpgrt_argparse_t).err. */
#define ARGPARSE_PRINT_WARNING 1 /* Print a diagnostic. */
diff --git a/lib/gpg/include/gpgme.h b/lib/gpg/include/gpgme.h
index a12cea5..895ca63 100644
--- a/lib/gpg/include/gpgme.h
+++ b/lib/gpg/include/gpgme.h
@@ -42,11 +42,11 @@ extern "C" {
* instead. The purpose of this macro is to let autoconf (using the
* AM_PATH_GPGME macro) check that this header matches the installed
* library. */
-#define GPGME_VERSION "1.15.1"
+#define GPGME_VERSION "1.17.1"
/* The version number of this header. It may be used to handle minor
* API incompatibilities. */
-#define GPGME_VERSION_NUMBER 0x010f01
+#define GPGME_VERSION_NUMBER 0x011101
/* System specific typedefs. */
@@ -414,8 +414,8 @@ gpgme_pinentry_mode_t;
#define GPGME_EXPORT_MODE_SECRET 16
#define GPGME_EXPORT_MODE_RAW 32
#define GPGME_EXPORT_MODE_PKCS12 64
-#define GPGME_EXPORT_MODE_NOUID 128 /* Experimental(!)*/
#define GPGME_EXPORT_MODE_SSH 256
+#define GPGME_EXPORT_MODE_SECRET_SUBKEY 512
typedef unsigned int gpgme_export_mode_t;
@@ -636,7 +636,13 @@ struct _gpgme_key_sig
unsigned int exportable : 1;
/* Internal to GPGME, do not use. */
- unsigned int _unused : 28;
+ unsigned int _unused : 12;
+
+ /* The depth of a trust signature, 0 if no trust signature. */
+ unsigned int trust_depth : 8;
+
+ /* The trust value of a trust signature, 0 if no trust signature. */
+ unsigned int trust_value : 8;
/* The public key algorithm used to create the signature. */
gpgme_pubkey_algo_t pubkey_algo;
@@ -683,6 +689,9 @@ struct _gpgme_key_sig
/* Internal to GPGME, do not use. */
gpgme_sig_notation_t _last_notation;
+
+ /* The scope of a trust signature. Might be NULL. */
+ char *trust_scope;
};
typedef struct _gpgme_key_sig *gpgme_key_sig_t;
@@ -1737,6 +1746,12 @@ gpgme_error_t gpgme_op_import (gpgme_ctx_t ctx, gpgme_data_t keydata);
gpgme_error_t gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t keys[]);
gpgme_error_t gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t keys[]);
+/* Import the keys given by the array KEYIDS from a keyserver into the
+ * keyring. */
+gpgme_error_t gpgme_op_receive_keys_start (gpgme_ctx_t ctx,
+ const char *keyids[]);
+gpgme_error_t gpgme_op_receive_keys (gpgme_ctx_t ctx, const char *keyids[]);
+
/* Export the keys found by PATTERN into KEYDATA. */
gpgme_error_t gpgme_op_export_start (gpgme_ctx_t ctx, const char *pattern,
@@ -1914,6 +1929,7 @@ gpgme_error_t gpgme_op_delete_ext (gpgme_ctx_t ctx, const gpgme_key_t key,
#define GPGME_KEYSIGN_LOCAL (1 << 7) /* Create a local signature. */
#define GPGME_KEYSIGN_LFSEP (1 << 8) /* Indicate LF separated user ids. */
#define GPGME_KEYSIGN_NOEXPIRE (1 << 9) /* Force no expiration. */
+#define GPGME_KEYSIGN_FORCE (1 << 10) /* Force creation. */
/* Sign the USERID of KEY using the current set of signers. */
@@ -2471,6 +2487,11 @@ char *gpgme_addrspec_from_uid (const char *uid);
* Deprecated types, constants and functions.
*/
+/* This is a former experimental only features. The constant is
+ * provided to not break existing code in the compiler phase. */
+#define GPGME_EXPORT_MODE_NOUID 128 /* Do not use! */
+
+
/* The possible stati for gpgme_op_edit. The use of that function and
* these status codes are deprecated in favor of gpgme_op_interact. */
typedef enum
diff --git a/lib/gpg/lib/libgcrypt.imp b/lib/gpg/lib/libgcrypt.imp
index 533a1cc..e18d474 100644
Binary files a/lib/gpg/lib/libgcrypt.imp and b/lib/gpg/lib/libgcrypt.imp differ
diff --git a/lib/gpg/lib/libgpg-error.imp b/lib/gpg/lib/libgpg-error.imp
index 64ef5ff..82846e5 100644
Binary files a/lib/gpg/lib/libgpg-error.imp and b/lib/gpg/lib/libgpg-error.imp differ
diff --git a/lib/gpg/lib/libgpgme.imp b/lib/gpg/lib/libgpgme.imp
index 9533f33..c6ea446 100644
Binary files a/lib/gpg/lib/libgpgme.imp and b/lib/gpg/lib/libgpgme.imp differ
diff --git a/lib/gpg/share/locale/ca/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/ca/LC_MESSAGES/gnupg2.mo
index 7a437d8..ee0e9e5 100644
Binary files a/lib/gpg/share/locale/ca/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/ca/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/cs/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/cs/LC_MESSAGES/gnupg2.mo
index 0029a4a..98640c0 100644
Binary files a/lib/gpg/share/locale/cs/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/cs/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/cs/LC_MESSAGES/libgpg-error.mo b/lib/gpg/share/locale/cs/LC_MESSAGES/libgpg-error.mo
index 52861ae..b6a02f8 100644
Binary files a/lib/gpg/share/locale/cs/LC_MESSAGES/libgpg-error.mo and b/lib/gpg/share/locale/cs/LC_MESSAGES/libgpg-error.mo differ
diff --git a/lib/gpg/share/locale/da/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/da/LC_MESSAGES/gnupg2.mo
index febbf6d..3d675a9 100644
Binary files a/lib/gpg/share/locale/da/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/da/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/de/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/de/LC_MESSAGES/gnupg2.mo
index d39879b..1b0a343 100644
Binary files a/lib/gpg/share/locale/de/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/de/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/el/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/el/LC_MESSAGES/gnupg2.mo
index 3db5a68..c09501e 100644
Binary files a/lib/gpg/share/locale/el/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/el/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
index a87745f..29e4b2c 100644
Binary files a/lib/gpg/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/en@quot/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/en@quot/LC_MESSAGES/gnupg2.mo
index 47ae937..dbf39b9 100644
Binary files a/lib/gpg/share/locale/en@quot/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/en@quot/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/eo/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/eo/LC_MESSAGES/gnupg2.mo
index aae474a..0514eb2 100644
Binary files a/lib/gpg/share/locale/eo/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/eo/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/es/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/es/LC_MESSAGES/gnupg2.mo
index 0cab7c3..30dc2b6 100644
Binary files a/lib/gpg/share/locale/es/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/es/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/et/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/et/LC_MESSAGES/gnupg2.mo
index 7ed9f68..d61568e 100644
Binary files a/lib/gpg/share/locale/et/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/et/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/fi/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/fi/LC_MESSAGES/gnupg2.mo
index 15d1d0d..b1cb704 100644
Binary files a/lib/gpg/share/locale/fi/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/fi/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/fr/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/fr/LC_MESSAGES/gnupg2.mo
index 2288f68..9413e39 100644
Binary files a/lib/gpg/share/locale/fr/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/fr/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/gl/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/gl/LC_MESSAGES/gnupg2.mo
index 930d222..24547ab 100644
Binary files a/lib/gpg/share/locale/gl/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/gl/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/hu/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/hu/LC_MESSAGES/gnupg2.mo
index d48cf36..26b81ab 100644
Binary files a/lib/gpg/share/locale/hu/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/hu/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/id/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/id/LC_MESSAGES/gnupg2.mo
index e204841..1826c0a 100644
Binary files a/lib/gpg/share/locale/id/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/id/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/it/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/it/LC_MESSAGES/gnupg2.mo
index bbb1967..832e932 100644
Binary files a/lib/gpg/share/locale/it/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/it/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/ja/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/ja/LC_MESSAGES/gnupg2.mo
index 4243d01..d4e30f9 100644
Binary files a/lib/gpg/share/locale/ja/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/ja/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/nb/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/nb/LC_MESSAGES/gnupg2.mo
index 215b71a..5c1dd27 100644
Binary files a/lib/gpg/share/locale/nb/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/nb/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/pl/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/pl/LC_MESSAGES/gnupg2.mo
index 3dffac4..d0e5d08 100644
Binary files a/lib/gpg/share/locale/pl/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/pl/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/pt/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/pt/LC_MESSAGES/gnupg2.mo
index 61a8944..d7a2aea 100644
Binary files a/lib/gpg/share/locale/pt/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/pt/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/ro/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/ro/LC_MESSAGES/gnupg2.mo
index 0e9e4cf..031d089 100644
Binary files a/lib/gpg/share/locale/ro/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/ro/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/ru/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/ru/LC_MESSAGES/gnupg2.mo
index 0f67f7d..b17dfc5 100644
Binary files a/lib/gpg/share/locale/ru/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/ru/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/ru/LC_MESSAGES/libgpg-error.mo b/lib/gpg/share/locale/ru/LC_MESSAGES/libgpg-error.mo
index 85a4bec..2aca631 100644
Binary files a/lib/gpg/share/locale/ru/LC_MESSAGES/libgpg-error.mo and b/lib/gpg/share/locale/ru/LC_MESSAGES/libgpg-error.mo differ
diff --git a/lib/gpg/share/locale/sk/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/sk/LC_MESSAGES/gnupg2.mo
index 09a18ca..2052808 100644
Binary files a/lib/gpg/share/locale/sk/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/sk/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/sv/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/sv/LC_MESSAGES/gnupg2.mo
index 19dfdec..6041799 100644
Binary files a/lib/gpg/share/locale/sv/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/sv/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/tr/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/tr/LC_MESSAGES/gnupg2.mo
index c0a5121..d2cb6c8 100644
Binary files a/lib/gpg/share/locale/tr/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/tr/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/uk/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/uk/LC_MESSAGES/gnupg2.mo
index 70e234a..d8e2fe1 100644
Binary files a/lib/gpg/share/locale/uk/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/uk/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
index 3d78ce6..c908d9b 100644
Binary files a/lib/gpg/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo differ
diff --git a/lib/gpg/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo b/lib/gpg/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
index 5036736..3cd07bd 100644
Binary files a/lib/gpg/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo and b/lib/gpg/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo differ