in full sig info: fix check for revoked key error code, and indicate expired key

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 074c6ac7571b80c8f924053e59c350f20ea5e46a..51c821dcbebde6ac7a0b8b0bf4995a4c051c1258 100644 (file)
--- 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:
                
                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;
                        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_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);
                        g_string_append_printf(siginfo,
                                _("Revoked key uid \"%s\"\n"),
                                uid);