commit 1449de86cf1aa0e1ca59189279185845cc3ad775
parent 7cf8a306f83df7262528e1e45f332db09daeece7
Author: Colin Leroy <colin@colino.net>
Date: Fri, 10 Oct 2008 16:02:01 +0000
2008-10-10 [colin] 3.6.1cvs1
* src/common/ssl_certificate.c
* src/gtk/sslcertwindow.c
Fix warnings
Diffstat:
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10 [colin] 3.6.1cvs1
+
+ * src/common/ssl_certificate.c
+ * src/gtk/sslcertwindow.c
+ Fix warnings
+
2008-10-10 [paul] 3.6.1
* m4/spamassassin.m4
diff --git a/PATCHSETS b/PATCHSETS
@@ -3582,3 +3582,4 @@
( cvs diff -u -r 1.654.2.3642 -r 1.654.2.3643 configure.ac; ) > 3.6.0cvs23.patchset
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 claws-mail.pc.in; ) > 3.6.0cvs24.patchset
( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/ssl.c; ) > 3.6.0cvs25.patchset
+( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/common/ssl_certificate.c; cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/gtk/sslcertwindow.c; ) > 3.6.1cvs1.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
@@ -236,7 +236,11 @@ static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gch
#endif
{
SSLCertificate *cert = g_new0(SSLCertificate, 1);
+#if USE_OPENSSL
unsigned int n;
+#else
+ size_t n;
+#endif
unsigned char md[128];
if (host == NULL || x509_cert == NULL) {
@@ -275,7 +279,7 @@ static void gnutls_i2d_X509_fp(FILE *fp, gnutls_x509_crt x509_cert)
int r;
if ((r = gnutls_x509_crt_export(x509_cert, GNUTLS_X509_FMT_DER, output, &cert_size)) < 0) {
- g_warning("couldn't export cert %s (%d)\n", gnutls_strerror(r), cert_size);
+ g_warning("couldn't export cert %s (%zd)\n", gnutls_strerror(r), cert_size);
return;
}
debug_print("writing %zd bytes\n",cert_size);
@@ -295,7 +299,7 @@ size_t gnutls_i2d_X509(gnutls_x509_crt x509_cert, unsigned char **output)
*output = malloc(cert_size);
if ((r = gnutls_x509_crt_export(x509_cert, GNUTLS_X509_FMT_DER, *output, &cert_size)) < 0) {
- g_warning("couldn't export cert %s (%d)\n", gnutls_strerror(r), cert_size);
+ g_warning("couldn't export cert %s (%zd)\n", gnutls_strerror(r), cert_size);
free(*output);
*output = NULL;
return 0;
@@ -314,7 +318,7 @@ size_t gnutls_i2d_PrivateKey(gnutls_x509_privkey pkey, unsigned char **output)
*output = malloc(key_size);
if ((r = gnutls_x509_privkey_export(pkey, GNUTLS_X509_FMT_DER, *output, &key_size)) < 0) {
- g_warning("couldn't export key %s (%d)\n", gnutls_strerror(r), key_size);
+ g_warning("couldn't export key %s (%zd)\n", gnutls_strerror(r), key_size);
free(*output);
*output = NULL;
return 0;
@@ -601,7 +605,7 @@ static gboolean ssl_certificate_compare (SSLCertificate *cert_a, SSLCertificate
return FALSE;
}
if (cert_size_a != cert_size_b) {
- g_warning("size differ %d %d\n", cert_size_a, cert_size_b);
+ g_warning("size differ %zd %zd\n", cert_size_a, cert_size_b);
g_free(output_a);
g_free(output_b);
return FALSE;
@@ -677,7 +681,11 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *
SSLCertHookData cert_hook_data;
gchar *fqdn_host = NULL;
gchar *fingerprint;
+#ifdef USE_OPENSSL
unsigned int n;
+#else
+ size_t n;
+#endif
unsigned char md[128];
if (fqdn)
@@ -707,7 +715,7 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *
#else
n = 128;
gnutls_x509_crt_get_fingerprint(x509_cert, GNUTLS_DIG_MD5, md, &n);
- fingerprint = readable_fingerprint(md, (int)n);
+ fingerprint = readable_fingerprint(md, n);
#endif
known_cert = ssl_certificate_find_lookup (fqdn_host, port, fingerprint, FALSE);
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -66,7 +66,11 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
char *subject_commonname, *subject_location, *subject_organization;
char *sig_status, *exp_date;
char *md5_fingerprint, *sha1_fingerprint, *fingerprint;
+#if USE_OPENSSL
unsigned int n;
+#else
+ size_t n;
+#endif
char buf[100];
unsigned char md[128];
#if USE_OPENSSL
