summaryrefslogtreecommitdiffstats
path: root/net/base/dnssec_keyset.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/dnssec_keyset.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/dnssec_keyset.cc')
-rw-r--r--net/base/dnssec_keyset.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/dnssec_keyset.cc b/net/base/dnssec_keyset.cc
index 29dfc86..1cb8c73 100644
--- a/net/base/dnssec_keyset.cc
+++ b/net/base/dnssec_keyset.cc
@@ -10,8 +10,8 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
#include "base/time.h"
+#include "crypto/nss_util.h"
#include "net/base/dns_util.h"
namespace {
@@ -193,13 +193,13 @@ bool DNSSECKeySet::VerifySignature(
base::StringPiece public_key,
base::StringPiece signed_data) {
// This code is largely a copy-and-paste from
- // base/crypto/signature_verifier_nss.cc. We can't change
- // base::SignatureVerifier to always use NSS because we want the ability to
- // be FIPS 140-2 compliant. However, we can't use base::SignatureVerifier
+ // crypto/signature_verifier_nss.cc. We can't change
+ // crypto::SignatureVerifier to always use NSS because we want the ability to
+ // be FIPS 140-2 compliant. However, we can't use crypto::SignatureVerifier
// here because some platforms don't support SHA256 signatures. Therefore, we
// use NSS directly.
- base::EnsureNSSInit();
+ crypto::EnsureNSSInit();
CERTSubjectPublicKeyInfo* spki = NULL;
SECItem spki_der;