aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-10-11 19:23:50 (GMT)
committerJouni Malinen <j@w1.fi>2009-10-11 19:23:50 (GMT)
commitbd4e9d033b545dcba6016a0c8413f4b2790c4c36 (patch)
tree5639da10864b05b60b1d9ab0bc9104e142ca73bb /hostapd
parent34c9910dc7cad2ff38dedd4efc3f63e95dcd221c (diff)
downloadhostap-bd4e9d033b545dcba6016a0c8413f4b2790c4c36.zip
hostap-bd4e9d033b545dcba6016a0c8413f4b2790c4c36.tar.gz
hostap-bd4e9d033b545dcba6016a0c8413f4b2790c4c36.tar.bz2
Replace CONFIG_NO_AES_EXTRAS with auto-detection during build
There is no need to do this manually since it is possible to figure out automatically which AES extra files need to be included in the build.
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/Makefile21
1 files changed, 17 insertions, 4 deletions
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 4bab5cb..55b54f5 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -190,6 +190,7 @@ ifdef CONFIG_EAP_SIM
CFLAGS += -DEAP_SERVER_SIM
OBJS += ../src/eap_server/eap_sim.o
CONFIG_EAP_SIM_COMMON=y
+NEED_AES_CBC=y
endif
ifdef CONFIG_EAP_AKA
@@ -197,6 +198,7 @@ CFLAGS += -DEAP_SERVER_AKA
OBJS += ../src/eap_server/eap_aka.o
CONFIG_EAP_SIM_COMMON=y
NEED_SHA256=y
+NEED_AES_CBC=y
endif
ifdef CONFIG_EAP_AKA_PRIME
@@ -220,6 +222,9 @@ endif
ifdef CONFIG_EAP_PSK
CFLAGS += -DEAP_SERVER_PSK
OBJS += ../src/eap_server/eap_psk.o ../src/eap_common/eap_psk_common.o
+NEED_AES_OMAC1=y
+NEED_AES_ENCBLOCK=y
+NEED_AES_EAX=y
endif
ifdef CONFIG_EAP_SAKE
@@ -234,6 +239,7 @@ ifdef CONFIG_EAP_GPSK_SHA256
CFLAGS += -DEAP_SERVER_GPSK_SHA256
endif
NEED_SHA256=y
+NEED_AES_OMAC1=y
endif
ifdef CONFIG_EAP_VENDOR_TEST
@@ -518,13 +524,20 @@ AESOBJS += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-enc.o
endif
AESOBJS += ../src/crypto/aes-wrap.o
-ifndef CONFIG_NO_AES_EXTRAS
-NEED_AES_CBC=y
-AESOBJS += ../src/crypto/aes-cbc.o
-AESOBJS += ../src/crypto/aes-ctr.o
+ifdef NEED_AES_EAX
AESOBJS += ../src/crypto/aes-eax.o
+NEED_AES_CTR=y
+endif
+ifdef NEED_AES_CTR
+AESOBJS += ../src/crypto/aes-ctr.o
+endif
+ifdef NEED_AES_ENCBLOCK
AESOBJS += ../src/crypto/aes-encblock.o
+endif
+ifdef NEED_AES_OMAC1
AESOBJS += ../src/crypto/aes-omac1.o
+endif
+ifdef NEED_AES_UNWRAP
AESOBJS += ../src/crypto/aes-unwrap.o
endif
ifdef NEED_AES_CBC