github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2026-08-22 19:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation for OpenSSL 1.1.0

Browse Source 
* src/openssl.c (ssl_init): Use SSL_is_init_finished() instead of
  SSL_state(), conditionally skip SSLeay function calls

The python test suite makes SSL_peek() hang, consuming 100% CPU time.
This does not happen on real world TLS connections, though, but needs
investigations.
This commit is contained in:
Tim Rühsen
2016-06-30 13:24:33 +02:00
parent 2318c309d4
commit 309e72c74f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openssl.c
View File

@@ -204,18 +204,20 @@ ssl_init (void)
#endif #endif
SSL_library_init (); SSL_library_init ();
SSL_load_error_strings (); SSL_load_error_strings ();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSLeay_add_all_algorithms (); SSLeay_add_all_algorithms ();
SSLeay_add_ssl_algorithms (); SSLeay_add_ssl_algorithms ();
#endif
switch (opt.secure_protocol) switch (opt.secure_protocol)
{ {
#ifndef OPENSSL_NO_SSL2 #if !defined OPENSSL_NO_SSL2 && OPENSSL_VERSION_NUMBER < 0x10100000L
case secure_protocol_sslv2: case secure_protocol_sslv2:
meth = SSLv2_client_method (); meth = SSLv2_client_method ();
break; break;
#endif #endif
#ifndef OPENSSL_NO_SSL3 #ifndef OPENSSL_NO_SSL3_METHOD
case secure_protocol_sslv3: case secure_protocol_sslv3:
meth = SSLv3_client_method (); meth = SSLv3_client_method ();
break; break;
@@ -583,7 +585,7 @@ ssl_connect_wget (int fd, const char *hostname, int *continue_session)
DEBUGP (("SSL handshake timed out.\n")); DEBUGP (("SSL handshake timed out.\n"));
goto timeout; goto timeout;
} }
if (scwt_ctx.result <= 0 || SSL_state(conn) != SSL_ST_OK) if (scwt_ctx.result <= 0 || !SSL_is_init_finished(conn))
goto error; goto error;
ctx = xnew0 (struct openssl_transport_context); ctx = xnew0 (struct openssl_transport_context);