summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2018-09-03 11:06:35 +0200
committerStefan Eissing <icing@apache.org>2018-09-03 11:06:35 +0200
commitfa321ddeba38b0cd5f8bf55ce4306a8006c9e39c (patch)
tree271b5ec99bfcbc48dd3b59e9d63c02bd2534c059 /modules
parentUse APR apr_time_as_msec() macro for conversion (diff)
downloadapache2-fa321ddeba38b0cd5f8bf55ce4306a8006c9e39c.tar.xz
apache2-fa321ddeba38b0cd5f8bf55ce4306a8006c9e39c.zip
On the trunk:
SSL protocl TLSv1.3 no longer part of 'all' when configured. Needs to be added explicitly. When using 'modern' as SSL policy, TLSv1.3 is enabled. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839920 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/ssl/ssl_private.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 8524c515ba..70f6ebaae0 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -361,13 +361,11 @@ 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