Change the Windows CertDatabase behaviour to match Mac and NSS behaviour, whe...

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 32 matching lines @@
 #include <pk11pub.h>
 #include <secmod.h>
 #include <secder.h>    // DER_Encode()
 #include <cryptohi.h>  // SEC_DerSignData()
 #include <keyhi.h>     // SECKEY_CreateSubjectPublicKeyInfo()
 
 #include "base/base64.h"
 #include "base/nss_util_internal.h"
 #include "base/nss_util.h"
 #include "base/logging.h"
-#include "net/base/keygen_handler.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), },
   { DER_OPTIONAL | DER_ANY,
@@ skipping 15 matching lines @@
 DERTemplate CERTPublicKeyAndChallengeTemplate[] = {
   { DER_SEQUENCE,
     0, NULL, sizeof(CERTPublicKeyAndChallenge) },
   { DER_ANY,
     offsetof(CERTPublicKeyAndChallenge, spki), },
   { DER_IA5_STRING,
     offsetof(CERTPublicKeyAndChallenge, challenge), },
   { 0, }
 };
 
-void StoreKeyLocationInCache(const SECItem& public_key_info,
-                             PK11SlotInfo *slot) {
-  net::KeygenHandler::Cache* cache = net::KeygenHandler::Cache::GetInstance();
-  net::KeygenHandler::KeyLocation key_location;
-  const char* slot_name = PK11_GetSlotName(slot);
-  key_location.slot_name.assign(slot_name);
-  cache->Insert(std::string(reinterpret_cast<char*>(public_key_info.data),
-                public_key_info.len), key_location);
-}
-
 }  // namespace
 
 namespace mozilla_security_manager {
 
 // This function is based on the nsKeygenFormProcessor::GetPublicKey function
 // in mozilla/security/manager/ssl/src/nsKeygenHandler.cpp.
 std::string GenKeyAndSignChallenge(int key_size_in_bits,
                                    const std::string& challenge,
                                    bool stores_key) {
   // Key pair generation mechanism - only RSA is supported at present.
@@ skipping 125 matching lines @@
 
   // Convert the signed public key and challenge into base64/ascii.
   if (!base::Base64Encode(std::string(reinterpret_cast<char*>(signedItem.data),
                                       signedItem.len),
                           &result_blob)) {
     LOG(ERROR) << "Couldn't convert signed public key into base64";
     isSuccess = false;
     goto failure;
   }
 
-  StoreKeyLocationInCache(spkiItem, slot);
-
  failure:
   if (!isSuccess) {
     LOG(ERROR) << "SSL Keygen failed!";
   } else {
     LOG(INFO) << "SSL Keygen succeeded!";
   }
 
   // Do cleanups
   if (privateKey) {
     // On successful keygen we need to keep the private key, of course,
@@ skipping 20 matching lines @@
     PK11_FreeSlot(slot);
   }
   if (pkac.challenge.data) {
     free(pkac.challenge.data);
   }
 
   return (isSuccess ? result_blob : std::string());
 }
 
 }  // namespace mozilla_security_manager