]> granicus.if.org Git - apache/commitdiff
On the trunk:
authorStefan Eissing <icing@apache.org>
Mon, 3 Sep 2018 12:09:45 +0000 (12:09 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 3 Sep 2018 12:09:45 +0000 (12:09 +0000)
Reverting change 1839920, making TLSv1.3 part of "all" again, if supported by the SSL library.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839946 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_private.h

index 70f6ebaae08bb954812f1cecad51dabf4e21e17c..8524c515ba7eb80bd3ec29590dfb95c49b9cfc06 100644 (file)
@@ -361,11 +361,13 @@ typedef int ssl_opt_t;
 
 #ifdef SSL_OP_NO_TLSv1_3
 #define SSL_HAVE_PROTOCOL_TLSV1_3   (1)
+#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_BASIC| \
+                            SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2|SSL_PROTOCOL_TLSV1_3)
 #else
 #define SSL_HAVE_PROTOCOL_TLSV1_3   (0)
-#endif
 #define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_BASIC| \
                             SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2)
+#endif
 #else
 #define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_BASIC)
 #endif