| Index: base/nss_init.cc
|
| ===================================================================
|
| --- base/nss_init.cc (revision 17917)
|
| +++ base/nss_init.cc (working copy)
|
| @@ -12,6 +12,7 @@
|
| // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
|
| // until NSS 3.12.2 comes out and we update to it.
|
| #define Lock FOO_NSS_Lock
|
| +#include <pk11pub.h>
|
| #include <secmod.h>
|
| #include <ssl.h>
|
| #undef Lock
|
| @@ -78,6 +79,16 @@
|
| NOTREACHED() << "Error initializing NSS: " << buffer;
|
| }
|
|
|
| + // If we haven't initialized the password for the NSS databases,
|
| + // initialize an empty-string password so that we don't need to
|
| + // log in.
|
| + PK11SlotInfo* slot = PK11_GetInternalKeySlot();
|
| + if (slot) {
|
| + if (PK11_NeedUserInit(slot))
|
| + PK11_InitPin(slot, NULL, NULL);
|
| + PK11_FreeSlot(slot);
|
| + }
|
| +
|
| root_ = InitDefaultRootCerts();
|
|
|
| NSS_SetDomesticPolicy();
|
|
|