Author: markt
Date: Sat Nov 14 21:06:35 2015
New Revision: 1714374
URL: http://svn.apache.org/viewvc?rev=1714374&view=rev
Log:
Handle different forms for TLSv1 / TLSv1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java?rev=1714374&r1=1714373&r2=1714374&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java Sat Nov 14
21:06:35 2015
@@ -31,6 +31,7 @@ public class Constants {
public static final String SSL_PROTO_TLS = "TLS";
public static final String SSL_PROTO_TLSv1_2 = "TLSv1.2";
public static final String SSL_PROTO_TLSv1_1 = "TLSv1.1";
+ public static final String SSL_PROTO_TLSv1_0 = "TLSv1.0";
public static final String SSL_PROTO_TLSv1 = "TLSv1";
public static final String SSL_PROTO_SSLv3 = "SSLv3";
public static final String SSL_PROTO_SSLv2 = "SSLv2";
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java?rev=1714374&r1=1714373&r2=1714374&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
Sat Nov 14 21:06:35 2015
@@ -23,7 +23,7 @@ enum Protocol {
SSLv3(Constants.SSL_PROTO_SSLv3),
SSLv2(Constants.SSL_PROTO_SSLv2),
- TLSv1(Constants.SSL_PROTO_TLSv1),
+ TLSv1(Constants.SSL_PROTO_TLSv1_0),
TLSv1_2(Constants.SSL_PROTO_TLSv1_2);
private final String openSSLName;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
