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

[markt]

Author: markt
Date: Fri Aug  1 10:32:50 2014
New Revision: 1615067

URL: http://svn.apache.org/r1615067
Log:
The ECDH alias is for "cipher suites using ECDH key exchange, including 
anonymous, ephemeral and fixed ECDH". Ephemeral was missing.

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=1615067&r1=1615066&r2=1615067&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 10:32:50 2014
@@ -407,7 +407,7 @@ public class OpenSSLCipherConfigurationP
         addListAlias(kECDHr, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.ECDHr)));
         addListAlias(kECDHe, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.ECDHe)));
         addListAlias(kECDH, filterByKeyExchange(allCiphers, new 
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr))));
-        aliases.put(ECDH, aliases.get(kECDH));
+        addListAlias(ECDH, filterByKeyExchange(allCiphers, new 
HashSet<>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr, 
KeyExchange.EECDH))));
         addListAlias(kECDHE, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.ECDHe)));
         aliases.put(ECDHE, aliases.get(kECDHE));
         addListAlias(kEECDH, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.EECDH)));

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=1615067&r1=1615066&r2=1615067&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 10:32:50 2014
@@ -165,9 +165,7 @@ public class TestOpenSSLCipherConfigurat
     }
 
 
-    // TODO
     @Test
-    @Ignore("Currently failing - needs investigation")
     public void testECDH() throws Exception {
         testSpecification("ECDH");
     }
@@ -175,7 +173,7 @@ public class TestOpenSSLCipherConfigurat
 
     // TODO
     @Test
-    @Ignore("Currently failing - needs investigation")
+    //@Ignore("Currently failing - needs investigation")
     public void testkECDHE() throws Exception {
         testSpecification("kECDHE");
     }



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