2011-09-03 [colin] 3.7.10cvs16

	* src/common/ssl.c
		Use NORMAL instead of EXPORT priorities.

diff --git a/ChangeLog b/ChangeLog
index cbc2d3ecc7a6de8585c7809ffd0f95dba095c7e6..ebd14177b6a988f7fdaa03773d9a1990566c0373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-03 [colin]     3.7.10cvs16
+
+       * src/common/ssl.c
+               Use NORMAL instead of EXPORT priorities.
+
 2011-09-02 [colin]     3.7.10cvs15
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 5d3d946f6a7b7a6ccff49d3258e2cb604576b140..1d7f3473a7e96334a0b99462ee94911c6c6202a3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4219,3 +4219,4 @@
 ( cvs diff -u -r 1.100.2.78 -r 1.100.2.79 AUTHORS;  cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/authors.h;  cvs diff -u -r 1.274.2.327 -r 1.274.2.328 src/mainwindow.c;  cvs diff -u -r 1.94.2.217 -r 1.94.2.218 src/messageview.c;  cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/authors.h;  ) > 3.7.10cvs13.patchset
 ( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/plugins/pgpmime/pgpmime.c;  ) > 3.7.10cvs14.patchset
 ( cvs diff -u -r 1.654.2.4295 -r 1.654.2.4296 configure.ac;  cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/common/ssl.c;  ) > 3.7.10cvs15.patchset
+( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/ssl.c;  ) > 3.7.10cvs16.patchset

diff --git a/configure.ac b/configure.ac
index 641978f7d787981eca478f50d746e6f8db23a9e5..cd2558999fcfb099769bdabe95887f826deeaddd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 08e636b9be80ac168200702ed5c23c84a46633c9..0deb16e5dda46626350c28b140893df217b1d5ba 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -265,9 +265,8 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
                return FALSE;
   
        gnutls_transport_set_lowat (session, 0); 
-       gnutls_set_default_priority(session);
 
-       gnutls_priority_set_direct(session, "EXPORT", NULL);
+       gnutls_priority_set_direct(session, "NORMAL", NULL);
        gnutls_record_disable_padding(session);
 
        gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);