diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2015-10-18 21:38:25 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2015-10-18 21:38:25 +0000 |
| commit | c437e26a1d8c13d53c6b57c8f8a8a28525fb34b0 (patch) | |
| tree | 2a6d777bac31b66dc039b0c8eed342049d131f0b /usr.sbin/wpa | |
| parent | 7b5d098c90f0f2e5151f5a80014ba3932988a132 (diff) | |
| parent | 7726170474c6c89d386ba77b425d186e993a03a0 (diff) | |
| download | FreeBSD-src-c437e26a1d8c13d53c6b57c8f8a8a28525fb34b0.zip FreeBSD-src-c437e26a1d8c13d53c6b57c8f8a8a28525fb34b0.tar.gz | |
Update hostapd/wpa_supplicant to version 2.5.
Tested by several people on current@/wireless@.
Relnotes: yes
Diffstat (limited to 'usr.sbin/wpa')
| -rw-r--r-- | usr.sbin/wpa/Makefile.crypto | 3 | ||||
| -rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Makefile | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto index 46cd9ef..5c03f7d 100644 --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -1,7 +1,7 @@ # $FreeBSD$ .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) -SRCS+= crypto_openssl.c random.c sha1-prf.c sha256-prf.c +SRCS+= crypto_openssl.c random.c sha1-prf.c sha256-prf.c sha256-tlsprf.c LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 .else @@ -19,6 +19,7 @@ CONFIG_INTERNAL_TLS=y CONFIG_INTERNAL_DH5=y CONFIG_INTERNAL_DH=y NEED_AES_ENC=true +NEED_AES_CBC=true .endif .if defined(TLS_FUNCS) diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 743f917..4437839 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -97,7 +97,6 @@ NEED_SIM_COMMON=y .if defined(NEED_SIM_COMMON) SRCS+= eap_sim_common.c \ eap_sim_db.c -NEED_AES_CBC=y NEED_FIPS186_2_PRF=y .endif diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index badae0d..65b0c77 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -96,10 +96,6 @@ NEED_AES_ENCBLOCK=y NEED_AES_OMAC1=y .endif -.if !empty(CFLAGS:M-DCONFIG_WPS) -NEED_AES_CBC=y -.endif - .if !empty(CFLAGS:M*-DEAP_AKA) SRCS+= eap_aka.c NEED_SIM_COMMON=y |
