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

Unified Diff: chrome/browser/ui/crypto_module_password_dialog_nss.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jam review changes Created 7 years 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: chrome/browser/ui/crypto_module_password_dialog_nss.cc
diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
index 4f838016a4e8f13e9f176a6b386ab341325f1091..0f0587a622efa01ac3f963f39992c624d3fa2753 100644
--- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc
+++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
#include <pk11pub.h>
@@ -36,7 +36,7 @@ class SlotUnlocker {
void Start();
private:
- void GotPassword(const char* password);
+ void GotPassword(const std::string& password);
void Done();
size_t current_;
@@ -81,12 +81,12 @@ void SlotUnlocker::Start() {
Done();
}
-void SlotUnlocker::GotPassword(const char* password) {
+void SlotUnlocker::GotPassword(const std::string& password) {
// TODO(mattm): PK11_DoPassword has something about PK11_Global.verifyPass.
// Do we need it?
// http://mxr.mozilla.org/mozilla/source/security/nss/lib/pk11wrap/pk11auth.c#577
- if (!password) {
+ if (password.empty()) {
// User cancelled entering password. Oh well.
++current_;
Start();
@@ -95,7 +95,7 @@ void SlotUnlocker::GotPassword(const char* password) {
// TODO(mattm): handle protectedAuthPath
SECStatus rv = PK11_CheckUserPassword(modules_[current_]->os_module_handle(),
- password);
+ password.c_str());
if (rv == SECWouldBlock) {
// Incorrect password. Try again.
retry_ = PR_TRUE;
« no previous file with comments | « chrome/browser/ui/crypto_module_password_dialog_nss.h ('k') | chrome/browser/ui/crypto_module_password_dialog_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698