jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix CONFIG_NO_WPA_PASSPHRASE=y build

Browse source 
Need to define CONFIG_NO_PBKDF2 even though the crypto cleanup moved
the function to a separate file since there is conditional code in
wpa_supplicant/config.c. In addition, wpa_passphrase should not be
built at all if passphrase functionality is removed.
This commit is contained in:
Jouni Malinen 2011-06-23 19:53:45 +03:00
parent 4aced422d3
commit 62b98282ba
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/Makefile
View file

@ -12,7 +12,13 @@ export BINDIR ?= /usr/local/sbin/
CFLAGS += -I../src CFLAGS += -I../src
CFLAGS += -I../src/utils CFLAGS += -I../src/utils
ALL=wpa_supplicant wpa_passphrase wpa_cli -include .config
ALL=wpa_supplicant wpa_cli
ifndef CONFIG_NO_WPA_PASSPHRASE
ALL += wpa_passphrase
endif
all: verify_config $(ALL) dynamic_eap_methods all: verify_config $(ALL) dynamic_eap_methods
@ -52,8 +58,6 @@ OBJS_p += ../src/utils/wpabuf.o
OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
OBJS_c += ../src/utils/wpa_debug.o OBJS_c += ../src/utils/wpa_debug.o
-include .config
ifndef CONFIG_OS ifndef CONFIG_OS
ifdef CONFIG_NATIVE_WINDOWS ifdef CONFIG_NATIVE_WINDOWS
CONFIG_OS=win32 CONFIG_OS=win32
@ -1012,7 +1016,9 @@ ifdef NEED_FIPS186_2_PRF
SHA1OBJS += ../src/crypto/fips_prf_internal.o SHA1OBJS += ../src/crypto/fips_prf_internal.o
endif endif
endif endif
ifndef CONFIG_NO_WPA_PASSPHRASE ifdef CONFIG_NO_WPA_PASSPHRASE
CFLAGS += -DCONFIG_NO_PBKDF2
else
SHA1OBJS += ../src/crypto/sha1-pbkdf2.o SHA1OBJS += ../src/crypto/sha1-pbkdf2.o
endif endif
ifdef NEED_T_PRF ifdef NEED_T_PRF