summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/cmscore/security
diff options
context:
space:
mode:
authorcfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-26 00:02:29 +0000
committercfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-26 00:02:29 +0000
commit4f6928cc0493ede41e90b6fa4e1cde570bd17336 (patch)
treef73d03580d02af6455a388366474cdc98c4e0819 /pki/base/common/src/com/netscape/cmscore/security
parente90d291d9a737369587711eb6a879d700a3c5d7b (diff)
downloadpki-4f6928cc0493ede41e90b6fa4e1cde570bd17336.tar.gz
pki-4f6928cc0493ede41e90b6fa4e1cde570bd17336.tar.xz
pki-4f6928cc0493ede41e90b6fa4e1cde570bd17336.zip
Bugzilla 730146 - SSL handshake picks non-FIPS ciphers in FIPS mode
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2180 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/security')
-rw-r--r--pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java18
1 files changed, 13 insertions, 5 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 13b08024a..f9d8114cd 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -103,11 +103,18 @@ public final class JssSubsystem implements ICryptoSubsystem {
/* default sslv2 and sslv3 cipher suites(all), set if no prefs in config.*/
private static final String DEFAULT_CIPHERPREF =
- "rc4export,rc2export,rc4,rc2,des,desede3," +
- "rsa_rc4_40_md5,rsa_rc2_40_md5,rsa_des_sha," +
- "rsa_rc4_128_md5,rsa_3des_sha,rsa_fips_des_sha," +
- "rsa_fips_3des_sha,fortezza,fortezza_rc4_128_sha," +
- "fortezza_null,rsa_null_md5";
+ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," +
+ "TLS_RSA_WITH_AES_128_CBC_SHA," +
+ "TLS_RSA_WITH_AES_256_CBC_SHA," +
+ "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA," +
+ "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA," +
+// "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA," +
+// "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA," +
+// "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA," +
+ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA," +
+ "TLS_DHE_DSS_WITH_AES_256_CBC_SHA," +
+ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA," +
+ "TLS_DHE_RSA_WITH_AES_256_CBC_SHA";
/* list of all ciphers JSS supports */
private static final int mJSSCipherSuites[] = {
@@ -403,6 +410,7 @@ public final class JssSubsystem implements ICryptoSubsystem {
}
}
}
+
}
/**