commit 3f56ddf04d97f131ac831f3912980a61c023c961
author Paul Stewart <pstew@google.com> Wed Jun 22 13:29:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 13:29:03 2016 +0000
tree cd012a283d977294fc3217635ea0a7b4a34f9c08
parent 2679ecf37a851182aa1de686ac7dbbaa29e82324
parent 748cf248afe1d09a4c6973615343fd1192084ea3

Fix use-after-free in qca_nl80211_get_features
am: 748cf248af

Change-Id: Ie74c0f17f6621fbfc23500e6a29e828aca915161

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 67ca129..c569e4d 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -43,6 +43,10 @@
 L_CFLAGS += -mabi=aapcs-linux
 endif
 
+# TODO(davidben): Remove this once wpa_supplicant is updated to correctly
+# condition SSL_get_client_random, etc., on BoringSSL.
+L_CFLAGS += -DBORINGSSL_SUPPRESS_ACCESSORS
+
 INCLUDES = $(LOCAL_PATH)
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/utils

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index f65076c..0b85b58 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -49,6 +49,10 @@
 L_CFLAGS += -mabi=aapcs-linux
 endif
 
+# TODO(davidben): Remove this once wpa_supplicant is updated to correctly
+# condition SSL_get_client_random, etc., on BoringSSL.
+L_CFLAGS += -DBORINGSSL_SUPPRESS_ACCESSORS
+
 INCLUDES = $(LOCAL_PATH)
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/common