DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix crypto config for minimal builds

Browse source
This commit is contained in:
Jouni Malinen 2009-10-11 20:19:12 +03:00
parent 000bbd77c9
commit 0dba0175c5
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hostapd/Makefile
View file

@ -266,6 +266,7 @@ NEED_DH_GROUPS=y
NEED_SHA256=y NEED_SHA256=y
NEED_CRYPTO=y NEED_CRYPTO=y
NEED_BASE64=y NEED_BASE64=y
NEED_AES_CBC=y
ifdef CONFIG_WPS_UFD ifdef CONFIG_WPS_UFD
CFLAGS += -DCONFIG_WPS_UFD CFLAGS += -DCONFIG_WPS_UFD
@ -576,9 +577,7 @@ endif
AESOBJS += ../src/crypto/aes-wrap.o AESOBJS += ../src/crypto/aes-wrap.o
ifndef CONFIG_NO_AES_EXTRAS ifndef CONFIG_NO_AES_EXTRAS
ifdef CONFIG_INTERNAL_AES NEED_AES_CBC=y
AESOBJS += ../src/crypto/aes-internal-dec.o
endif
AESOBJS += ../src/crypto/aes-cbc.o AESOBJS += ../src/crypto/aes-cbc.o
AESOBJS += ../src/crypto/aes-ctr.o AESOBJS += ../src/crypto/aes-ctr.o
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
@ -587,6 +586,13 @@ AESOBJS += ../src/crypto/aes-omac1.o
AESOBJS += ../src/crypto/aes-unwrap.o AESOBJS += ../src/crypto/aes-unwrap.o
endif endif
ifdef NEED_AES_CBC
ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-dec.o
endif
AESOBJS += ../src/crypto/aes-cbc.o
endif
OBJS += $(SHA1OBJS) OBJS += $(SHA1OBJS)
ALL=hostapd hostapd_cli ALL=hostapd hostapd_cli

17
wpa_supplicant/Makefile
View file

@ -418,6 +418,7 @@ NEED_SHA256=y
NEED_BASE64=y NEED_BASE64=y
NEED_CRYPTO=y NEED_CRYPTO=y
NEED_80211_COMMON=y NEED_80211_COMMON=y
NEED_AES_CBC=y
ifdef CONFIG_WPS_UFD ifdef CONFIG_WPS_UFD
CFLAGS += -DCONFIG_WPS_UFD CFLAGS += -DCONFIG_WPS_UFD
@ -722,6 +723,10 @@ ifdef CHAP
OBJS += ../src/eap_common/chap.o OBJS += ../src/eap_common/chap.o
endif endif
ifndef CONFIG_NO_WPA
NEED_CRYPTO=y
endif
ifdef NEED_CRYPTO ifdef NEED_CRYPTO
ifndef TLS_FUNCS ifndef TLS_FUNCS
ifeq ($(CONFIG_TLS), openssl) ifeq ($(CONFIG_TLS), openssl)
@ -991,15 +996,19 @@ endif
AESOBJS += ../src/crypto/aes-unwrap.o AESOBJS += ../src/crypto/aes-unwrap.o
ifndef CONFIG_NO_AES_EXTRAS ifndef CONFIG_NO_AES_EXTRAS
ifdef CONFIG_INTERNAL_AES NEED_AES_CBC=y
AESOBJS += ../src/crypto/aes-internal-enc.o
endif
AESOBJS += ../src/crypto/aes-cbc.o
AESOBJS += ../src/crypto/aes-ctr.o AESOBJS += ../src/crypto/aes-ctr.o
AESOBJS += ../src/crypto/aes-eax.o AESOBJS += ../src/crypto/aes-eax.o
AESOBJS += ../src/crypto/aes-encblock.o AESOBJS += ../src/crypto/aes-encblock.o
AESOBJS += ../src/crypto/aes-omac1.o AESOBJS += ../src/crypto/aes-omac1.o
AESOBJS += ../src/crypto/aes-wrap.o AESOBJS += ../src/crypto/aes-wrap.o
else
endif
ifdef NEED_AES_CBC
ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-enc.o
endif
AESOBJS += ../src/crypto/aes-cbc.o
endif endif
ifdef NEED_AES ifdef NEED_AES