diff options
| author | Werner Koch <wk@gnupg.org> | 2018-12-03 08:41:53 +0100 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2018-12-04 18:58:20 -0800 |
| commit | 0725e71e00e0e03a83393e752224ee3d4edcd0b3 (patch) | |
| tree | b847042d94c287c13225dc949b192113c593b5d9 /crypt-gpgme.c | |
| parent | 125c955d8da8bafd7c02bf784b624bd9b0e2b235 (diff) | |
Require GPGME version 1.2.0 and drop useless HAVE macros.
GPGME 1.2.0 was released nearly 10 years ago and thus we can really
demand this version. For various reasons it would be advisable to
require a decent version but that is a different thing and needs to be
done in a separate patch.
HAVE_GPGME_OP_EXPORT_KEYS and HAVE_GPGME_PKA_TRUST are not anymore
needed because they are supported by that GPGME version.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'crypt-gpgme.c')
| -rw-r--r-- | crypt-gpgme.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypt-gpgme.c b/crypt-gpgme.c index 83293ec6..55488357 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -1236,8 +1236,6 @@ static int show_sig_summary (unsigned long sum, state_puts ("\n", s); } -#ifdef HAVE_GPGME_PKA_TRUST - if (option (OPTCRYPTUSEPKA)) { if (sig->pka_trust == 1 && sig->pka_address) @@ -1255,8 +1253,6 @@ static int show_sig_summary (unsigned long sum, } } -#endif - return severe; } @@ -4642,7 +4638,6 @@ char *smime_gpgme_findkeys (ADDRESS *adrlist, int oppenc_mode) return find_keys (adrlist, APPLICATION_SMIME, oppenc_mode); } -#ifdef HAVE_GPGME_OP_EXPORT_KEYS BODY *pgp_gpgme_make_key_attachment (char *tempf) { crypt_key_t *key = NULL; @@ -4703,7 +4698,6 @@ bail: return att; } -#endif /* * Implementation of `init'. |