aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/Android.mk
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2017-02-26 10:02:21 (GMT)
committerJouni Malinen <j@w1.fi>2017-02-26 10:05:40 (GMT)
commitc4bb39707fea93cee72d845007ceca800e653f00 (patch)
treeb38e2b00f4f808622f770030a968802197f1ef5f /hostapd/Android.mk
parent694a3a0d643c3e0b3c78a5e9fac9285c03de1e75 (diff)
downloadhostap-c4bb39707fea93cee72d845007ceca800e653f00.zip
hostap-c4bb39707fea93cee72d845007ceca800e653f00.tar.gz
hostap-c4bb39707fea93cee72d845007ceca800e653f00.tar.bz2
Fix AES-SIV build dependencies
aes-siv.c needs functions from aes-ctr.c and aes-omac1.c, so set NEED_AES_CTR=y and NEED_AES_OMAC1=y if NEED_AES_SIV is defined. This fixes some build configuration combinations where either of those dependencies were not pulled in through other parameters. For example, some CONFIG_FILS=y cases were impacted. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'hostapd/Android.mk')
-rw-r--r--hostapd/Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 17cc391..1436757 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -729,6 +729,12 @@ endif
ifdef NEED_AES_EAX
AESOBJS += src/crypto/aes-eax.c
NEED_AES_CTR=y
+NEED_AES_OMAC1=y
+endif
+ifdef NEED_AES_SIV
+AESOBJS += src/crypto/aes-siv.c
+NEED_AES_CTR=y
+NEED_AES_OMAC1=y
endif
ifdef NEED_AES_CTR
AESOBJS += src/crypto/aes-ctr.c
@@ -751,9 +757,6 @@ ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-cbc.c
endif
endif
-ifdef NEED_AES_SIV
-AESOBJS += src/crypto/aes-siv.c
-endif
ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal-dec.c