Backed out changeset 6728977a3687 (bug 1031952) to fix bustage on a CLOSED TREE

This commit is contained in:
Wes Kocher 2014-07-01 17:44:18 -07:00
parent ea96ce4eb0
commit a52766dedc
2 changed files with 14 additions and 0 deletions

View File

@ -41,6 +41,11 @@ pref("security.ssl3.rsa_des_ede3_sha", true);
pref("security.ssl3.rsa_rc4_128_sha", true);
pref("security.ssl3.rsa_rc4_128_md5", true);
pref("security.ssl3.rsa_fips_des_ede3_sha", false);
pref("security.ssl3.dhe_dss_camellia_256_sha", false);
pref("security.ssl3.dhe_dss_camellia_128_sha", false);
pref("security.ssl3.rsa_seed_sha", false);
pref("security.default_personal_cert", "Ask Every Time");
pref("security.remember_cert_checkbox_default_setting", true);
pref("security.ask_for_password", 0);

View File

@ -862,6 +862,15 @@ static const CipherPref sCipherPrefs[] = {
// All the rest are disabled by default
{ "security.ssl3.rsa_fips_des_ede3_sha",
SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA, false },
{ "security.ssl3.dhe_dss_camellia_256_sha",
TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, false },
{ "security.ssl3.dhe_dss_camellia_128_sha",
TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, false },
{ "security.ssl3.rsa_seed_sha",
TLS_RSA_WITH_SEED_CBC_SHA, false },
{ nullptr, 0 } // end marker
};