talons

commit d76d8d71ca65e27e20d1703d28b515f805ea5f0b
parent c96dbc801aace53e8718031eb5806ba5130da2fd
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  3 Sep 2011 11:40:10 +0000

2011-09-03 [colin]	3.7.10cvs16

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
3
+--

4 files changed, 8 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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);