talons

commit 9b429ff5fdc20dba974ee6df92f6ac922861a3da
parent 22ebff822f7862e31ed782c9f3c33c18a955d06d
Author: Paul <paul@claws-mail.org>
Date:   Wed,  7 Nov 2018 10:33:06 +0000

drop redundant md5 fingerprint; more clearly indicate expired sigs

Diffstat:
M
src/gtk/sslcertwindow.c
 | 
17
+++++++----------

1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -61,7 +61,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	char *issuer_commonname, *issuer_location, *issuer_organization;
 	char *subject_commonname, *subject_location, *subject_organization;
 	char *sig_status, *exp_date;
-	char *md5_fingerprint, *sha1_fingerprint, *sha256_fingerprint, *fingerprint;
+	char *sha1_fingerprint, *sha256_fingerprint, *fingerprint;
 	size_t n;
 	char buf[100];
 	unsigned char md[128];	
@@ -142,12 +142,8 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 
 	/* fingerprint */
 	n = 128;
-	gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
-	md5_fingerprint = readable_fingerprint(md, (int)n);
-	n = 128;
 	gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA1, md, &n);
 	sha1_fingerprint = readable_fingerprint(md, (int)n);
-	n = 128;
 	gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA256, md, &n);
 	sha256_fingerprint = readable_fingerprint(md, (int)n);
 
@@ -156,7 +152,9 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	sig_status = ssl_certificate_check_signer(cert, cert->status);
 
 	if (sig_status==NULL)
-		sig_status = g_strdup(_("Correct"));
+		sig_status = g_strdup_printf(_("Correct%s"),exp_time_t < time(NULL)? _(" (expired)"): "");
+	else if (exp_time_t < time(NULL))
+			  sig_status = g_strconcat(sig_status,_(" (expired)"),NULL);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	hbox = gtk_hbox_new(FALSE, 5);
@@ -220,8 +218,8 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	label = gtk_label_new(_("Fingerprint: \n"));
 	gtk_label_set_xalign(GTK_LABEL(label), 1.0);
 	gtk_table_attach(status_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-	fingerprint = g_strdup_printf("MD5: %s\nSHA1: %s\nSHA256: %s",
-			md5_fingerprint, sha1_fingerprint, sha256_fingerprint);
+	fingerprint = g_strdup_printf("SHA1: %s\nSHA256: %s",
+				      sha1_fingerprint, sha256_fingerprint);
 	label = gtk_label_new(fingerprint);
 	g_free(fingerprint);
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
@@ -234,7 +232,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_table_attach(status_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-	label = gtk_label_new(_("Expires on: "));
+	label = gtk_label_new(exp_time_t < time(NULL)? _("Expired on: "): _("Expires on: "));
 	gtk_label_set_xalign(GTK_LABEL(label), 1.0);
 	gtk_table_attach(status_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
 	label = gtk_label_new(exp_date);
@@ -259,7 +257,6 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	g_free(subject_commonname);
 	g_free(subject_location);
 	g_free(subject_organization);
-	g_free(md5_fingerprint);
 	g_free(sha1_fingerprint);
 	g_free(sha256_fingerprint);
 	g_free(sig_status);