svn commit: r1660248 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java

[markt]

Author: markt
Date: Mon Feb 16 23:21:26 2015
New Revision: 1660248

URL: http://svn.apache.org/r1660248
Log:
EDH ciphers not unsupported but renamed to DHE

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660248&r1=1660247&r2=1660248&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon 
Feb 16 23:21:26 2015
@@ -280,7 +280,7 @@ public enum Cipher {
     /* The Ephemeral DH ciphers */
     // Cipher 11
     TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA(
-            "EXP-EDH-DSS-DES-CBC-SHA",
+            "EXP-DHE-DSS-DES-CBC-SHA",
             KeyExchange.EDH,
             Authentication.DSS,
             Encryption.DES,
@@ -295,7 +295,7 @@ public enum Cipher {
     ),
     // Cipher 12
     TLS_DHE_DSS_WITH_DES_CBC_SHA(
-            "EDH-DSS-DES-CBC-SHA",
+            "DHE-DSS-DES-CBC-SHA",
             KeyExchange.EDH,
             Authentication.DSS,
             Encryption.DES,
@@ -310,7 +310,7 @@ public enum Cipher {
     ),
     // Cipher 13
     TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA(
-            "EDH-DSS-DES-CBC3-SHA",
+            "DHE-DSS-DES-CBC3-SHA",
             KeyExchange.EDH,
             Authentication.DSS,
             Encryption.TRIPLE_DES,
@@ -325,7 +325,7 @@ public enum Cipher {
     ),
     // Cipher 14
     TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA(
-            "EXP-EDH-RSA-DES-CBC-SHA",
+            "EXP-DHE-RSA-DES-CBC-SHA",
             KeyExchange.EDH,
             Authentication.RSA,
             Encryption.DES,
@@ -340,7 +340,7 @@ public enum Cipher {
     ),
     // Cipher 15
     TLS_DHE_RSA_WITH_DES_CBC_SHA(
-            "EDH-RSA-DES-CBC-SHA",
+            "DHE-RSA-DES-CBC-SHA",
             KeyExchange.EDH,
             Authentication.RSA,
             Encryption.DES,
@@ -355,7 +355,7 @@ public enum Cipher {
     ),
     // Cipher 16
     TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
-            "EDH-RSA-DES-CBC3-SHA",
+            "DHE-RSA-DES-CBC3-SHA",
             KeyExchange.EDH,
             Authentication.RSA,
             Encryption.TRIPLE_DES,

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660248&r1=1660247&r2=1660248&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java 
Mon Feb 16 23:21:26 2015
@@ -111,11 +111,6 @@ public class TestCipher {
             if (cipher.getProtocol().equals(Protocol.SSLv2)) {
                 continue;
             }
-            // As of OpenSSl 1.1.0, EDH ciphers are not supported to exclude
-            // them from the expected list
-            if (openSSLAlias.contains("EDH-")) {
-                continue;
-            }
             expectedCipherSuites.add(openSSLAlias + "+" +
                     cipher.getProtocol().getOpenSSLName());
         }



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