dblevins 2005/09/29 04:02:23
Modified: modules/core/src/java/org/openejb/corba/sunorb Tag:
v2_0_G1M5 SSLCipherSuiteDatabase.java
Log:
Merging head back into v2_0_G1M5 branch
Revision Changes Path
No revision
No revision
1.2.6.1 +2 -6
openejb/modules/core/src/java/org/openejb/corba/sunorb/SSLCipherSuiteDatabase.java
Index: SSLCipherSuiteDatabase.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/sunorb/SSLCipherSuiteDatabase.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- SSLCipherSuiteDatabase.java 28 Mar 2005 21:00:20 -0000 1.2
+++ SSLCipherSuiteDatabase.java 29 Sep 2005 08:02:23 -0000 1.2.6.1
@@ -107,7 +107,6 @@
SUITES.put("SSL_RSA_WITH_RC4_128_SHA", authEnc);
SUITES.put("SSL_RSA_WITH_DES_CBC_SHA", authEnc);
SUITES.put("SSL_RSA_WITH_3DES_EDE_CBC_SHA", authEnc);
- SUITES.put("SSL_RSA_WITH_IDEA_CBC_SHA", authEnc);
SUITES.put("SSL_RSA_EXPORT_WITH_RC4_40_MD5", authEnc);
SUITES.put("TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", authEnc);
@@ -132,8 +131,6 @@
SUITES.put("TLS_KRB5_WITH_3DES_EDE_CBC_SHA", authEnc);
SUITES.put("TLS_KRB5_WITH_DES_CBC_MD5", authEnc);
SUITES.put("TLS_KRB5_WITH_DES_CBC_SHA", authEnc);
- SUITES.put("TLS_KRB5_WITH_IDEA_CBC_MD5", authEnc);
- SUITES.put("TLS_KRB5_WITH_IDEA_CBC_SHA", authEnc);
SUITES.put("TLS_KRB5_WITH_RC4_128_MD5", authEnc);
SUITES.put("TLS_KRB5_WITH_RC4_128_SHA", authEnc);
SUITES.put("TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", authEnc);
@@ -141,7 +138,6 @@
SUITES.put("TLS_RSA_EXPORT_WITH_RC4_40_MD5", authEnc);
SUITES.put("TLS_RSA_WITH_3DES_EDE_CBC_SHA", authEnc);
SUITES.put("TLS_RSA_WITH_DES_CBC_SHA", authEnc);
- SUITES.put("TLS_RSA_WITH_IDEA_CBC_SHA", authEnc);
SUITES.put("TLS_RSA_WITH_RC4_128_MD5", authEnc);
SUITES.put("TLS_RSA_WITH_RC4_128_SHA", authEnc);