Author: markt
Date: Fri Nov 23 12:43:07 2018
New Revision: 1847259
URL: http://svn.apache.org/viewvc?rev=1847259&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62944
Fix copy/paste error that prevented TLS 1.0 and TLS 1.1 from being used if TLS
1.3 was available.
Patch provided by Dean Rasheed.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1847259&r1=1847258&r2=1847259&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Fri Nov 23 12:43:07 2018
@@ -287,8 +287,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
#ifdef HAVE_TLSV1_3
if (prot == TLS1_3_VERSION && protocol & SSL_PROTOCOL_TLSV1_2) {
prot = TLS1_2_VERSION;
- } else
-/* NOTE the dangling else above: take care to preserve it */
+ }
#endif
if (prot == TLS1_2_VERSION && protocol & SSL_PROTOCOL_TLSV1_1) {
prot = TLS1_1_VERSION;
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1847259&r1=1847258&r2=1847259&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Nov 23 12:43:07
2018
@@ -34,6 +34,15 @@
This is the Changelog for Tomcat Native 1.2.
</p>
</section>
+<section name="Changes in 1.2.19">
+ <changelog>
+ <fix>
+ <bug>62944</bug>: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1
+ from being used if TLS 1.3 was available. Patch provided by Dean Rasheed.
+ (markt)
+ </fix>
+ </changelog>
+</section>
<section name="Changes in 1.2.18">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
