2009-06-12 [colin] 3.7.1cvs73

	* src/common/ssl.c
		Better fix, API-compatible with libgnutls13

diff --git a/ChangeLog b/ChangeLog
index fdf69bc66b8a5322e790cc6bb908d21b12912c2b..3b8fd3e57cf4d28adf4bf7074221356a65c8a638 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-12 [colin]     3.7.1cvs73
+
+       * src/common/ssl.c
+               Better fix, API-compatible with libgnutls13
+
 2009-06-12 [colin]     3.7.1cvs72
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index 4deeb50ec5f385b5253dce35906c38807e2dc12c..78011144760a711abddcda2b5652dd9c44b54742 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3812,3 +3812,4 @@
 ( cvs diff -u -r 1.382.2.515 -r 1.382.2.516 src/compose.c;  ) > 3.7.1cvs70.patchset
 ( cvs diff -u -r 1.382.2.516 -r 1.382.2.517 src/compose.c;  ) > 3.7.1cvs71.patchset
 ( cvs diff -u -r 1.9.2.40 -r 1.9.2.41 src/common/ssl.c;  ) > 3.7.1cvs72.patchset
+( cvs diff -u -r 1.9.2.41 -r 1.9.2.42 src/common/ssl.c;  ) > 3.7.1cvs73.patchset

diff --git a/configure.ac b/configure.ac
index 1d88675e22eca2e40157fd826290651881c610dd..8c48d37361317c31466f01052ee54a3496f10491 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=72
+EXTRA_VERSION=73
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 51e64c14b08e7eea06ce0342fea22b9f6f0b169d..932a5ab965dd6e78a15c5b740e967130c74e69b6 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -270,11 +270,12 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
        if (session == NULL || r != 0)
                return FALSE;
   
-       gnutls_priority_set_direct(session, "NORMAL:%COMPAT", NULL);
+       gnutls_set_default_priority(session);
        gnutls_protocol_set_priority (session, proto_prio);
        gnutls_cipher_set_priority (session, cipher_prio);
        gnutls_kx_set_priority (session, kx_prio);
        gnutls_mac_set_priority (session, mac_prio);
+       gnutls_record_disable_padding(session);
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);