Change Windows' application/x-x509-user-cert handling to allow any certificate that has a private key, regardless of where it was generated, rather than restricting it to keys generated via <keygen> in the current browsing session.

BUG=148
TEST=None
R=wtc

Review URL: http://codereview.chromium.org/2874002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50695 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 13 deletions

diff --git a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
index e829320..8be54a4 100644
--- a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
+++ b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
@@ -50,7 +50,6 @@
 #include "base/nss_util_internal.h"
 #include "base/nss_util.h"
 #include "base/logging.h"
-#include "net/base/keygen_handler.h"
 
 namespace {
 
@@ -86,16 +85,6 @@ DERTemplate CERTPublicKeyAndChallengeTemplate[] = {
   { 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 {
@@ -236,8 +225,6 @@ std::string GenKeyAndSignChallenge(int key_size_in_bits,
     goto failure;
   }
 
-  StoreKeyLocationInCache(spkiItem, slot);
-
  failure:
   if (!isSuccess) {
     LOG(ERROR) << "SSL Keygen failed!";