Index: crypto/nss_util.cc |
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc |
index 9933d30631671ebda919bc00cedc45ed25cbf13e..f8fa52831df4eb7c07bc76da08465da39827aacb 100644 |
--- a/crypto/nss_util.cc |
+++ b/crypto/nss_util.cc |
@@ -650,6 +650,17 @@ void EnsureNSPRInit() { |
g_nspr_singleton.Get(); |
} |
+void WarmUpNSSSafely() { |
+ // We might fork, but we haven't loaded any security modules. |
+ crypto::DisableNSSForkCheck(); |
+ // The Linux SUID sandbox would prevent opening user security modules anyway, |
+ // but it's more correct to tell NSS to not do it. |
jln (very slow on Chromium)
2012/11/15 23:22:18
I would remove the reference to the setuid sandbox
Jorge Lucangeli Obes
2012/11/15 23:52:44
Done.
|
+ // Loading user security modules would have security implications. |
+ crypto::ForceNSSNoDBInit(); |
+ // Initialize NSS. |
+ crypto::EnsureNSSInit(); |
+} |
+ |
void EnsureNSSInit() { |
// Initializing SSL causes us to do blocking IO. |
// Temporarily allow it until we fix |