svn commit: r1615621 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java

[markt]

Author: markt
Date: Mon Aug  4 15:44:24 2014
New Revision: 1615621

URL: http://svn.apache.org/r1615621
Log:
Figured out why test was failing

Modified:
    
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java

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=1615621&r1=1615620&r2=1615621&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
 Mon Aug  4 15:44:24 2014
@@ -198,14 +198,14 @@ public class TestOpenSSLCipherConfigurat
 
 
     @Test
-    @Ignore("Contrary to the docs, OpenSSL does not recognise kECDHE")
+    @Ignore("Contrary to the docs, OpenSSL does not recognise ECDHE")
     public void testECDHE() throws Exception {
         testSpecification("ECDHE");
     }
 
 
     @Test
-    @Ignore("Contrary to the docs, OpenSSL does not recognise kECDHE")
+    @Ignore("Contrary to the docs, OpenSSL does not recognise EECDHE")
     public void testEECDHE() throws Exception {
         testSpecification("EECDHE");
     }
@@ -473,10 +473,9 @@ public class TestOpenSSLCipherConfigurat
 
 
     @Test
-    @Ignore("Currently fails - figure out why")
     public void testSpecification02() throws Exception {
-        // Suggestion from dev list
-        
testSpecification("!aNULL:!eNULL:!EXPORT:!DSS:!DES:!SSLv2:ECDHE:ECDH:DHE:AES256-GCM-SHA384:AES128-GCM-SHA256:+RC4:HIGH:MEDIUM");
+        // Suggestion from dev list (s/ECDHE/kEECDH/, s/DHE/EDH/
+        
testSpecification("!aNULL:!eNULL:!EXPORT:!DSS:!DES:!SSLv2:kEECDH:ECDH:EDH:AES256-GCM-SHA384:AES128-GCM-SHA256:+RC4:HIGH:MEDIUM");
 //
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org