summaryrefslogtreecommitdiffstats
path: root/android-config.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-07-25 22:55:33 -0700
committerBrian Carlstrom <bdc@google.com>2012-07-26 15:36:05 -0700
commit452bb4359c223e3011be78c616d3f4b1c28e5fe7 (patch)
treead97187ac0949335b4f50b7cd144e3142d905f70 /android-config.mk
parenteb16853f1084abf2770588727ef99c6a244abc50 (diff)
downloadreplicant_openssl-452bb4359c223e3011be78c616d3f4b1c28e5fe7.zip
replicant_openssl-452bb4359c223e3011be78c616d3f4b1c28e5fe7.tar.gz
replicant_openssl-452bb4359c223e3011be78c616d3f4b1c28e5fe7.tar.bz2
Use OPENSSL_NO_HEARTBEATS for better wpa_supplicant interoperability
Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/70 Bug: http://rt.openssl.org/Ticket/Display.html?id=2825#txn-34312 Bug: http://code.google.com/p/android/issues/detail?id=34212 Bug: 6883259 (cherry-picked from 9b4b062050bf9a39ae49bce7b735a3c046d7452c) Change-Id: I440deb622b51fd38d575f32bf70e9f1ce990aa71
Diffstat (limited to 'android-config.mk')
-rw-r--r--android-config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/android-config.mk b/android-config.mk
index 2198ef6..c751fd7 100644
--- a/android-config.mk
+++ b/android-config.mk
@@ -11,7 +11,7 @@ LOCAL_CFLAGS += -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_EN
LOCAL_CFLAGS += -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL
# Extra
-LOCAL_CFLAGS += -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_NO_GOST -DZLIB -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_RSAX -DOPENSSL_NO_RDRAND -DOPENSSL_NO_SCTP
+LOCAL_CFLAGS += -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_NO_GOST -DZLIB -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_RSAX -DOPENSSL_NO_RDRAND -DOPENSSL_NO_SCTP -DOPENSSL_NO_HEARTBEATS
# Directories
LOCAL_CFLAGS += -DOPENSSLDIR="\"/system/lib/ssl\"" -DENGINESDIR="\"/system/lib/ssl/engines\""