]> granicus.if.org Git - curl/commitdiff
openssl: warn for SRP set if SSLv3 is used, not for TLS version
authorDaniel Stenberg <daniel@haxx.se>
Sun, 21 Dec 2014 22:25:49 +0000 (23:25 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 21 Dec 2014 22:25:49 +0000 (23:25 +0100)
... as it requires TLS and it was was left to warn on the default from
when default was SSL...

lib/vtls/openssl.c

index 4bd7d0aafe28954403f566b9a478e93c67908ff4..1ad0c9b70ee945b97f252708062ebf9f378bc1c7 100644 (file)
@@ -1653,6 +1653,11 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
 
   switch(data->set.ssl.version) {
   case CURL_SSLVERSION_SSLv3:
+#ifdef USE_TLS_SRP
+    if(data->set.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
@@ -1662,11 +1667,6 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
     break;
 
   case CURL_SSLVERSION_DEFAULT:
-#ifdef USE_TLS_SRP
-    if(data->set.ssl.authtype == CURL_TLSAUTH_SRP) {
-      infof(data, "Set version TLSv1.x for SRP authorisation\n");
-    }
-#endif
   case CURL_SSLVERSION_TLSv1:
     ctx_options |= SSL_OP_NO_SSLv2;
     ctx_options |= SSL_OP_NO_SSLv3;