NSS Channel ID: don't check ECC support on every socket creation.

crypto/ec_private_key_nss.cc

 // Copyright (c) 2012 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 "crypto/ec_private_key.h"
 
 extern "C" {
 // Work around NSS missing SEC_BEGIN_PROTOS in secmodt.h.  This must come before
 // other NSS headers.
 #include <secmodt.h>
@@ skipping 96 matching lines @@
 // static
 bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo(
     const std::string& password,
     const uint8* encrypted_private_key_info,
     size_t encrypted_private_key_info_len,
     CERTSubjectPublicKeyInfo* decoded_spki,
     bool permanent,
     bool sensitive,
     SECKEYPrivateKey** key,
     SECKEYPublicKey** public_key) {
-  ScopedPK11Slot slot(GetPublicNSSKeySlot());
+  ScopedPK11Slot slot(GetKeySlot());
   if (!slot.get())
     return false;
 
   *public_key = SECKEY_ExtractPublicKey(decoded_spki);
 
   if (!*public_key) {
     DLOG(ERROR) << "SECKEY_ExtractPublicKey: " << PORT_GetError();
     return false;
   }
 
@@ skipping 39 matching lines @@
     DLOG(ERROR) << "ImportEncryptedECPrivateKeyInfoAndReturnKey: "
                 << PORT_GetError();
     SECKEY_DestroyPublicKey(*public_key);
     *public_key = NULL;
     return false;
   }
 
   return true;
 }
 
+// static
+PK11SlotInfo* ECPrivateKey::GetKeySlot() {
+  return GetPublicNSSKeySlot();
+}
+
 bool ECPrivateKey::ExportEncryptedPrivateKey(
     const std::string& password,
     int iterations,
     std::vector<uint8>* output) {
   // We export as an EncryptedPrivateKeyInfo bundle instead of a plain PKCS #8
   // PrivateKeyInfo because PK11_ImportDERPrivateKeyInfoAndReturnKey doesn't
   // support EC keys.
   // https://bugzilla.mozilla.org/show_bug.cgi?id=327773
   SECItem password_item = {
     siBuffer,
@@ skipping 53 matching lines @@
 
 ECPrivateKey::ECPrivateKey() : key_(NULL), public_key_(NULL) {}
 
 // static
 ECPrivateKey* ECPrivateKey::CreateWithParams(bool permanent,
                                              bool sensitive) {
   EnsureNSSInit();
 
   scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
 
-  ScopedPK11Slot slot(GetPrivateNSSKeySlot());
+  ScopedPK11Slot slot(GetKeySlot());
   if (!slot.get())
     return NULL;
 
   SECOidData* oid_data = SECOID_FindOIDByTag(SEC_OID_SECG_EC_SECP256R1);
   if (!oid_data) {
     DLOG(ERROR) << "SECOID_FindOIDByTag: " << PORT_GetError();
     return NULL;
   }
 
   // SECKEYECParams is a SECItem containing the DER encoded ASN.1 ECParameters
@@ skipping 61 matching lines @@
 
   SECKEY_DestroySubjectPublicKeyInfo(decoded_spki);
 
   if (success)
     return result.release();
 
   return NULL;
 }
 
 }  // namespace crypto