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

net/base/keygen_handler_win.cc

 // Copyright (c) 2010 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/base/keygen_handler.h"
 
 #include <windows.h>
 #include <wincrypt.h>
 #pragma comment(lib, "crypt32.lib")
 #include <rpc.h>
 #pragma comment(lib, "rpcrt4.lib")
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 
 namespace net {
 
-bool EncodeAndAppendType(LPCSTR type, const void* to_encode,
-                         std::vector<BYTE>* output) {
-  BOOL ok;
-  DWORD size = 0;
-  ok = CryptEncodeObject(X509_ASN_ENCODING, type, to_encode, NULL, &size);
-  DCHECK(ok);
-  if (!ok)
-    return false;
-
-  std::vector<BYTE>::size_type old_size = output->size();
-  output->resize(old_size + size);
-
-  ok = CryptEncodeObject(X509_ASN_ENCODING, type, to_encode,
-                         &(*output)[old_size], &size);
-  DCHECK(ok);
-  if (!ok)
-    return false;
-
-  // Sometimes the initial call to CryptEncodeObject gave a generous estimate
-  // of the size, so shrink back to what was actually used.
-  output->resize(old_size + size);
-
-  return true;
-}
-
 // Assigns the contents of a CERT_PUBLIC_KEY_INFO structure for the signing
 // key in |prov| to |output|. Returns true if encoding was successful.
 bool GetSubjectPublicKeyInfo(HCRYPTPROV prov, std::vector<BYTE>* output) {
   BOOL ok;
   DWORD size = 0;
 
   // From the private key stored in HCRYPTPROV, obtain the public key, stored
   // as a CERT_PUBLIC_KEY_INFO structure. Currently, only RSA public keys are
   // supported.
   ok = CryptExportPublicKeyInfoEx(prov, AT_KEYEXCHANGE, X509_ASN_ENCODING,
@@ skipping 11 matching lines @@
                                   &size);
   DCHECK(ok);
   if (!ok)
     return false;
 
   output->resize(size);
 
   return true;
 }
 
-// Appends a DER SubjectPublicKeyInfo structure for the signing key in |prov|
-// to |output|.
-// Returns true if encoding was successful.
-bool EncodeSubjectPublicKeyInfo(HCRYPTPROV prov, std::vector<BYTE>* output) {
-  std::vector<BYTE> public_key_info;
-  if (!GetSubjectPublicKeyInfo(prov, &public_key_info))
-    return false;
-
-  return EncodeAndAppendType(X509_PUBLIC_KEY_INFO, &public_key_info[0],
-                             output);
-}
-
 // Generates a DER encoded SignedPublicKeyAndChallenge structure from the
 // signing key of |prov| and the specified ASCII |challenge| string and
 // appends it to |output|.
 // True if the encoding was successfully generated.
 bool GetSignedPublicKeyAndChallenge(HCRYPTPROV prov,
                                     const std::string& challenge,
                                     std::string* output) {
   std::wstring wide_challenge = ASCIIToWide(challenge);
   std::vector<BYTE> spki;
 
@@ skipping 55 matching lines @@
     return result;
 
   // RPC_WSTR is unsigned short*.  wchar_t is a built-in type of Visual C++,
   // so the type cast is necessary.
   result.assign(reinterpret_cast<wchar_t*>(rpc_string));
   RpcStringFree(&rpc_string);
 
   return result;
 }
 
-void StoreKeyLocationInCache(HCRYPTPROV prov) {
-  BOOL ok;
-  DWORD size = 0;
-
-  // Though it is known the container and provider name, as they are supplied
-  // during GenKeyAndSignChallenge, explicitly resolving them via
-  // CryptGetProvParam ensures that any defaults (such as provider name being
-  // NULL) or any CSP modifications to the container name are properly
-  // reflected.
-
-  // Find the container name. Though the MSDN documentation states it will
-  // return the exact same value as supplied when the provider was aquired, it
-  // also notes the return type will be CHAR, /not/ WCHAR.
-  ok = CryptGetProvParam(prov, PP_CONTAINER, NULL, &size, 0);
-  if (!ok)
-    return;
-
-  std::vector<BYTE> buffer(size);
-  ok = CryptGetProvParam(prov, PP_CONTAINER, &buffer[0], &size, 0);
-  if (!ok)
-    return;
-
-  KeygenHandler::KeyLocation key_location;
-  UTF8ToWide(reinterpret_cast<char*>(&buffer[0]), size,
-             &key_location.container_name);
-
-  // Get the provider name. This will always resolve, even if NULL (indicating
-  // the default provider) was supplied to the CryptAcquireContext.
-  size = 0;
-  ok = CryptGetProvParam(prov, PP_NAME, NULL, &size, 0);
-  if (!ok)
-    return;
-
-  buffer.resize(size);
-  ok = CryptGetProvParam(prov, PP_NAME, &buffer[0], &size, 0);
-  if (!ok)
-    return;
-
-  UTF8ToWide(reinterpret_cast<char*>(&buffer[0]), size,
-             &key_location.provider_name);
-
-  std::vector<BYTE> public_key_info;
-  if (!EncodeSubjectPublicKeyInfo(prov, &public_key_info))
-    return;
-
-  KeygenHandler::Cache* cache = KeygenHandler::Cache::GetInstance();
-  cache->Insert(std::string(public_key_info.begin(), public_key_info.end()),
-                key_location);
-}
-
-bool KeygenHandler::KeyLocation::Equals(
-    const KeygenHandler::KeyLocation& location) const {
-  return container_name == location.container_name &&
-         provider_name == location.provider_name;
-}
-
 std::string KeygenHandler::GenKeyAndSignChallenge() {
   std::string result;
 
   bool is_success = true;
   HCRYPTPROV prov = NULL;
   HCRYPTKEY key = NULL;
   DWORD flags = (key_size_in_bits_ << 16) | CRYPT_EXPORTABLE;
   std::string spkac;
 
   std::wstring new_key_id;
@@ skipping 39 matching lines @@
     is_success = false;
     goto failure;
   }
 
   if (!base::Base64Encode(spkac, &result)) {
     LOG(ERROR) << "Couldn't convert signed key into base64";
     is_success = false;
     goto failure;
   }
 
-  StoreKeyLocationInCache(prov);
-
  failure:
   if (!is_success) {
     LOG(ERROR) << "SSL Keygen failed";
   } else {
     LOG(INFO) << "SSL Key succeeded";
   }
   if (key) {
     // Securely destroys the handle, but leaves the underlying key alone. The
     // key can be obtained again by resolving the key location. If
     // |stores_key_| is false, the underlying key will be destroyed below.
     CryptDestroyKey(key);
   }
 
   if (prov) {
     CryptReleaseContext(prov, 0);
     prov = NULL;
     if (!stores_key_) {
       // Fully destroys any of the keys that were created and releases prov.
       CryptAcquireContext(&prov, new_key_id.c_str(), NULL, PROV_RSA_FULL,
                           CRYPT_SILENT | CRYPT_DELETEKEYSET);
     }
   }
 
   return result;
 }
 
 }  // namespace net