summaryrefslogtreecommitdiffstats
path: root/net/base/keygen_handler_nss.cc
diff options
context:
space:
mode:
authorcmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 17:50:06 +0000
committercmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 17:50:06 +0000
commitdcce6cf6c6b779abaa8279ada0b9c073567c49b3 (patch)
tree6340b27bc5d4d47c8c1cde2c6cce29f27defa25e /net/base/keygen_handler_nss.cc
parentb6128aaba9e7c148d1a71710b1d7de5d101f9967 (diff)
downloadchromium_src-dcce6cf6c6b779abaa8279ada0b9c073567c49b3.zip
chromium_src-dcce6cf6c6b779abaa8279ada0b9c073567c49b3.tar.gz
chromium_src-dcce6cf6c6b779abaa8279ada0b9c073567c49b3.tar.bz2
Enable Chrome OS to load the user's nssdb later.
Review URL: http://codereview.chromium.org/1730001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/keygen_handler_nss.cc')
-rw-r--r--net/base/keygen_handler_nss.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index 6b79e14..9d470d6 100644
--- a/net/base/keygen_handler_nss.cc
+++ b/net/base/keygen_handler_nss.cc
@@ -12,6 +12,7 @@
#include <keyhi.h> // SECKEY_CreateSubjectPublicKeyInfo()
#include "base/base64.h"
+#include "base/nss_util_internal.h"
#include "base/nss_util.h"
#include "base/logging.h"
@@ -97,7 +98,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
// Ensure NSS is initialized.
base::EnsureNSSInit();
- slot = PK11_GetInternalKeySlot();
+ slot = base::GetDefaultNSSKeySlot();
if (!slot) {
LOG(ERROR) << "Couldn't get Internal key slot!";
isSuccess = false;