From 22a0f60092f94e7228e7bf0817a6982ac8dd7a59 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 1 Nov 2015 15:52:58 +0000 Subject: [PATCH] revert 1b32cc6794190c9fb6124b6de5b6f23e3007eec9 it was a regression, and causes 'end of file' message on checking sig of a key not in the keyring, whereas without it you get the 'Key KEYID not avilable...' message instead. If there is a fix, that was not it. --- src/plugins/pgpcore/sgpgme.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index 371a7f043..67300781c 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -218,16 +218,6 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status) } else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) != GPG_ERR_EOF) { return g_strdup_printf(_("The signature can't be checked - %s"), gpgme_strerror(err)); - } else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) == GPG_ERR_EOF) { - /* - * When gpg is upgraded to gpg-v21 then installer tries to migrate the old - * gpg keyrings found in ~/.gnupg to the new version. If the keyrings contain - * very old keys using ciphers no more supported in gpg-v21 this transition - * can fail and the left-over ~/.gnupg/pubring.gpg will cause claws to crash - * when the above condition is meet. - */ - return g_strdup_printf(_("The signature can't be checked - %s."), - gpgme_strerror(err)); } if (key) uname = extract_name(key->uids->uid); -- 2.25.1