diff options
| author | Werner Koch <[email protected]> | 2026-05-11 14:19:32 +0200 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2026-05-11 14:19:32 +0200 |
| commit | a05c27e670b72c9afe5dee38b2c5bb02654d7f52 (patch) | |
| tree | d662f9efcbf3d85288bc6da82a63728c78319a4e /src/engine-gpg.c | |
| parent | New decryption flag GPGME_DECRYPT_SESSION_HASH. (diff) | |
| download | gpgme-a05c27e670b72c9afe5dee38b2c5bb02654d7f52.tar.gz gpgme-a05c27e670b72c9afe5dee38b2c5bb02654d7f52.zip | |
Make GPGME_DECRYPT_SESSION_HASH also work for gnupg 2.2.55
* src/engine-gpg.c (have_usable_session_hash): New.
(gpg_decrypt): Use here.
Diffstat (limited to 'src/engine-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 8c4e38bf..eea97bc7 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -438,6 +438,15 @@ have_usable_gpgtar (engine_gpg_t gpg) static int +have_usable_session_hash (engine_gpg_t gpg) +{ + return have_gpg_version (gpg, "2.5.19") + || (have_gpg_version (gpg, "2.2.55") + && !have_gpg_version (gpg, "2.3.0")); +} + + +static int have_option_proc_all_sigs (engine_gpg_t gpg) { static unsigned int flag; @@ -1979,7 +1988,7 @@ gpg_decrypt (void *engine, err = add_arg (gpg, "--list-only"); if (!err && (flags & GPGME_DECRYPT_SESSION_HASH) - && have_gpg_version (gpg, "2.5.19")) + && have_usable_session_hash (gpg)) err = add_arg (gpg, (flags & GPGME_DECRYPT_LISTONLY)? "--show-only-session-hash" /* */ : "--show-session-hash"); |