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

Unified Diff: net/base/cert_database_nss.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 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
« no previous file with comments | « net/base/cert_database_mac.cc ('k') | net/base/cert_database_nss_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/cert_database_nss.cc
===================================================================
--- net/base/cert_database_nss.cc (revision 81350)
+++ net/base/cert_database_nss.cc (working copy)
@@ -12,8 +12,8 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
-#include "base/nss_util_internal.h"
+#include "crypto/nss_util.h"
+#include "crypto/nss_util_internal.h"
#include "net/base/crypto_module.h"
#include "net/base/net_errors.h"
#include "net/base/x509_certificate.h"
@@ -27,7 +27,7 @@
namespace net {
CertDatabase::CertDatabase() {
- base::EnsureNSSInit();
+ crypto::EnsureNSSInit();
psm::EnsurePKCS12Init();
}
@@ -78,7 +78,7 @@
nickname = username + "'s " + ca_name + " ID";
{
- base::AutoNSSWriteLock lock;
+ crypto::AutoNSSWriteLock lock;
slot = PK11_ImportCertForKey(cert,
const_cast<char*>(nickname.c_str()),
NULL);
@@ -111,7 +111,7 @@
CryptoModule* CertDatabase::GetPublicModule() const {
CryptoModule* module =
- CryptoModule::CreateFromHandle(base::GetPublicNSSKeySlot());
+ CryptoModule::CreateFromHandle(crypto::GetPublicNSSKeySlot());
// The module is already referenced when returned from
// GetPublicNSSKeySlot, so we need to deref it once.
PK11_FreeSlot(module->os_module_handle());
@@ -121,7 +121,7 @@
CryptoModule* CertDatabase::GetPrivateModule() const {
CryptoModule* module =
- CryptoModule::CreateFromHandle(base::GetPrivateNSSKeySlot());
+ CryptoModule::CreateFromHandle(crypto::GetPrivateNSSKeySlot());
// The module is already referenced when returned from
// GetPrivateNSSKeySlot, so we need to deref it once.
PK11_FreeSlot(module->os_module_handle());
« no previous file with comments | « net/base/cert_database_mac.cc ('k') | net/base/cert_database_nss_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698