]> granicus.if.org Git - curl/commitdiff
nss: prefer highest available TLS version
authorFabian Frank <fabian@pagefault.de>
Thu, 6 Feb 2014 08:41:53 +0000 (00:41 -0800)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 6 Feb 2014 22:09:56 +0000 (23:09 +0100)
Offer TLSv1.0 to 1.2 by default, still fall back to SSLv3
if --tlsv1[.N] was not specified on the command line.

lib/vtls/nss.c

index 0d5f740d89b50ccbefbea519e059636b1f6a5823..1c5ff4f3ebee9c8bea5dc742493b52515d87e0df 100644 (file)
@@ -1193,8 +1193,9 @@ static CURLcode nss_init_sslver(SSLVersionRange *sslver,
     if(data->state.ssl_connect_retry) {
       infof(data, "TLS disabled due to previous handshake failure\n");
       sslver->max = SSL_LIBRARY_VERSION_3_0;
+      return CURLE_OK;
     }
-    return CURLE_OK;
+  /* intentional fall-through to default to highest TLS version if possible */
 
   case CURL_SSLVERSION_TLSv1:
     sslver->min = SSL_LIBRARY_VERSION_TLS_1_0;