openssl: Remove some dead code

Closes #2698
This commit is contained in:
Gaurav Malhotra 2018-06-29 17:47:51 +05:30 committed by Daniel Stenberg
parent 6015cefb1b
commit 09a72f5dd5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2

View File

@ -2314,11 +2314,6 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
switch(ssl_version) { switch(ssl_version) {
case CURL_SSLVERSION_SSLv3: case CURL_SSLVERSION_SSLv3:
#ifdef USE_TLS_SRP
if(ssl_authtype == CURL_TLSAUTH_SRP) {
infof(data, "Set version TLSv1.x for SRP authorisation\n");
}
#endif
ctx_options |= SSL_OP_NO_SSLv2; ctx_options |= SSL_OP_NO_SSLv2;
ctx_options |= SSL_OP_NO_TLSv1; ctx_options |= SSL_OP_NO_TLSv1;
#if OPENSSL_VERSION_NUMBER >= 0x1000100FL #if OPENSSL_VERSION_NUMBER >= 0x1000100FL
@ -2346,7 +2341,6 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
break; break;
case CURL_SSLVERSION_SSLv2: case CURL_SSLVERSION_SSLv2:
#ifndef OPENSSL_NO_SSL2
ctx_options |= SSL_OP_NO_SSLv3; ctx_options |= SSL_OP_NO_SSLv3;
ctx_options |= SSL_OP_NO_TLSv1; ctx_options |= SSL_OP_NO_TLSv1;
#if OPENSSL_VERSION_NUMBER >= 0x1000100FL #if OPENSSL_VERSION_NUMBER >= 0x1000100FL
@ -2357,10 +2351,6 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
#endif #endif
#endif #endif
break; break;
#else
failf(data, OSSL_PACKAGE " was built without SSLv2 support");
return CURLE_NOT_BUILT_IN;
#endif
default: default:
failf(data, "Unrecognized parameter passed via CURLOPT_SSLVERSION"); failf(data, "Unrecognized parameter passed via CURLOPT_SSLVERSION");