Crypto build cleanup: remove INTERNAL_SHA256

[libeap.git] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index a1fba3e..00e9f60 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -44,7 +44,7 @@ OBJS =        hostapd.o main.o ieee802_1x.o eapol_sm.o \
        preauth.o pmksa_cache.o \
        drv_callbacks.o \
        tkip_countermeasures.o \
-       mlme.o wpa_auth_ie.o
+       mlme.o wpa_auth_ie.o $(AESOBJS)
 
 OBJS += ../src/drivers/drivers.o
 OBJS += ../src/drivers/scan_helpers.o
@@ -90,11 +90,8 @@ OBJS += ../src/crypto/md5.o
 OBJS += ../src/crypto/rc4.o
 OBJS += ../src/crypto/md4.o
 OBJS += ../src/crypto/sha1.o
-OBJS += ../src/crypto/des.o
-OBJS += ../src/crypto/aes_wrap.o
-OBJS += ../src/crypto/aes.o
 
-HOBJS=../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/hlr_auc_gw/milenage.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+AESOBJS = ../src/crypto/aes_wrap.o
 
 CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
 
@@ -431,7 +428,7 @@ OBJS += ../src/tls/tlsv1_cred.o ../src/tls/tlsv1_server.o
 OBJS += ../src/tls/tlsv1_server_write.o ../src/tls/tlsv1_server_read.o
 OBJS += ../src/tls/asn1.o ../src/tls/x509v3.o
 OBJS_p += ../src/tls/asn1.o
-OBJS_p += ../src/crypto/rc4.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+OBJS_p += ../src/crypto/rc4.o $(AESOBJS)
 NEED_BASE64=y
 CFLAGS += -DCONFIG_TLS_INTERNAL
 CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
@@ -532,13 +529,10 @@ CONFIG_INTERNAL_SHA256=y
 endif
 
 ifdef CONFIG_INTERNAL_AES
-CFLAGS += -DINTERNAL_AES
+AESOBJS += ../src/crypto/aes-internal.o
 endif
 ifdef CONFIG_INTERNAL_SHA1
-CFLAGS += -DINTERNAL_SHA1
-endif
-ifdef CONFIG_INTERNAL_SHA256
-CFLAGS += -DINTERNAL_SHA256
+OBJS += ../src/crypto/sha1-internal.o
 endif
 ifdef CONFIG_INTERNAL_MD5
 CFLAGS += -DINTERNAL_MD5
@@ -547,11 +541,14 @@ ifdef CONFIG_INTERNAL_MD4
 CFLAGS += -DINTERNAL_MD4
 endif
 ifdef CONFIG_INTERNAL_DES
-CFLAGS += -DINTERNAL_DES
+OBJS += ../src/crypto/des-internal.o
 endif
 
 ifdef NEED_SHA256
 OBJS += ../src/crypto/sha256.o
+ifdef CONFIG_INTERNAL_SHA256
+OBJS += ../src/crypto/sha256-internal.o
+endif
 endif
 
 ifdef NEED_DH_GROUPS
@@ -615,6 +612,17 @@ ALL=hostapd hostapd_cli
 
 all: verify_config $(ALL)
 
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+       $(Q)$(CC) -c -o $@ $(CFLAGS) $<
+       @$(E) "  CC " $<
+
 verify_config:
        @if [ ! -r .config ]; then \
                echo 'Building hostapd requires a configuration file'; \
@@ -635,11 +643,16 @@ hostapd_cli: $(OBJS_c)
        $(CC) -o hostapd_cli $(OBJS_c)
 
 NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o ../src/crypto/sha1.o ../src/crypto/rc4.o ../src/crypto/md5.o
+ifdef CONFIG_INTERNAL_SHA1
+NOBJS += ../src/crypto/sha1-internal.o
+endif
 NOBJS += ../src/crypto/crypto_openssl.o ../src/utils/os_$(CONFIG_OS).o
 ifdef TLS_FUNCS
 LIBS_n += -lcrypto
 endif
 
+HOBJS=../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/hlr_auc_gw/milenage.o $(AESOBJS)
+
 nt_password_hash: $(NOBJS)
        $(CC) -o nt_password_hash $(NOBJS) $(LIBS_n)
 
@@ -672,10 +685,10 @@ 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.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/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. -DINTERNAL_AES \
+               -DTEST_MAIN_MILENAGE -I. \
                -I../src/crypto -I../src/utils
        ./test-milenage
        rm test-milenage