diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 03:01:23 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 03:01:23 +0000 |
| commit | 3f1f841392663dfb331150218908e3c159be1286 (patch) | |
| tree | 3ebbe98ad663aa46d2a8b2dd7d443201d500efef /base/nss_util.cc | |
| parent | 5ec9ce8d11e0c32406d31a3060d087305ef6abdc (diff) | |
| download | chromium_src-3f1f841392663dfb331150218908e3c159be1286.zip chromium_src-3f1f841392663dfb331150218908e3c159be1286.tar.gz chromium_src-3f1f841392663dfb331150218908e3c159be1286.tar.bz2 | |
Cleanup for r71281: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate.
BUG=42073
TEST=manual,trybotss
Review URL: http://codereview.chromium.org/6303004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/nss_util.cc')
| -rw-r--r-- | base/nss_util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/nss_util.cc b/base/nss_util.cc index da678f0..384cc0d 100644 --- a/base/nss_util.cc +++ b/base/nss_util.cc @@ -29,7 +29,7 @@ // use NSS for crypto or certificate verification, and we don't use the NSS // certificate and key databases. #if defined(USE_NSS) -#include "base/crypto/pk11_blocking_password_delegate.h" +#include "base/crypto/crypto_module_blocking_password_delegate.h" #include "base/environment.h" #include "base/lock.h" #include "base/scoped_ptr.h" @@ -71,10 +71,10 @@ FilePath GetInitialConfigDirectory() { } // This callback for NSS forwards all requests to a caller-specified -// PK11BlockingPasswordDelegate object. -char* PK11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) { - base::PK11BlockingPasswordDelegate* delegate = - reinterpret_cast<base::PK11BlockingPasswordDelegate*>(arg); +// CryptoModuleBlockingPasswordDelegate object. +char* PKCS11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) { + base::CryptoModuleBlockingPasswordDelegate* delegate = + reinterpret_cast<base::CryptoModuleBlockingPasswordDelegate*>(arg); if (delegate) { bool cancelled = false; std::string password = delegate->RequestPassword(PK11_GetTokenName(slot), @@ -274,7 +274,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 |