zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Jari Matilainen 2014-10-16 00:00:05 +02:00
commit 58d4821d50
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -1,4 +1,5 @@
v0.8.18-head 2014-XX-YY The Irssi team <staff@irssi.org> v0.8.18-head 2014-XX-YY The Irssi team <staff@irssi.org>
+ Disable SSLv3 due to the POODLE vulnerability.
v0.8.17 2014-10-11 The Irssi team <staff@irssi.org> v0.8.17 2014-10-11 The Irssi team <staff@irssi.org>
+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39. + Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.

2
src/core/network-openssl.c
View file

@ -475,7 +475,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
g_error("Could not allocate memory for SSL context"); g_error("Could not allocate memory for SSL context");
return NULL; return NULL;
} }
SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback); SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass); SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);