summaryrefslogtreecommitdiffstats
path: root/net/base/cert_database_nss.cc
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
commit4b559b4ddffc0b7f688019bcb80658f05e063af7 (patch)
tree0be21d8914de707f5125d2cb66733cbcf088606c /net/base/cert_database_nss.cc
parent056dd45d610de34312344445d7b078a31f4a1e20 (diff)
downloadchromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.zip
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.gz
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.bz2
Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our cryptographic primitives (except md5 and sha1). This removes the base dependency from nss, openssl and sqlite. BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6805019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cert_database_nss.cc')
-rw-r--r--net/base/cert_database_nss.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc
index 1cc5bfb..1e753de 100644
--- a/net/base/cert_database_nss.cc
+++ b/net/base/cert_database_nss.cc
@@ -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 psm = mozilla_security_manager;
namespace net {
CertDatabase::CertDatabase() {
- base::EnsureNSSInit();
+ crypto::EnsureNSSInit();
psm::EnsurePKCS12Init();
}
@@ -78,7 +78,7 @@ int CertDatabase::AddUserCert(X509Certificate* cert_obj) {
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 @@ void CertDatabase::ListCerts(CertificateList* certs) {
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::GetPublicModule() const {
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());