commit fabacaf3e6019804cc8a98a2b8296be1d0125519
author Thai Duong <thaidn@google.com> Wed Mar 25 20:14:57 2015 -0700
committer Shawn Willden <swillden@google.com> Mon Nov 23 07:22:18 2015 -0700
tree 3def16f36418347652a82f487d69822be60fcd69
parent 1181779c5e6c8627b94067d86db6a2f7d5309674

ECIES: add ECIES-KEM. This version supports HKDF and ECDH with NIST curves.

Change-Id: I5af3215e96bb015049574aa18327cd7f7499dbd3

keymaster1_engine.cpp

diff --git a/keymaster1_engine.cpp b/keymaster1_engine.cpp
index 866a255..6b40022 100644
--- a/keymaster1_engine.cpp
+++ b/keymaster1_engine.cpp
@@ -167,7 +167,7 @@
                                      const AuthorizationSet& additional_params,
                                      keymaster_error_t* error) const {
     // Create new EC key (with engine methods) and insert blob
-    unique_ptr<EC_KEY, EC_Delete> ec_key(EC_KEY_new_method(engine_.get()));
+    unique_ptr<EC_KEY, EC_KEY_Delete> ec_key(EC_KEY_new_method(engine_.get()));
     if (!ec_key) {
         *error = TranslateLastOpenSslError();
         return nullptr;
@@ -188,7 +188,7 @@
         return nullptr;
     }
 
-    unique_ptr<EC_KEY, EC_Delete> public_ec_key(EVP_PKEY_get1_EC_KEY(pkey.get()));
+    unique_ptr<EC_KEY, EC_KEY_Delete> public_ec_key(EVP_PKEY_get1_EC_KEY(pkey.get()));
     if (!public_ec_key) {
         *error = TranslateLastOpenSslError();
         return nullptr;
@@ -212,7 +212,7 @@
     }
 
     case EVP_PKEY_EC: {
-        unique_ptr<EC_KEY, EC_Delete> ec_key(EVP_PKEY_get1_EC_KEY(key));
+        unique_ptr<EC_KEY, EC_KEY_Delete> ec_key(EVP_PKEY_get1_EC_KEY(key));
         return GetData(ec_key.get());
     }