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