diff --git a/netwerk/base/public/security-prefs.js b/netwerk/base/public/security-prefs.js index 4bed1a2d97b9..e3ad923b4aa5 100644 --- a/netwerk/base/public/security-prefs.js +++ b/netwerk/base/public/security-prefs.js @@ -4,7 +4,6 @@ pref("security.tls.version.min", 0); pref("security.tls.version.max", 1); -pref("security.enable_tls_session_tickets", true); pref("security.enable_md5_signatures", false); pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", false); diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index 7dd8a5671671..b730eaf909f9 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -1042,7 +1042,6 @@ static void configureMD5(bool enabled) static const bool SUPPRESS_WARNING_PREF_DEFAULT = false; static const bool MD5_ENABLED_DEFAULT = false; -static const bool TLS_SESSION_TICKETS_ENABLED_DEFAULT = true; static const bool REQUIRE_SAFE_NEGOTIATION_DEFAULT = false; static const bool ALLOW_UNRESTRICTED_RENEGO_DEFAULT = false; static const bool FALSE_START_ENABLED_DEFAULT = true; @@ -1202,11 +1201,7 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) MD5_ENABLED_DEFAULT); configureMD5(md5Enabled); - // Configure TLS session tickets - bool tlsSessionTicketsEnabled = - Preferences::GetBool("security.enable_tls_session_tickets", - TLS_SESSION_TICKETS_ENABLED_DEFAULT); - SSL_OptionSetDefault(SSL_ENABLE_SESSION_TICKETS, tlsSessionTicketsEnabled); + SSL_OptionSetDefault(SSL_ENABLE_SESSION_TICKETS, true); bool requireSafeNegotiation = Preferences::GetBool("security.ssl.require_safe_negotiation", @@ -1638,11 +1633,6 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic, MD5_ENABLED_DEFAULT); configureMD5(md5Enabled); clearSessionCache = true; - } else if (prefName.Equals("security.enable_tls_session_tickets")) { - bool tlsSessionTicketsEnabled = - Preferences::GetBool("security.enable_tls_session_tickets", - TLS_SESSION_TICKETS_ENABLED_DEFAULT); - SSL_OptionSetDefault(SSL_ENABLE_SESSION_TICKETS, tlsSessionTicketsEnabled); } else if (prefName.Equals("security.ssl.require_safe_negotiation")) { bool requireSafeNegotiation = Preferences::GetBool("security.ssl.require_safe_negotiation",