diff options
| author | Brad Davis <brd@FreeBSD.org> | 2016-07-25 17:41:15 +0000 |
|---|---|---|
| committer | Brad Davis <brd@FreeBSD.org> | 2016-07-25 17:41:15 +0000 |
| commit | a57400f182dd292e4049757ea7b1875bf0663fc6 (patch) | |
| tree | 448c138aaa33450e2d481be21a8797d9d86a99ab /irc/xchat | |
| parent | Update to 0.1.3. (diff) | |
Fix connecting to servers with SSLv3 disabled to address POODLE.
PR: 142198
Submitted by: lordsith49@hotmail.com, brnrd
Notes
Notes:
svn path=/head/; revision=419050
Diffstat (limited to 'irc/xchat')
| -rw-r--r-- | irc/xchat/Makefile | 2 | ||||
| -rw-r--r-- | irc/xchat/files/patch-src_common_ssl.c | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index e622b41dd824..35bf98d6272e 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -4,7 +4,7 @@ PORTNAME= xchat PORTVERSION= 2.8.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc gnome ipv6 MASTER_SITES= SF/${PORTNAME}/ \ http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ diff --git a/irc/xchat/files/patch-src_common_ssl.c b/irc/xchat/files/patch-src_common_ssl.c new file mode 100644 index 000000000000..d1399f7bce40 --- /dev/null +++ b/irc/xchat/files/patch-src_common_ssl.c @@ -0,0 +1,21 @@ +--- src/common/ssl.c.orig 2009-08-16 11:40:16.000000000 +0200 ++++ src/common/ssl.c 2015-09-26 16:13:10.740904871 +0200 +@@ -70,7 +70,8 @@ _SSL_context_init (void (*info_cb_func), + + 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_options(ctx, SSL_OP_NO_SSLv2); + + SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH); + SSL_CTX_set_timeout (ctx, 300); +@@ -281,7 +282,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); |