commit 6270aca8571399aca8ea538acd7386ddecdcc112
author Shawn Willden <swillden@google.com> Tue May 26 13:12:24 2015 -0600
committer Shawn Willden <swillden@google.com> Thu May 28 07:28:52 2015 -0600
tree 46a54b1056acfb42a77b385829584ed4c0cf628e
parent 4f83b89b2bdb1dacfa1c208786e29c0cd66f0b15

Delegate ECDSA keys to keymaster0 in SoftKeymasterDevice.

Bug: 20912868
Change-Id: If63899e3244aed45d939d0165e6d94a1caa9d220

ec_key.h

diff --git a/ec_key.h b/ec_key.h
index e3e15f6..f6a53f8 100644
--- a/ec_key.h
+++ b/ec_key.h
@@ -40,13 +40,15 @@
                                      const AuthorizationSet& sw_enforced,
                                      UniquePtr<AsymmetricKey>* key) override;
 
+    keymaster_error_t UpdateImportKeyDescription(const AuthorizationSet& key_description,
+                                                 keymaster_key_format_t key_format,
+                                                 const KeymasterKeyBlob& key_material,
+                                                 AuthorizationSet* updated_description,
+                                                 uint32_t* key_size);
+
   private:
     static EC_GROUP* choose_group(size_t key_size_bits);
     static keymaster_error_t get_group_size(const EC_GROUP& group, size_t* key_size_bits);
-
-    struct EC_GROUP_Delete {
-        void operator()(EC_GROUP* p) { EC_GROUP_free(p); }
-    };
 };
 
 class EcdsaKeyFactory : public EcKeyFactory {
@@ -68,12 +70,14 @@
     bool InternalToEvp(EVP_PKEY* pkey) const override;
     bool EvpToInternal(const EVP_PKEY* pkey) override;
 
-    struct EC_Delete {
-        void operator()(EC_KEY* p) { EC_KEY_free(p); }
-    };
-
     EC_KEY* key() const { return EC_KEY_dup(ec_key_.get()); }
 
+  protected:
+    EcKey(EC_KEY* ec_key, const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforced,
+          keymaster_error_t* error)
+        : AsymmetricKey(hw_enforced, sw_enforced, error), ec_key_(ec_key) {}
+
+  private:
     UniquePtr<EC_KEY, EC_Delete> ec_key_;
 };