Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Debarshi Ray
5cfe7286a2 Do not force SSLv3, also allow TLSv1_X (#1091544) 2014-10-29 12:54:20 +01:00
Bill Nottingham
07b5afa43c Don't use a URL that doesn't work. 2014-10-29 12:53:25 +01:00
2 changed files with 45 additions and 2 deletions

View file

@ -0,0 +1,37 @@
From 527eb322a5bfa97d5716e7f8178e319c515065a2 Mon Sep 17 00:00:00 2001
From: Marc Deslauriers <marc.deslauriers@ubuntu.com>
Date: Mon, 20 Oct 2014 10:08:26 -0400
Subject: [PATCH] Don't force the use of SSLv3.
SSLv3 should no longer be used for security reasons. Let the best
connection method be automatically determined by using SSLv23_client_method()
and SSLv23_server_method().
---
src/common/ssl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/common/ssl.c b/src/common/ssl.c
index a18ad47..35eb237 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -70,7 +70,7 @@ _SSL_context_init (void (*info_cb_func), int server)
SSLeay_add_ssl_algorithms ();
SSL_load_error_strings ();
- ctx = SSL_CTX_new (server ? SSLv3_server_method() : SSLv3_client_method ());
+ ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ());
SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
SSL_CTX_set_timeout (ctx, 300);
@@ -281,7 +281,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
__SSL_critical_error ("SSL_new");
SSL_set_fd (ssl, sd);
- if (ctx->method == SSLv3_client_method())
+ if (ctx->method == SSLv23_client_method())
SSL_set_connect_state (ssl);
else
SSL_set_accept_state(ssl);
--
2.1.0

View file

@ -2,7 +2,7 @@
Name: xchat-gnome
Version: 0.26.2
Release: 12.git%{gitrev}%{?dist}
Release: 13.git%{gitrev}%{?dist}
Summary: GNOME front-end to xchat
Group: Applications/Internet
@ -13,7 +13,7 @@ URL: http://live.gnome.org/Xchat-Gnome
# git clone git://git.gnome.org/xchat-gnome
# git archive --format=tar --prefix=xchat-gnome-0.26.2/ XCHAT_GNOME_0_26_2 > xchat-gnome-0.26.2-%{gitrev}.ta
# bzip2 xchat-gnome-0.26.2-%{gitrev}.tar
Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/0.26/%{name}-%{version}-%{gitrev}.tar.bz2
Source0: %{name}-%{version}-%{gitrev}.tar.bz2
# Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
Patch0: xchat-gnome-0.23.92-config.patch
# Patch for libnotify 0.70 (just drop one parameter from one function)
@ -38,6 +38,8 @@ Patch103: 0004-Call-g_slist_remove-on-items-before-free-not-after.patch
Patch104: 0001-Fix-crash-on-NULL-networks-hash-table.patch
# Fix czech translation that breaks /me messages (<vondruch@redhat.com>)
Patch105: 0001-Fix-ME-messages-in-czech-translation.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1091544
Patch106: 0001-Don-t-force-the-use-of-SSLv3.patch
BuildRequires: openssl-devel
Buildrequires: libsexy-devel >= 0.1.11
@ -87,6 +89,7 @@ common settings will be included in the main user interface. .
%patch103 -p1 -b .free
%patch104 -p1 -b .hash
%patch105 -p1
%patch106 -p1 -b .allow-tls
%build
./autogen.sh
@ -149,6 +152,9 @@ fi
%changelog
* Wed Oct 29 2014 Debarshi Ray <rishi@fedoraproject.org> - 0.26.2-13.git40c5bf988
- Do not force SSLv3, also allow TLSv1_X (#1091544)
* Wed Apr 03 2013 Kalev Lember <kalevlember@gmail.com> - 0.26.2-12.git40c5bf988
- Drop the desktop file name patch now that the vendor prefix is gone
- Remove the scrollkeeper runtime dep