Support building BoringSSL with NSS certificates.

crypto/ec_private_key.h

Index: crypto/ec_private_key.h
diff --git a/crypto/ec_private_key.h b/crypto/ec_private_key.h
index 9fd8ffdfb62230ac2dac10afb56818baba96bd8e..cd46d44dbe99c3adf2c1dda5cd6640a8171c4d19 100644
--- a/crypto/ec_private_key.h
+++ b/crypto/ec_private_key.h
@@ -42,13 +42,6 @@ class CRYPTO_EXPORT ECPrivateKey {
   // TODO(mattm): Add a curve parameter.
   static ECPrivateKey* Create();
 
-#if defined(USE_NSS)
-  // Creates a new random instance in |slot|. Can return NULL if initialization
-  // fails.  The created key is permanent and is not exportable in plaintext
-  // form.
-  static ECPrivateKey* CreateSensitive(PK11SlotInfo* slot);
-#endif
-
   // Creates a new instance by importing an existing key pair.
   // The key pair is given as an ASN.1-encoded PKCS #8 EncryptedPrivateKeyInfo
   // block and an X.509 SubjectPublicKeyInfo block.
@@ -58,19 +51,6 @@ class CRYPTO_EXPORT ECPrivateKey {
       const std::vector<uint8>& encrypted_private_key_info,
       const std::vector<uint8>& subject_public_key_info);
 
-#if defined(USE_NSS)
-  // Creates a new instance in |slot| by importing an existing key pair.
-  // The key pair is given as an ASN.1-encoded PKCS #8 EncryptedPrivateKeyInfo
-  // block and an X.509 SubjectPublicKeyInfo block.
-  // This can return NULL if initialization fails.  The created key is permanent
-  // and is not exportable in plaintext form.
-  static ECPrivateKey* CreateSensitiveFromEncryptedPrivateKeyInfo(
-      PK11SlotInfo* slot,
-      const std::string& password,
-      const std::vector<uint8>& encrypted_private_key_info,
-      const std::vector<uint8>& subject_public_key_info);
-#endif
-
 #if !defined(USE_OPENSSL)
   // Imports the key pair into |slot| and returns in |public_key| and |key|.
   // Shortcut for code that needs to keep a reference directly to NSS types
@@ -130,8 +110,7 @@ class CRYPTO_EXPORT ECPrivateKey {
                                         bool permanent,
                                         bool sensitive);
 
-  // Shared helper for CreateFromEncryptedPrivateKeyInfo() and
-  // CreateSensitiveFromEncryptedPrivateKeyInfo().
+  // Helper for CreateFromEncryptedPrivateKeyInfo().
   static ECPrivateKey* CreateFromEncryptedPrivateKeyInfoWithParams(
       PK11SlotInfo* slot,
       const std::string& password,