Show full key/signature fingerprints.

Closes bug 3910 - Displaying of problematic short key IDs for GPG messages

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 99b6206cc59d6ea4ff731062cb252b6a8398f805..102b88630126817207edf8b4bde34f826d04bfc1 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -278,7 +278,7 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
                return;
        } else {
                TEXTVIEW_INSERT(_("\n  Key ID "));
-               TEXTVIEW_INSERT(sig->fpr);
+               TEXTVIEW_INSERT(key->fpr);
                TEXTVIEW_INSERT(":\n\n");
                TEXTVIEW_INSERT(_("   This key is in your keyring.\n"));
        }

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 89b4c874a5c8f99a70700ee7dab1f941110f6087..11bd25bfebfbf3c9c73786ffebc1cc02e614be0c 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -281,9 +281,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                        if (key) {
                                result = g_strdup_printf(_("Good signature from \"%s\""), uname);
                        } else {
-                               gchar *id = g_strdup(sig->fpr + strlen(sig->fpr)-8);
-                               result = g_strdup_printf(_("Key 0x%s not available to verify this signature"), id);
-                               g_free(id);
+                               result = g_strdup_printf(_("Key 0x%s not available to verify this signature"), sig->fpr);
                        }
                        break;
                }
@@ -301,9 +299,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                result = g_strdup_printf(_("Bad signature from \"%s\""), uname);
                break;
        case GPG_ERR_NO_PUBKEY: {
-               gchar *id = g_strdup(sig->fpr + strlen(sig->fpr)-8);
-               result = g_strdup_printf(_("Key 0x%s not available to verify this signature"), id);
-               g_free(id);
+               result = g_strdup_printf(_("Key 0x%s not available to verify this signature"), sig->fpr);
                break;
                }
        default: