From: Stefan Eissing Date: Mon, 3 Sep 2018 09:06:35 +0000 (+0000) Subject: On the trunk: X-Git-Tag: 2.5.0-alpha2-ci-test-only~2360 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa321ddeba38b0cd5f8bf55ce4306a8006c9e39c;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 8524c515ba7..70f6ebaae08 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