Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1753)

Unified Diff: base/nss_util.cc

Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698