jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix AES-SIV build dependencies

Browse source 
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>
This commit is contained in:
Jouni Malinen 2017-02-26 12:02:21 +02:00
parent 694a3a0d64
commit c4bb39707f
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hostapd/Android.mk
View file

@ -729,6 +729,12 @@ endif
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += src/crypto/aes-eax.c AESOBJS += src/crypto/aes-eax.c
NEED_AES_CTR=y 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 endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
AESOBJS += src/crypto/aes-ctr.c AESOBJS += src/crypto/aes-ctr.c
@ -751,9 +757,6 @@ ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-cbc.c AESOBJS += src/crypto/aes-cbc.c
endif endif
endif endif
ifdef NEED_AES_SIV
AESOBJS += src/crypto/aes-siv.c
endif
ifdef NEED_AES_DEC ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal-dec.c AESOBJS += src/crypto/aes-internal-dec.c

9
hostapd/Makefile
View file

@ -767,6 +767,12 @@ endif
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y NEED_AES_CTR=y
NEED_AES_OMAC1=y
endif
ifdef NEED_AES_SIV
AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y
NEED_AES_OMAC1=y
endif endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
AESOBJS += ../src/crypto/aes-ctr.o AESOBJS += ../src/crypto/aes-ctr.o
@ -789,9 +795,6 @@ ifneq ($(CONFIG_TLS), openssl)
AESOBJS += ../src/crypto/aes-cbc.o AESOBJS += ../src/crypto/aes-cbc.o
endif endif
endif endif
ifdef NEED_AES_SIV
AESOBJS += ../src/crypto/aes-siv.o
endif
ifdef NEED_AES_DEC ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-dec.o AESOBJS += ../src/crypto/aes-internal-dec.o

11
wpa_supplicant/Android.mk
View file

@ -228,8 +228,6 @@ ifdef CONFIG_MESH
NEED_80211_COMMON=y NEED_80211_COMMON=y
NEED_SHA256=y NEED_SHA256=y
NEED_AES_SIV=y NEED_AES_SIV=y
NEED_AES_OMAC1=y
NEED_AES_CTR=y
CONFIG_SAE=y CONFIG_SAE=y
CONFIG_AP=y CONFIG_AP=y
L_CFLAGS += -DCONFIG_MESH L_CFLAGS += -DCONFIG_MESH
@ -1157,6 +1155,12 @@ endif
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += src/crypto/aes-eax.c AESOBJS += src/crypto/aes-eax.c
NEED_AES_CTR=y 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 endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
AESOBJS += src/crypto/aes-ctr.c AESOBJS += src/crypto/aes-ctr.c
@ -1189,9 +1193,6 @@ ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal-enc.c AESOBJS += src/crypto/aes-internal-enc.c
endif endif
endif endif
ifdef NEED_AES_SIV
AESOBJS += src/crypto/aes-siv.c
endif
ifdef NEED_AES ifdef NEED_AES
OBJS += $(AESOBJS) OBJS += $(AESOBJS)
endif endif

11
wpa_supplicant/Makefile
View file

@ -261,8 +261,6 @@ ifdef CONFIG_MESH
NEED_80211_COMMON=y NEED_80211_COMMON=y
NEED_SHA256=y NEED_SHA256=y
NEED_AES_SIV=y NEED_AES_SIV=y
NEED_AES_OMAC1=y
NEED_AES_CTR=y
CONFIG_SAE=y CONFIG_SAE=y
CONFIG_AP=y CONFIG_AP=y
CFLAGS += -DCONFIG_MESH CFLAGS += -DCONFIG_MESH
@ -1204,6 +1202,12 @@ endif
ifdef NEED_AES_EAX ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
NEED_AES_CTR=y NEED_AES_CTR=y
NEED_AES_OMAC1=y
endif
ifdef NEED_AES_SIV
AESOBJS += ../src/crypto/aes-siv.o
NEED_AES_CTR=y
NEED_AES_OMAC1=y
endif endif
ifdef NEED_AES_CTR ifdef NEED_AES_CTR
AESOBJS += ../src/crypto/aes-ctr.o AESOBJS += ../src/crypto/aes-ctr.o
@ -1219,9 +1223,6 @@ else
AESOBJS += ../src/crypto/aes-omac1.o AESOBJS += ../src/crypto/aes-omac1.o
endif endif
endif endif
ifdef NEED_AES_SIV
AESOBJS += ../src/crypto/aes-siv.o
endif
ifdef NEED_AES_WRAP ifdef NEED_AES_WRAP
NEED_AES_ENC=y NEED_AES_ENC=y
ifdef NEED_INTERNAL_AES_WRAP ifdef NEED_INTERNAL_AES_WRAP