Index: crypto/nss_util.cc |
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc |
index 26626e7f7d5c5811ff386e4a8418953aae809b3c..335d9cfa92decfb2ebcf59aec716c311870227fd 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(); |
+ // If we're sandboxed, we shouldn't be able to open user security modules, |
+ // but it's more correct to tell NSS to not even try. |
+ // Loading user security modules would have security implications. |
+ crypto::ForceNSSNoDBInit(); |
+ // Initialize NSS. |
+ crypto::EnsureNSSInit(); |
wtc
2012/11/21 00:28:21
Remove the crypto:: prefixes because this is insid
|
+} |
+ |
void EnsureNSSInit() { |
// Initializing SSL causes us to do blocking IO. |
// Temporarily allow it until we fix |