[GNUnet-SVN] [gnurl] 126/163: openssl: allow TLS 1.3 by default

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnurl.

commit 08c845cfdb66b8a4e61f92ec512ae41d9700b9ec
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jun 28 23:05:05 2018 +0200

    openssl: allow TLS 1.3 by default
    
    Reported-by: Andreas Olsson
    Fixes #2692
    Closes #2693
---
 docs/cmdline-opts/tlsv1.d | 4 ++--
 lib/vtls/openssl.c        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/cmdline-opts/tlsv1.d b/docs/cmdline-opts/tlsv1.d
index 9c9f6b3f5..4cb405697 100644
--- a/docs/cmdline-opts/tlsv1.d
+++ b/docs/cmdline-opts/tlsv1.d
@@ -8,5 +8,5 @@ Requires: TLS
 See-also: http1.1 http2
 Help: Use TLSv1.0 or greater
 ---
-Tells curl to use TLS version 1.x when negotiating with a remote TLS
-server. That means TLS version 1.0, 1.1 or 1.2.
+Tells curl to use at least TLS version 1.x when negotiating with a remote TLS
+server. That means TLS version 1.0 or higher
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 4731107f2..225b4cbd1 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2130,12 +2130,12 @@ set_ssl_version_min_max(long *ctx_options, struct 
connectdata *conn,
 #endif
       /* FALLTHROUGH */
     case CURL_SSLVERSION_MAX_TLSv1_2:
-    case CURL_SSLVERSION_MAX_DEFAULT:
 #ifdef TLS1_3_VERSION
       *ctx_options |= SSL_OP_NO_TLSv1_3;
 #endif
       break;
     case CURL_SSLVERSION_MAX_TLSv1_3:
+    case CURL_SSLVERSION_MAX_DEFAULT:
 #ifdef TLS1_3_VERSION
       break;
 #else

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