[gentoo-commits] gentoo-x86 commit in net-libs/libsoup/files: libsoup-2.30.2-disable-tls1.2.patch

[Jonathan Callen (abcd)]

abcd        10/07/01 22:43:22

  Added:                libsoup-2.30.2-disable-tls1.2.patch
  Log:
  Add fix for new versions of gnutls (bug #307343, GNOME bug #622857)
  (Portage version: 2.2_rc67/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch?rev=1.1&content-type=text/plain

Index: libsoup-2.30.2-disable-tls1.2.patch
===================================================================
Fix for bug #307343 (GNOME bug #622857), disabling TLS1.2
---
From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@×××××.org>
Date: Tue, 29 Jun 2010 13:43:20 +0000
Subject: Disable TLS 1.2 in addition to 1.0 and 1.1

Due to bug 581342 we want to only negotiate SSL 3.0. Previously we
were telling gnutls to not do TLS1.0 or TLS1.1, but that means with
newer versions of gnutls that support TLS1.2 it would try to negotiate
that instead and generally fail. Fix that by disabling TLS1.2 too
(which works fine even with gnutls versions that don't support TLS1.2
yet).

https://bugzilla.gnome.org/show_bug.cgi?id=622857
---
diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
index cb0fbe5..0b57f28 100644
--- a/libsoup/soup-gnutls.c
+++ b/libsoup/soup-gnutls.c
@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking,
 		goto THROW_CREATE_ERROR;
 
 	/* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */
-	if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
+	if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
 		goto THROW_CREATE_ERROR;
 
 	if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE,
--
cgit v0.8.3.1