diff options
| author | JinWang An <jinwang.an@samsung.com> | 2021-12-01 16:54:39 +0900 |
|---|---|---|
| committer | JinWang An <jinwang.an@samsung.com> | 2021-12-01 16:54:39 +0900 |
| commit | fc59d1efdca7b2886739948b88a1aa8cd4243146 (patch) | |
| tree | 3a1b870e9b2cf95e3826026afab018949576aac8 /src | |
| parent | ca69957d6d6eeb4e69e77a70106785570050901b (diff) | |
| download | gpgme-fc59d1efdca7b2886739948b88a1aa8cd4243146.tar.gz gpgme-fc59d1efdca7b2886739948b88a1aa8cd4243146.tar.bz2 gpgme-fc59d1efdca7b2886739948b88a1aa8cd4243146.zip | |
Imported Upstream version 1.15.1upstream/1.15.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine-gpg.c | 6 | ||||
| -rw-r--r-- | src/export.c | 4 | ||||
| -rw-r--r-- | src/gpgme.m4 | 4 | ||||
| -rw-r--r-- | src/versioninfo.rc.in | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 02a10ec..9a9a26e 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -3017,6 +3017,12 @@ gpg_keylist_build_options (engine_gpg_t gpg, int secret_only, err = add_arg (gpg, "--with-keygrip"); } + if (!err && (mode & GPGME_KEYLIST_MODE_SIGS) + && have_gpg_version (gpg, "2.0.10")) + { + err = add_arg (gpg, "--with-sig-check"); + } + if (!err && (mode & GPGME_KEYLIST_MODE_SIGS) && (mode & GPGME_KEYLIST_MODE_SIG_NOTATIONS)) diff --git a/src/export.c b/src/export.c index f827efa..879a54f 100644 --- a/src/export.c +++ b/src/export.c @@ -88,6 +88,10 @@ export_status_handler (void *priv, gpgme_status_code_t code, char *args) op_data_t opd; const char *loc; + err = _gpgme_passphrase_status_handler (priv, code, args); + if (err) + return err; + err = _gpgme_op_data_lookup (ctx, OPDATA_EXPORT, &hook, -1, NULL); opd = hook; if (err) diff --git a/src/gpgme.m4 b/src/gpgme.m4 index 2a72f18..c749a5d 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -9,12 +9,12 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Last-changed: 2018-11-12 +# Last-changed: 2020-11-20 AC_DEFUN([_AM_PATH_GPGME_CONFIG], [ AC_ARG_WITH(gpgme-prefix, - AC_HELP_STRING([--with-gpgme-prefix=PFX], + AS_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), gpgme_config_prefix="$withval", gpgme_config_prefix="") if test x"${GPGME_CONFIG}" = x ; then diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in index 598d5c2..7800368 100644 --- a/src/versioninfo.rc.in +++ b/src/versioninfo.rc.in @@ -39,7 +39,7 @@ BEGIN VALUE "FileDescription", "GPGME - GnuPG Made Easy\0" VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_REVISION@\0" VALUE "InternalName", "gpgme\0" - VALUE "LegalCopyright", "Copyright © 2001-2020 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright © 2001-2021 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "gpgme.dll\0" VALUE "PrivateBuild", "\0" |