Revert to old-style API for EC_KEY handling
Nothing using the EVP_PKEY correctly, so we should revert to the EC_KEY
and ECDSA interfaces. Unfortunately, the SSL client certificate library
uses EC_KEY directly, so just having the EVP_PKEY interface doesn't
work.
Remove the EVP_PKEY interface entirely because it just adds complexity
since the EC_KEY path will do the same thing.
(cherry picked from commit 47041552bd545846a1b7787823af4b5ca9e36dea)
Bug: 10655329
Change-Id: Ibf8c36780fe93284b88e91b7860baf1b951b4266
diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index b975629..e7cab53 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -25,13 +25,15 @@
LOCAL_SRC_FILES := \
eng_keystore.cpp \
keyhandle.cpp \
+ ecdsa_meth.cpp \
dsa_meth.cpp \
rsa_meth.cpp
LOCAL_CFLAGS := -fvisibility=hidden -Wall -Werror
LOCAL_C_INCLUDES += \
- external/openssl/include
+ external/openssl/include \
+ external/openssl
LOCAL_SHARED_LIBRARIES += \
libcrypto \