From 7c90d012048137e3d11f1220783d60394e641b85 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 9 Jun 2014 17:13:58 +0100 Subject: [PATCH] in full sig info: fix check for revoked key error code, and indicate expired key --- src/plugins/pgpcore/sgpgme.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index 074c6ac75..51c821dcb 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -304,17 +304,21 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status) switch (gpg_err_code(sig->status)) { case GPG_ERR_NO_ERROR: - case GPG_ERR_KEY_EXPIRED: g_string_append_printf(siginfo, _("Good signature from uid \"%s\" (Validity: %s)\n"), uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN)); break; + case GPG_ERR_KEY_EXPIRED: + g_string_append_printf(siginfo, + _("Expired key uid \"%s\"\n"), + uid); + break; case GPG_ERR_SIG_EXPIRED: g_string_append_printf(siginfo, _("Expired signature from uid \"%s\" (Validity: %s)\n"), uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN)); break; - case GPG_ERR_CERT_EXPIRED: + case GPG_ERR_CERT_REVOKED: g_string_append_printf(siginfo, _("Revoked key uid \"%s\"\n"), uid); -- 2.25.1