Author: markt
Date: Fri Aug 1 13:08:51 2014
New Revision: 1615090
URL: http://svn.apache.org/r1615090
Log:
Fix wrong alias name for TLS1.2
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1615090&r1=1615089&r2=1615090&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Fri Aug 1 13:08:51 2014
@@ -227,7 +227,7 @@ public class OpenSSLCipherConfigurationP
/**
* TLS v1.2 cipher suites. Note: there are no cipher suites specific to
TLS v1.1.
*/
- private static final String TLSv1_2 = "TLSv1_2";
+ private static final String TLSv1_2 = "TLSv1.2";
/**
* TLS v1.0 cipher suites.
*/
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1615090&r1=1615089&r2=1615090&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Fri Aug 1 13:08:51 2014
@@ -273,11 +273,9 @@ public class TestOpenSSLCipherConfigurat
}
- // TODO
@Test
- @Ignore("Currently fails - needs investigation")
public void testTLSv1_2() throws Exception {
- testSpecification("TLSv1_2");
+ testSpecification("TLSv1.2");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
