[GNUnet-SVN] [gnurl] 129/163: openssl: Remove some dead code

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 09a72f5dd5e24ec6e802f596db0967f7bb863703
Author: Gaurav Malhotra <address@hidden>
AuthorDate: Fri Jun 29 17:47:51 2018 +0530

    openssl: Remove some dead code
    
    Closes #2698
---
 lib/vtls/openssl.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index fc2e4ac08..0b1929bd7 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2314,11 +2314,6 @@ static CURLcode ossl_connect_step1(struct connectdata 
*conn, int sockindex)
 
   switch(ssl_version) {
   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_TLSv1;
 #if OPENSSL_VERSION_NUMBER >= 0x1000100FL
@@ -2346,7 +2341,6 @@ static CURLcode ossl_connect_step1(struct connectdata 
*conn, int sockindex)
     break;
 
   case CURL_SSLVERSION_SSLv2:
-#ifndef OPENSSL_NO_SSL2
     ctx_options |= SSL_OP_NO_SSLv3;
     ctx_options |= SSL_OP_NO_TLSv1;
 #if OPENSSL_VERSION_NUMBER >= 0x1000100FL
@@ -2357,10 +2351,6 @@ static CURLcode ossl_connect_step1(struct connectdata 
*conn, int sockindex)
 #endif
 #endif
     break;
-#else
-    failf(data, OSSL_PACKAGE " was built without SSLv2 support");
-    return CURLE_NOT_BUILT_IN;
-#endif
 
   default:
     failf(data, "Unrecognized parameter passed via CURLOPT_SSLVERSION");

-- 
To stop receiving notification emails like this one, please contact
address@hidden