Support EC certs in OriginBoundCertService and OriginBoundCertStore.

crypto/ec_private_key.h

 // Copyright (c) 2011 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.
 
 #ifndef CRYPTO_EC_PRIVATE_KEY_H_
 #define CRYPTO_EC_PRIVATE_KEY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 
 #if defined(USE_OPENSSL)
 // Forward declaration for openssl/*.h
 typedef struct evp_pkey_st EVP_PKEY;
 #else
 // Forward declaration.
+typedef struct CERTSubjectPublicKeyInfoStr CERTSubjectPublicKeyInfo;
 typedef struct SECKEYPrivateKeyStr SECKEYPrivateKey;
 typedef struct SECKEYPublicKeyStr SECKEYPublicKey;
 #endif
 
 namespace crypto {
 
 // Encapsulates an elliptic curve (EC) private key. Can be used to generate new
 // keys, export keys to other formats, or to extract a public key.
 // TODO(mattm): make this and RSAPrivateKey implement some PrivateKey interface.
 // (The difference in types of key() and public_key() make this a little
@@ skipping 27 matching lines @@
   // 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.
   //
   // NOTE: Currently only available if USE_NSS is defined.
   static ECPrivateKey* CreateSensitiveFromEncryptedPrivateKeyInfo(
       const std::string& password,
       const std::vector<uint8>& encrypted_private_key_info,
       const std::vector<uint8>& subject_public_key_info);
 
+#if !defined(USE_OPENSSL)
+  // Import the key pair and return in |public_key| and |key|.

[wtc, 2011/12/02 22:06:59]

Nit: Import => Imports
     return => returns
     ref => reference

[mattm, 2011/12/05 22:19:20]

Done.

+  // Shortcut for code that need to keep a ref directly to NSS types without
+  // having to create a ECPrivateKey object and make a copy of them.
+  static bool ImportFromEncryptedPrivateKeyInfo(

[wtc, 2011/12/02 22:06:59]

DESIGN: this function probably should be moved to some
NSS util file.  Since it doesn't use the ECPrivateKey type,
it doesn't really belong in this class.

You can move this function later.

[mattm, 2011/12/05 22:19:20]

Added TODO.

+      const std::string& password,
+      const std::vector<uint8>& encrypted_private_key_info,
+      CERTSubjectPublicKeyInfo* decoded_spki,
+      bool permanent,
+      bool sensitive,
+      SECKEYPrivateKey** key,
+      SECKEYPublicKey** public_key);
+#endif
+
 #if defined(USE_OPENSSL)
   EVP_PKEY* key() { return key_; }
 #else
   SECKEYPrivateKey* key() { return key_; }
   SECKEYPublicKey* public_key() { return public_key_; }
 #endif
 
   // Exports the private key as an ASN.1-encoded PKCS #8 EncryptedPrivateKeyInfo
   // block and the public key as an X.509 SubjectPublicKeyInfo block.
   // The |password| and |iterations| are used as inputs to the key derivation
@@ skipping 37 matching lines @@
   SECKEYPublicKey* public_key_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ECPrivateKey);
 };
 
 
 }  // namespace crypto
 
 #endif  // CRYPTO_EC_PRIVATE_KEY_H_