From 279d859b8fa05671e239bbff49cb44d95e40b33d Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 13 Oct 2009 10:04:46 +0300 Subject: [PATCH] Fix IEEE 802.11r/w compilation error The hostapd/wpa_supplicant compilation failed with CONFIG_IEEE80211R=y or CONFIG_IEEE80211W=y option if CONFIG_EAP_PSK and CONFIG_EAP_GPSK are not used. --- hostapd/Makefile | 8 +++++++- wpa_supplicant/Makefile | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hostapd/Makefile b/hostapd/Makefile index 22d298ed5..1a8705091 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -113,12 +113,14 @@ endif ifdef CONFIG_IEEE80211W CFLAGS += -DCONFIG_IEEE80211W NEED_SHA256=y +NEED_AES_OMAC1=y endif ifdef CONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R OBJS += wpa_ft.o NEED_SHA256=y +NEED_AES_OMAC1=y NEED_AES_UNWRAP=y endif @@ -540,13 +542,17 @@ ifdef NEED_AES_OMAC1 AESOBJS += ../src/crypto/aes-omac1.o endif ifdef NEED_AES_UNWRAP +NEED_AES_DEC=y AESOBJS += ../src/crypto/aes-unwrap.o endif ifdef NEED_AES_CBC +NEED_AES_DEC=y +AESOBJS += ../src/crypto/aes-cbc.o +endif +ifdef NEED_AES_DEC ifdef CONFIG_INTERNAL_AES AESOBJS += ../src/crypto/aes-internal-dec.o endif -AESOBJS += ../src/crypto/aes-cbc.o endif ifdef NEED_AES OBJS += $(AESOBJS) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 4b0ed2d36..68e9d2edc 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -115,6 +115,7 @@ endif ifdef CONFIG_IEEE80211W CFLAGS += -DCONFIG_IEEE80211W NEED_SHA256=y +NEED_AES_OMAC1=y endif ifdef CONFIG_IEEE80211R @@ -122,6 +123,7 @@ CFLAGS += -DCONFIG_IEEE80211R OBJS += ../src/rsn_supp/wpa_ft.o NEED_80211_COMMON=y NEED_SHA256=y +NEED_AES_OMAC1=y endif ifdef CONFIG_PEERKEY @@ -886,16 +888,20 @@ ifdef NEED_AES_ENCBLOCK AESOBJS += ../src/crypto/aes-encblock.o endif ifdef NEED_AES_OMAC1 +NEED_AES_ENC=y AESOBJS += ../src/crypto/aes-omac1.o endif ifdef NEED_AES_WRAP AESOBJS += ../src/crypto/aes-wrap.o endif ifdef NEED_AES_CBC +NEED_AES_ENC=y +AESOBJS += ../src/crypto/aes-cbc.o +endif +ifdef NEED_AES_ENC ifdef CONFIG_INTERNAL_AES AESOBJS += ../src/crypto/aes-internal-enc.o endif -AESOBJS += ../src/crypto/aes-cbc.o endif ifdef NEED_AES OBJS += $(AESOBJS)