From: Colin Leroy Date: Fri, 12 Jun 2009 07:30:37 +0000 (+0000) Subject: 2009-06-12 [colin] 3.7.1cvs73 X-Git-Tag: rel_3_7_2~14 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=529d65fc3caf229006abac859f817e4cdc697c57;ds=sidebyside 2009-06-12 [colin] 3.7.1cvs73 * src/common/ssl.c Better fix, API-compatible with libgnutls13 --- diff --git a/ChangeLog b/ChangeLog index fdf69bc66..3b8fd3e57 100644 --- 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 4deeb50ec..780111447 100644 --- 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 1d88675e2..8c48d3736 100644 --- 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 51e64c14b..932a5ab96 100644 --- 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);