github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-08 19:30:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

openssl backend: repair use of TLSv1+ protocols

Browse Source 
The use of TLSv1_client_method() means that the protocol used will be
limited to TLSv1.0.  This is not desirable for --secure-protocol values
of "auto" (default) and "pfs".  Fix by using SSLv23_client_method() and
disabling SSLv[23].

Issue reported by Mikolaj Kucharski.
This commit is contained in:
Jérémie Courrèges-Anglas 2014-12-01 13:41:59 +01:00 committed by Darshit Shah
parent d9ab65abd2
commit ce088c2b9e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2014-12-03 Jérémie Courrèges-Anglas <jca@wxcvbn.org> (tiny change)
* openssl.c (ssl_init): Allow pfs to be used with protocols other than
TLSv1.
2014-12-01 Tim Ruehsen <tim.ruehsen@gmx.de> 2014-12-01 Tim Ruehsen <tim.ruehsen@gmx.de>
* connect.c, iri.c, url.c, warc.c: Fix issues reported * connect.c, iri.c, url.c, warc.c: Fix issues reported

8
src/openssl.c
View File

@ -203,6 +203,8 @@ ssl_init (void)
SSLeay_add_all_algorithms (); SSLeay_add_all_algorithms ();
SSLeay_add_ssl_algorithms (); SSLeay_add_ssl_algorithms ();
long ssl_options = 0;
switch (opt.secure_protocol) switch (opt.secure_protocol)
{ {
#ifndef OPENSSL_NO_SSL2 #ifndef OPENSSL_NO_SSL2
@ -219,6 +221,9 @@ ssl_init (void)
case secure_protocol_auto: case secure_protocol_auto:
case secure_protocol_pfs: case secure_protocol_pfs:
meth = SSLv23_client_method ();
ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
break;
case secure_protocol_tlsv1: case secure_protocol_tlsv1:
meth = TLSv1_client_method (); meth = TLSv1_client_method ();
break; break;
@ -253,6 +258,9 @@ ssl_init (void)
if (!ssl_ctx) if (!ssl_ctx)
goto error; goto error;
if (ssl_options)
SSL_CTX_set_options (ssl_ctx, ssl_options);
/* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html
* Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more) * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more)
*/ */