--- wget-1.19.1-orig/src/openssl.c 2016-07-03 02:54:47.000000000 +1000 +++ wget-1.19.1/src/openssl.c 2017-10-15 16:18:59.854592210 +1100 @@ -174,11 +174,16 @@ { SSL_METHOD const *meth; long ssl_options = 0; +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + int ssl_proto_version = 0; +#endif #if OPENSSL_VERSION_NUMBER >= 0x00907000 if (ssl_true_initialized == 0) { +#if OPENSSL_API_COMPAT < 0x10100000L OPENSSL_config (NULL); +#endif ssl_true_initialized = 1; } #endif @@ -202,8 +207,12 @@ CONF_modules_load_file(NULL, NULL, CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); #endif +#if OPENSSL_API_COMPAT >= 0x10100000L + OPENSSL_init_ssl(0, NULL); +#else SSL_library_init (); SSL_load_error_strings (); +#endif #if OPENSSL_VERSION_NUMBER < 0x10100000L SSLeay_add_all_algorithms (); SSLeay_add_ssl_algorithms (); @@ -229,16 +238,31 @@ ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; break; case secure_protocol_tlsv1: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_VERSION; +#else meth = TLSv1_client_method (); +#endif break; #if OPENSSL_VERSION_NUMBER >= 0x10001000 case secure_protocol_tlsv1_1: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_1_VERSION; +#else meth = TLSv1_1_client_method (); +#endif break; case secure_protocol_tlsv1_2: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_2_VERSION; +#else meth = TLSv1_2_client_method (); +#endif break; #else case secure_protocol_tlsv1_1: @@ -262,9 +286,14 @@ if (!ssl_ctx) goto error; +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) if (ssl_options) SSL_CTX_set_options (ssl_ctx, ssl_options); +#endif + if (ssl_proto_version) + SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version); + /* 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) */