Author: markt
Date: Fri Jun 19 11:20:46 2015
New Revision: 1686389
URL: http://svn.apache.org/r1686389
Log:
Remove commented out Ciphers
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1686389&r1=1686388&r2=1686389&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Fri Jun 19 11:20:46 2015
@@ -36,17 +36,7 @@ public class TesterOpenSSL {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
// The following ciphers are not implemented in an OpenSSL
// version
- Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA,
Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
- Cipher.SSL_FORTEZZA_DMS_WITH_NULL_SHA,
- Cipher.SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA,
- Cipher.SSL_FORTEZZA_DMS_WITH_RC4_128_SHA,
- Cipher.TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
- Cipher.TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA,
- Cipher.TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
- Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
- Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA,
- Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5,
// The following are not implemented in 1.1.x onwards. They
// are implemented in 1.0.x and earlier
Cipher.SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5,
@@ -54,7 +44,6 @@ public class TesterOpenSSL {
Cipher.SSL2_DES_64_CBC_WITH_MD5,
Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5,
Cipher.SSL2_IDEA_128_CBC_WITH_MD5,
- Cipher.SSL2_RC2_CBC_128_CBC_WITH_MD5,
Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5,
// The following have been removed from OpenSSL on
2015-05-23
Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
