Author: markt
Date: Tue Jul 29 12:58:35 2014
New Revision: 1614332
URL: http://svn.apache.org/r1614332
Log:
Add missing cipher using parameters defined in ssl2_lib.c form OpenSSL 1.0.1h
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=1614332&r1=1614331&r2=1614332&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 12:58:35 2014
@@ -18,7 +18,20 @@
package org.apache.tomcat.util.net.jsse.openssl;
/**
- * All Ciphers for SSL/TSL.
+ * All the standard cipher suites for SSL/TSL.
+ *
+ * TODO Change the name of the enumeration entry to the registry name for the
+ * cipher (not the Java standard name which may vary between Java
+ * implementations).
+ *
+ * @see <a
href="http://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4";
+ * >The cipher suite registry</a>
+ * @see <a href="https://www.thesprawl.org/research/tls-and-ssl-cipher-suites/";
+ * >Another list of cipher suites with some non-standard IDs</a>
+ * @see <a
href="http://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#ciphersuites";
+ * >Oracle standard names for cipher suites</a>
+ * @see <a href="https://www.openssl.org/docs/apps/ciphers.html";
+ * >Mapping of OpenSSL cipher suites names to registry names</a>
*/
enum Cipher {
/* The RSA ciphers */
@@ -2161,7 +2174,7 @@ enum Cipher {
false,
168,
168
- );
+ ),
/* TEMP_GOST_TLS*/
/*
@@ -2217,6 +2230,23 @@ enum Cipher {
256,
256
};*/
+
+ // Cipher 0x030080 / 0x040080
+ SSL2_RC2_CBC_128_CBC_WITH_MD5(
+ "RC2-CBC-MD5",
+ KeyExchange.RSA,
+ Authentication.RSA,
+ Encryption.RC2,
+ MessageDigest.MD5,
+ Protocol.SSLv2,
+ false,
+ EncryptionLevel.MEDIUM,
+ true,
+ 128,
+ 128
+ );
+
+
private final String openSSLAlias;
private final KeyExchange kx;
private final Authentication au;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
