From cae67937ca47d406f3234ed4a169ad83921a9bb2 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 20 Jul 2010 22:15:06 -0700 Subject: [PATCH] WPS: Fix CONFIG_WPS_STRICT build option This was not supposed to be depending on CONFIG_WPS_NFC. --- hostapd/Makefile | 10 +++++----- wpa_supplicant/Makefile | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hostapd/Makefile b/hostapd/Makefile index a91aeaa58..6102c10c3 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -331,11 +331,6 @@ OBJS += ../src/wps/wps_nfc_pn531.o LIBS += ${PN531_PATH}/lib/wpsnfc.dll LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll endif - -ifdef CONFIG_WPS_STRICT -CFLAGS += -DCONFIG_WPS_STRICT -OBJS += ../src/wps/wps_validate.o -endif endif ifdef NEED_WPS_OOB @@ -355,6 +350,11 @@ OBJS += ../src/wps/http_client.o OBJS += ../src/wps/http_server.o endif +ifdef CONFIG_WPS_STRICT +CFLAGS += -DCONFIG_WPS_STRICT +OBJS += ../src/wps/wps_validate.o +endif + endif ifdef CONFIG_EAP_IKEV2 diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 4bc00e272..3301e61eb 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -500,11 +500,6 @@ OBJS += ../src/wps/wps_nfc_pn531.o LIBS += ${PN531_PATH}/lib/wpsnfc.dll LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll endif - -ifdef CONFIG_WPS_STRICT -CFLAGS += -DCONFIG_WPS_STRICT -OBJS += ../src/wps/wps_validate.o -endif endif ifdef NEED_WPS_OOB @@ -531,6 +526,11 @@ OBJS += ../src/wps/http_client.o OBJS += ../src/wps/http_server.o endif +ifdef CONFIG_WPS_STRICT +CFLAGS += -DCONFIG_WPS_STRICT +OBJS += ../src/wps/wps_validate.o +endif + endif ifdef CONFIG_EAP_IKEV2