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

net/third_party/mozilla_security_manager/nsKeygenHandler.cpp

 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
@@ skipping 31 matching lines @@
 
 #include <pk11pub.h>
 #include <prerror.h>   // PR_GetError()
 #include <secmod.h>
 #include <secder.h>    // DER_Encode()
 #include <cryptohi.h>  // SEC_DerSignData()
 #include <keyhi.h>     // SECKEY_CreateSubjectPublicKeyInfo()
 
 #include "base/base64.h"
 #include "base/logging.h"
-#include "base/nss_util.h"
+#include "crypto/nss_util.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 // Template for creating the signed public key structure to be sent to the CA.
 DERTemplate SECAlgorithmIDTemplate[] = {
   { DER_SEQUENCE,
     0, NULL, sizeof(SECAlgorithmID) },
   { DER_OBJECT_ID,
     offsetof(SECAlgorithmID, algorithm), },
@@ skipping 66 matching lines @@
     default:
       // TODO(gauravsh): If we ever support other mechanisms,
       // this can be changed.
       LOG(ERROR) << "Only RSA keygen mechanism is supported";
       isSuccess = false;
       goto failure;
   }
 
   VLOG(1) << "Creating key pair...";
   {
-    base::AutoNSSWriteLock lock;
+    crypto::AutoNSSWriteLock lock;
     privateKey = PK11_GenerateKeyPair(slot,
                                       keyGenMechanism,
                                       keyGenParams,
                                       &publicKey,
                                       PR_TRUE,  // isPermanent?
                                       PR_TRUE,  // isSensitive?
                                       NULL);
   }
   VLOG(1) << "done.";
 
   if (!privateKey) {
     VLOG(1) << "Generation of Keypair failed!";
     isSuccess = false;
     goto failure;
   }
 
   // Set friendly names for the keys.
   if (url.has_host()) {
     // TODO(davidben): Use something like "Key generated for
     // example.com", but localize it.
     const std::string& label = url.host();
     {
-      base::AutoNSSWriteLock lock;
+      crypto::AutoNSSWriteLock lock;
       PK11_SetPublicKeyNickname(publicKey, label.c_str());
       PK11_SetPrivateKeyNickname(privateKey, label.c_str());
     }
   }
 
   // The CA expects the signed public key in a specific format
   // Let's create that now.
 
   // Create a subject public key info from the public key.
   spkInfo = SECKEY_CreateSubjectPublicKeyInfo(publicKey);
@@ skipping 55 matching lines @@
     LOG(ERROR) << "SSL Keygen failed! (NSS error code " << PR_GetError() << ")";
   } else {
     VLOG(1) << "SSL Keygen succeeded!";
   }
 
   // Do cleanups
   if (privateKey) {
     // On successful keygen we need to keep the private key, of course,
     // or we won't be able to use the client certificate.
     if (!isSuccess || !stores_key) {
-      base::AutoNSSWriteLock lock;
+      crypto::AutoNSSWriteLock lock;
       PK11_DestroyTokenObject(privateKey->pkcs11Slot, privateKey->pkcs11ID);
     }
     SECKEY_DestroyPrivateKey(privateKey);
   }
 
   if (publicKey) {
     if (!isSuccess || !stores_key) {
-      base::AutoNSSWriteLock lock;
+      crypto::AutoNSSWriteLock lock;
       PK11_DestroyTokenObject(publicKey->pkcs11Slot, publicKey->pkcs11ID);
     }
     SECKEY_DestroyPublicKey(publicKey);
   }
   if (spkInfo) {
     SECKEY_DestroySubjectPublicKeyInfo(spkInfo);
   }
   if (arena) {
     PORT_FreeArena(arena, PR_TRUE);
   }
 
   return (isSuccess ? result_blob : std::string());
 }
 
 }  // namespace mozilla_security_manager