Move crypto files out of base, to a top level directory.

net/socket/dns_cert_provenance_checker.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/dns_cert_provenance_checker.h"
 
 #if !defined(USE_OPENSSL)
 
 #include <nspr.h>
 
 #include <hasht.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <sechash.h>
 
 #include <set>
 #include <string>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
-#include "base/crypto/encryptor.h"
-#include "base/crypto/symmetric_key.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/threading/non_thread_safe.h"
+#include "crypto/encryptor.h"
+#include "crypto/symmetric_key.h"
 #include "net/base/completion_callback.h"
 #include "net/base/dns_util.h"
 #include "net/base/dnsrr_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 
 namespace net {
 
 namespace {
 
@@ skipping 258 matching lines @@
   // The key and IV are 128-bits and generated from a SHA256 hash of the x
   // value.
   char key_data[SHA256_LENGTH];
   HASH_HashBuf(HASH_AlgSHA256, reinterpret_cast<uint8*>(key_data),
                x_data->data, x_data->len);
   PK11_FreeSymKey(pms);
 
   DCHECK_GE(sizeof(key_data), kKeySizeInBytes + kIVSizeInBytes);
   std::string raw_key(key_data, kKeySizeInBytes);
 
-  scoped_ptr<base::SymmetricKey> symkey(
-      base::SymmetricKey::Import(base::SymmetricKey::AES, raw_key));
+  scoped_ptr<crypto::SymmetricKey> symkey(
+      crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, raw_key));
   std::string iv(key_data + kKeySizeInBytes, kIVSizeInBytes);
 
-  base::Encryptor encryptor;
-  bool r = encryptor.Init(symkey.get(), base::Encryptor::CBC, iv);
+  crypto::Encryptor encryptor;
+  bool r = encryptor.Init(symkey.get(), crypto::Encryptor::CBC, iv);
   CHECK(r);
 
   std::string plaintext(reinterpret_cast<const char*>(p.data()), p.size());
   std::string ciphertext;
   encryptor.Encrypt(plaintext, &ciphertext);
 
   // We use another Pickle object to serialise the 'outer' wrapping of the
   // plaintext.
   Pickle outer;
   outer.WriteInt(kVersion);
@@ skipping 34 matching lines @@
 
 std::string DnsCertProvenanceChecker::BuildEncryptedReport(
     const std::string& hostname,
     const std::vector<std::string>& der_certs) {
   return "";
 }
 
 }  // namespace net
 
 #endif  // USE_OPENSSL