Crypto build cleanup: remove CONFIG_NO_AES_ENCRYPT

[thirdparty/hostap.git] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 8bca37d754fa31a20435817ecd15736e5267c126..4c47330c60d0bd41bfa67b3bbe46aa4341c03cfb 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -38,7 +38,7 @@ CFLAGS += -DCONFIG_NATIVE_WINDOWS
 LIBS += -lws2_32
 endif
 
-SHA1OBJS = ../src/crypto/sha1.o
+SHA1OBJS = ../src/crypto/sha1.o ../src/crypto/sha1-pbkdf2.o
 
 OBJS = hostapd.o main.o ieee802_1x.o eapol_sm.o \
        config.o ieee802_11_auth.o \
@@ -539,7 +539,7 @@ CONFIG_INTERNAL_SHA256=y
 endif
 
 ifdef CONFIG_INTERNAL_AES
-AESOBJS += ../src/crypto/aes-internal.o
+AESOBJS += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-enc.o
 endif
 ifdef CONFIG_INTERNAL_SHA1
 SHA1OBJS += ../src/crypto/sha1-internal.o
@@ -613,8 +613,11 @@ ifdef CONFIG_NO_AES_EXTRAS
 CFLAGS += -DCONFIG_NO_AES_UNWRAP
 CFLAGS += -DCONFIG_NO_AES_CTR -DCONFIG_NO_AES_OMAC1
 CFLAGS += -DCONFIG_NO_AES_EAX -DCONFIG_NO_AES_CBC
-CFLAGS += -DCONFIG_NO_AES_DECRYPT
 CFLAGS += -DCONFIG_NO_AES_ENCRYPT_BLOCK
+else
+ifdef CONFIG_INTERNAL_AES
+AESOBJS += ../src/crypto/aes-internal-dec.o
+endif
 endif
 
 OBJS += $(SHA1OBJS)
@@ -696,7 +699,8 @@ clean-docs:
        rm -rf doc/latex doc/html
        rm -f doc/hostapd.{eps,png} hostapd-devel.pdf
 
-TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes_wrap.c ../src/crypto/aes-internal.c ../src/utils/common.c ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).c
+TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes_wrap.c ../src/crypto/aes-internal.c ../src/crypto/aes-internal-dec.c \
+                ../src/utils/common.c ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).c
 test-milenage: $(TEST_SRC_MILENAGE)
        $(CC) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \
                -DTEST_MAIN_MILENAGE -I. \