[Commits] [SCM] claws branch, master, updated. 3.17.3-30-gc0c904e

[claws at claws-mail.org]

The branch, master has been updated
       via  c0c904e36698605aadf4f61d05b76db1f9ee6828 (commit)
       via  8b5f46f3d98ec16c2050737659451fef2bff3a2a (commit)
      from  d42cdc00af96f0ba034e6e205216cf4e3c1c7540 (commit)

Summary of changes:
 src/gtk/about.c         |    6 +++---
 src/gtk/sslcertwindow.c |   31 ++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit c0c904e36698605aadf4f61d05b76db1f9ee6828
Author: Paul <paul at claws-mail.org>
Date:   Fri Jan 4 13:11:33 2019 +0000

    update copyright year

diff --git a/src/gtk/about.c b/src/gtk/about.c
index d442387..7596bd1 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,7 +160,7 @@ static GtkWidget *about_create_child_page_info(void)
 				NULL);
 #ifdef GENERIC_UMPC
 	ADD_TEXT("\n\n");
-	ADD_TEXT(_("Copyright (C) 1999-2018\nThe Claws Mail Team\n"
+	ADD_TEXT(_("Copyright (C) 1999-2019\nThe Claws Mail Team\n"
 				"and Hiroyuki Yamamoto"));
 #endif
 	ADD_TEXT("\n\n");
@@ -848,7 +848,7 @@ static void about_create(void)
 	gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
 #ifndef GENERIC_UMPC
 	label = gtk_label_new
-		(_("Copyright (C) 1999-2018\nThe Claws Mail Team\n"
+		(_("Copyright (C) 1999-2019\nThe Claws Mail Team\n"
 		 "and Hiroyuki Yamamoto"));
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);

commit 8b5f46f3d98ec16c2050737659451fef2bff3a2a
Author: Paul <paul at claws-mail.org>
Date:   Fri Jan 4 13:10:36 2019 +0000

    fix bug 4143, 'fingerprint in SSL/TLS certificates for ... (regress error)'
    
    patch by Andrej

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index cb3ce4c..c2748d8 100644
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2019 Colin Leroy <colin at colino.net>
  * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -70,6 +70,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	char *tmp;
 	time_t exp_time_t;
 	struct tm lt;
+	guint ret;
 
 	/* issuer */	
 	issuer_commonname = g_malloc(BUFFSIZE);
@@ -142,12 +143,28 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 	} else
 		exp_date = g_strdup("");
 
-	/* fingerprint */
-	n = 128;
-	gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA1, md, &n);
-	sha1_fingerprint = readable_fingerprint(md, (int)n);
-	gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA256, md, &n);
-	sha256_fingerprint = readable_fingerprint(md, (int)n);
+	/* fingerprints */
+	n = 0;
+	memset(md, 0, sizeof(md));
+	if ((ret = gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA1, md, &n)) == GNUTLS_E_SHORT_MEMORY_BUFFER) {
+		if (n <= sizeof(md))
+			ret = gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA1, md, &n);
+	}
+
+	if (ret != 0)
+		g_warning("failed to obtain SHA1 fingerprint: %d", ret);
+	sha1_fingerprint = readable_fingerprint(md, (int)n); /* all zeroes */
+
+	n = 0;
+	memset(md, 0, sizeof(md));
+	if ((ret = gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA256, md, &n)) == GNUTLS_E_SHORT_MEMORY_BUFFER) {
+		if (n <= sizeof(md))
+			ret = gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_SHA256, md, &n);
+	}
+
+	if (ret != 0)
+		g_warning("failed to obtain SHA256 fingerprint: %d", ret);
+	sha256_fingerprint = readable_fingerprint(md, (int)n); /* all zeroes */
 
 
 	/* signature */

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


hooks/post-receive
-- 
Claws Mail