tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1614341 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Date Tue, 29 Jul 2014 13:25:00 GMT
Author: markt
Date: Tue Jul 29 13:25:00 2014
New Revision: 1614341

URL: http://svn.apache.org/r1614341
Log:
Use standard name. Add comment with cipher ID.

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=1614341&r1=1614340&r2=1614341&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 Jul 29 13:25:00
2014
@@ -2322,20 +2322,6 @@ enum Cipher {
             128,
             128
     ),
-    // DES_64_CBC_WITH_MD5
-    SSL_CK_DES_64_CBC_WITH_MD5("DES-CBC-MD5",
-            null,
-            KeyExchange.RSA,
-            Authentication.RSA,
-            Encryption.DES,
-            MessageDigest.MD5,
-            Protocol.SSLv2,
-            false,
-            EncryptionLevel.LOW,
-            false,
-            56,
-            56
-    ),
     // DES_192_EDE3_CBC_WITH_MD5
     SSL_CK_DES_192_EDE3_CBC_WITH_MD5("DES-CBC3-MD5",
             null,
@@ -2424,7 +2410,22 @@ enum Cipher {
             true,
             128,
             128
-            );
+            ),
+    // Cipher 0x060040
+    SSL2_DES_64_CBC_WITH_MD5(
+            "DES-CBC-MD5",
+            null,
+            KeyExchange.RSA,
+            Authentication.RSA,
+            Encryption.DES,
+            MessageDigest.MD5,
+            Protocol.SSLv2,
+            false,
+            EncryptionLevel.LOW,
+            false,
+            56,
+            56
+    );
 
 
     private final String openSSLAlias;



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


Mime
View raw message