Skip to content

Commit

Permalink
openssl: Make usage of engine support optional
Browse files Browse the repository at this point in the history
This is required for some third-party components on specific devices.

Change-Id: I35c3cfcf603bc720f6e6697b3c745a74b459b4e7
  • Loading branch information
hyperb1iss committed Dec 28, 2010
1 parent 3202b64 commit c0698c8
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
4 changes: 4 additions & 0 deletions android-config.mk
Expand Up @@ -13,5 +13,9 @@ LOCAL_CFLAGS += -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CAST -DO
# Extra
LOCAL_CFLAGS += -DOPENSSL_NO_HW -DOPENSSL_NO_ENGINE -DZLIB

ifneq ($(BOARD_USE_OPENSSL_ENGINE),true)
LOCAL_CFLAGS += -DOPENSSL_NO_ENGINE
endif

# Debug
# LOCAL_CFLAGS += -DCIPHER_DEBUG
25 changes: 25 additions & 0 deletions crypto/Android.mk
Expand Up @@ -470,6 +470,31 @@ local_src_files := \
x509v3/v3_utl.c \
x509v3/v3err.c

ifeq ($(BOARD_USE_OPENSSL_ENGINE),true)
LOCAL_SRC_FILES += \
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
endif

local_c_includes := \
external/openssl \
external/openssl/crypto/asn1 \
Expand Down

0 comments on commit c0698c8

Please sign in to comment.