[Commits] [SCM] claws branch, master, updated. 3.15.0-167-g9f1c5fe

[ticho at claws-mail.org]

The branch, master has been updated
       via  9f1c5fef1adcdfe9fcda6ee42123123242ab3efd (commit)
      from  f9943fa8151b1f115e57d0dd2cafff6114af0daf (commit)

Summary of changes:
 src/plugins/pgpcore/pgp_viewer.c |    2 +-
 src/plugins/pgpcore/sgpgme.c     |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 9f1c5fef1adcdfe9fcda6ee42123123242ab3efd
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 9 00:31:27 2017 +0100

    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 99b6206..102b886 100644
--- 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 89b4c87..11bd25b 100644
--- 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:

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail