Crypto build cleanup: remove CONFIG_NO_AES_*

[libeap.git] / wpa_supplicant / Makefile

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 58f4b41..210abff 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -43,7 +43,7 @@ install: all
 
 SHA1OBJS = ../src/crypto/sha1.o
 DESOBJS = # none needed when not internal
-AESOBJS = ../src/crypto/aes_wrap.o
+AESOBJS = # none so far (see below)
 SHA256OBJS = # none by default
 MD4OBJS = # none by default
 MD5OBJS = ../src/crypto/md5.o
@@ -910,7 +910,7 @@ CONFIG_INTERNAL_MD5=y
 endif
 
 ifdef CONFIG_INTERNAL_AES
-AESOBJS += ../src/crypto/aes-internal.o
+AESOBJS += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-dec.o
 endif
 ifdef CONFIG_INTERNAL_SHA1
 SHA1OBJS += ../src/crypto/sha1-internal.o
@@ -1066,16 +1066,21 @@ ifdef CONFIG_NO_WPA2
 CFLAGS += -DCONFIG_NO_WPA2
 endif
 
-ifdef CONFIG_NO_WPA_PASSPHRASE
-CFLAGS += -DCONFIG_NO_PBKDF2
+ifndef CONFIG_NO_WPA_PASSPHRASE
+SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
 endif
 
-ifdef CONFIG_NO_AES_EXTRAS
-CFLAGS += -DCONFIG_NO_AES_WRAP
-CFLAGS += -DCONFIG_NO_AES_CTR -DCONFIG_NO_AES_OMAC1
-CFLAGS += -DCONFIG_NO_AES_EAX -DCONFIG_NO_AES_CBC
-CFLAGS += -DCONFIG_NO_AES_ENCRYPT
-CFLAGS += -DCONFIG_NO_AES_ENCRYPT_BLOCK
+AESOBJS += ../src/crypto/aes-unwrap.o
+ifndef CONFIG_NO_AES_EXTRAS
+ifdef CONFIG_INTERNAL_AES
+AESOBJS += ../src/crypto/aes-internal-enc.o
+endif
+AESOBJS += ../src/crypto/aes-cbc.o
+AESOBJS += ../src/crypto/aes-ctr.o
+AESOBJS += ../src/crypto/aes-eax.o
+AESOBJS += ../src/crypto/aes-encblock.o
+AESOBJS += ../src/crypto/aes-omac1.o
+AESOBJS += ../src/crypto/aes-wrap.o
 endif
 
 ifdef NEED_AES