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

Fix IEEE 802.11r/w compilation error

Browse source 
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.
This commit is contained in:
Masashi Honma 2009-10-13 10:04:46 +03:00 committed by Jouni Malinen
parent 9b336bcef0
commit 279d859b8f
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hostapd/Makefile
View file

@ -113,12 +113,14 @@ endif
ifdef CONFIG_IEEE80211W ifdef CONFIG_IEEE80211W
CFLAGS += -DCONFIG_IEEE80211W CFLAGS += -DCONFIG_IEEE80211W
NEED_SHA256=y NEED_SHA256=y
NEED_AES_OMAC1=y
endif endif
ifdef CONFIG_IEEE80211R ifdef CONFIG_IEEE80211R
CFLAGS += -DCONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R
OBJS += wpa_ft.o OBJS += wpa_ft.o
NEED_SHA256=y NEED_SHA256=y
NEED_AES_OMAC1=y
NEED_AES_UNWRAP=y NEED_AES_UNWRAP=y
endif endif
@ -540,13 +542,17 @@ ifdef NEED_AES_OMAC1
AESOBJS += ../src/crypto/aes-omac1.o AESOBJS += ../src/crypto/aes-omac1.o
endif endif
ifdef NEED_AES_UNWRAP ifdef NEED_AES_UNWRAP
NEED_AES_DEC=y
AESOBJS += ../src/crypto/aes-unwrap.o AESOBJS += ../src/crypto/aes-unwrap.o
endif endif
ifdef NEED_AES_CBC ifdef NEED_AES_CBC
NEED_AES_DEC=y
AESOBJS += ../src/crypto/aes-cbc.o
endif
ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-dec.o AESOBJS += ../src/crypto/aes-internal-dec.o
endif endif
AESOBJS += ../src/crypto/aes-cbc.o
endif endif
ifdef NEED_AES ifdef NEED_AES
OBJS += $(AESOBJS) OBJS += $(AESOBJS)

8
wpa_supplicant/Makefile
View file

@ -115,6 +115,7 @@ endif
ifdef CONFIG_IEEE80211W ifdef CONFIG_IEEE80211W
CFLAGS += -DCONFIG_IEEE80211W CFLAGS += -DCONFIG_IEEE80211W
NEED_SHA256=y NEED_SHA256=y
NEED_AES_OMAC1=y
endif endif
ifdef CONFIG_IEEE80211R ifdef CONFIG_IEEE80211R
@ -122,6 +123,7 @@ CFLAGS += -DCONFIG_IEEE80211R
OBJS += ../src/rsn_supp/wpa_ft.o OBJS += ../src/rsn_supp/wpa_ft.o
NEED_80211_COMMON=y NEED_80211_COMMON=y
NEED_SHA256=y NEED_SHA256=y
NEED_AES_OMAC1=y
endif endif
ifdef CONFIG_PEERKEY ifdef CONFIG_PEERKEY
@ -886,16 +888,20 @@ ifdef NEED_AES_ENCBLOCK
AESOBJS += ../src/crypto/aes-encblock.o AESOBJS += ../src/crypto/aes-encblock.o
endif endif
ifdef NEED_AES_OMAC1 ifdef NEED_AES_OMAC1
NEED_AES_ENC=y
AESOBJS += ../src/crypto/aes-omac1.o AESOBJS += ../src/crypto/aes-omac1.o
endif endif
ifdef NEED_AES_WRAP ifdef NEED_AES_WRAP
AESOBJS += ../src/crypto/aes-wrap.o AESOBJS += ../src/crypto/aes-wrap.o
endif endif
ifdef NEED_AES_CBC ifdef NEED_AES_CBC
NEED_AES_ENC=y
AESOBJS += ../src/crypto/aes-cbc.o
endif
ifdef NEED_AES_ENC
ifdef CONFIG_INTERNAL_AES ifdef CONFIG_INTERNAL_AES
AESOBJS += ../src/crypto/aes-internal-enc.o AESOBJS += ../src/crypto/aes-internal-enc.o
endif endif
AESOBJS += ../src/crypto/aes-cbc.o
endif endif
ifdef NEED_AES ifdef NEED_AES
OBJS += $(AESOBJS) OBJS += $(AESOBJS)