| Index: crypto/nss_util.cc
|
| diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
|
| index 9933d30631671ebda919bc00cedc45ed25cbf13e..dab780e288b12eaa4bdddc12b4905ee5a33cd75a 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();
|
| +}
|
| +
|
| void EnsureNSSInit() {
|
| // Initializing SSL causes us to do blocking IO.
|
| // Temporarily allow it until we fix
|
|
|