From d777a2c69e23ddeb4d19023a07c82fa8da969f24 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Wed, 16 May 2012 05:43:14 +0000 Subject: [PATCH] 2012-05-16 [paul] 3.8.0cvs41 * src/common/ssl_certificate.c fix bug 2646, 'Compile fails with gnutls-3.0.18' Patch by Christian Hesse --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/ssl_certificate.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 346d9a869..20901bc7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-16 [paul] 3.8.0cvs41 + + * src/common/ssl_certificate.c + fix bug 2646, 'Compile fails with gnutls-3.0.18' + Patch by Christian Hesse + 2012-05-11 [colin] 3.8.0cvs40 * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index efb7e98ef..e7031c403 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4357,3 +4357,4 @@ ( cvs diff -u -r 1.155.2.99 -r 1.155.2.100 src/Makefile.am; ) > 3.8.0cvs38.patchset ( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am; ) > 3.8.0cvs39.patchset ( cvs diff -u -r 1.83.2.188 -r 1.83.2.189 src/mimeview.c; cvs diff -u -r 1.36.2.195 -r 1.36.2.196 src/common/utils.c; ) > 3.8.0cvs40.patchset +( cvs diff -u -r 1.4.2.40 -r 1.4.2.41 src/common/ssl_certificate.c; ) > 3.8.0cvs41.patchset diff --git a/configure.ac b/configure.ac index 3bba8a790..1c7b7e98d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=40 +EXTRA_VERSION=41 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c index f37e51f77..4911acb8a 100644 --- a/src/common/ssl_certificate.c +++ b/src/common/ssl_certificate.c @@ -686,7 +686,7 @@ parse_pkcs12 (gnutls_pkcs12_t p12, gnutls_x509_privkey * key, gnutls_x509_crt_t * cert) { - gnutls_pkcs12_bag bag = NULL; + gnutls_pkcs12_bag_t bag = NULL; int index = 0; int ret; -- 2.25.1