Revert "Remove unused engines from OpenSSL crypto subdir"
This reverts commit 6b515fe04b3ccea25fb2f1e686b2185880952a59.
Conflicts:
android-config.mk
crypto/Android.mk
diff --git a/android-config.mk b/android-config.mk
index 48007d9..a68c895 100644
--- a/android-config.mk
+++ b/android-config.mk
@@ -7,4 +7,4 @@
#
LOCAL_CFLAGS += -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DOPENSSL_NO_HW
-LOCAL_CFLAGS += -DOPENSSL_NO_BF -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_MD2 -DOPENSSL_NO_ENGINE -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_OCSP
+LOCAL_CFLAGS += -DOPENSSL_NO_BF -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_MD2 -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_OCSP
diff --git a/crypto/Android.mk b/crypto/Android.mk
index 150066b..af1e74e 100644
--- a/crypto/Android.mk
+++ b/crypto/Android.mk
@@ -198,6 +198,27 @@
dso/dso_openssl.c \
dso/dso_win32.c \
dso/dso_vms.c \
+ engine/eng_err.c \
+ engine/eng_lib.c \
+ engine/eng_list.c \
+ engine/eng_init.c \
+ engine/eng_ctrl.c \
+ engine/eng_table.c \
+ engine/eng_padlock.c \
+ engine/eng_pkey.c \
+ engine/eng_fat.c \
+ engine/eng_all.c \
+ engine/tb_cipher.c \
+ engine/tb_dh.c \
+ engine/tb_digest.c \
+ engine/tb_dsa.c \
+ engine/tb_ecdsa.c \
+ engine/tb_rand.c \
+ engine/tb_rsa.c \
+ engine/tb_store.c \
+ engine/eng_openssl.c \
+ engine/eng_dyn.c \
+ engine/eng_cnf.c \
err/err.c \
err/err_all.c \
err/err_prn.c \
@@ -406,7 +427,8 @@
dsa/dsa_vrf.c \
ripemd/rmd_dgst.c \
ripemd/rmd_one.c \
- evp/m_ripemd.c
+ evp/m_ripemd.c \
+ engine/tb_ecdh.c
LOCAL_CFLAGS += -DNO_WINDOWS_BRAINDEATH
