svn commit: r1617554 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java

[markt]

Author: markt
Date: Tue Aug 12 18:29:00 2014
New Revision: 1617554

URL: http://svn.apache.org/r1617554
Log:
Correct an Cipher name in OpenSSL
Re-enable disabled Cipher 0x020080 now we can differentiate between it and 
cipher 0x03

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.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=1617554&r1=1617553&r2=1617554&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 Tue 
Aug 12 18:29:00 2014
@@ -2446,7 +2446,7 @@ enum Cipher {
     ),
     // RC2_128_CBC_EXPORT40_WITH_MD5
     SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5(
-            "EXP-RC2-MD5",
+            "EXP-RC2-CBC-MD5",
             null,
             KeyExchange.RSA,
             Authentication.RSA,
@@ -2520,11 +2520,7 @@ enum Cipher {
      256,
      256
      };*/
-
     // Cipher 0x020080
-    /*
-     * Same as Cipher 03 and name isn't recognised by JSSE so ignore this as it
-     * adds no value and complicates the unit tests.
     SSL2_RC4_128_EXPORT40_WITH_MD5(
             "EXP-RC4-MD5",
             null,
@@ -2539,7 +2535,6 @@ enum Cipher {
             40,
             128
     ),
-    */
     // Cipher 0x030080 / 0x040080
     SSL2_RC2_CBC_128_CBC_WITH_MD5(
             "RC2-CBC-MD5",



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