| Index: base/nss_util.cc
|
| diff --git a/base/nss_util.cc b/base/nss_util.cc
|
| index 8fdede3cb3fb176da1d75da7b3df2dd5045501b9..ce8a24c2a10f96c4ae998aa40afcf934c7318730 100644
|
| --- a/base/nss_util.cc
|
| +++ b/base/nss_util.cc
|
| @@ -72,7 +72,7 @@ FilePath GetInitialConfigDirectory() {
|
|
|
| // This callback for NSS forwards all requests to a caller-specified
|
| // PK11BlockingPasswordDelegate object.
|
| -char* PK11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) {
|
| +char* PKCS11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) {
|
| base::PK11BlockingPasswordDelegate* delegate =
|
| reinterpret_cast<base::PK11BlockingPasswordDelegate*>(arg);
|
| if (delegate) {
|
| @@ -268,7 +268,7 @@ class NSSInitSingleton {
|
| }
|
| }
|
|
|
| - PK11_SetPasswordFunc(PK11PasswordFunc);
|
| + PK11_SetPasswordFunc(PKCS11PasswordFunc);
|
|
|
| // If we haven't initialized the password for the NSS databases,
|
| // initialize an empty-string password so that we don't need to
|
|
|