Compare commits

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

2 commits

Author SHA1 Message Date
Debarshi Ray
8112a91403 Do not force SSLv3, also allow TLSv1_X (#1091544) 2014-10-29 11:43:41 +01:00
Debarshi Ray
c1319cf809 Fix the dates 2014-10-29 11:42:06 +01:00
2 changed files with 46 additions and 3 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

@ -4,7 +4,7 @@
Summary: A popular and easy to use graphical IRC (chat) client
Name: xchat
Version: 2.8.8
Release: 25%{?dist}
Release: 26%{?dist}
Epoch: 1
Group: Applications/Internet
License: GPLv2+
@ -52,6 +52,8 @@ Patch55: xchat-2.8.8-hires-icons.patch
Patch56: xchat-2.8.8-xdg-dirs.patch
# http://sourceforge.net/p/xchat/bugs/1397/
Patch57: xchat-2.8.8-desktop-file-name.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1091544
Patch58: 0001-Don-t-force-the-use-of-SSLv3.patch
BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
BuildRequires: GConf2-devel
@ -113,6 +115,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
%patch55 -p1 -b .hires-icons
%patch56 -p1 -b .xdg-dirs
%patch57 -p1 -b .desktop-file-name
%patch58 -p1 -b .allow-tls
sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
@ -213,6 +216,9 @@ fi
%{_libdir}/xchat/plugins/tcl.so
%changelog
* Wed Oct 29 2014 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-26
- Do not force SSLv3, also allow TLSv1_X (#1091544)
* Wed Aug 20 2014 Kevin Fenzi <kevin@scrye.com> - 1:2.8.8-25
- Rebuild for rpm bug 1131892
@ -264,10 +270,10 @@ fi
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:2.8.8-10
- Perl mass rebuild
* Tue Apr 7 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-9
* Thu Apr 07 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-9
- Link against libnotify (#693362)
* Tue Apr 7 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-8
* Thu Apr 07 2011 Christopher Aillon <caillon@redhat.com> - 1:2.8.8-8
- Update the dynamic libnotify check for the newer soname (#693362)
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.8-7