Change default build of wpa_supplicant to include EAPOL support;

ENABLE_WPA_SUPPLICANT_EAPOL is no more, now use NO_WPA_SUPPLICANT_EAPOL
to build with only WPA-PSK support.

Reviewed by:	ru, bsdimp (basic approach)
MFC after:	1 week
This commit is contained in:
Sam Leffler 2006-02-14 23:51:21 +00:00
parent 225b126b2d
commit b3babfdc25
4 changed files with 10 additions and 18 deletions

View file

@ -331,9 +331,6 @@
#
# wpa_supplicant
#
# Enable this to include 802.1X and EAP support in wpa_supplicant.
# 802.1X with EAP requires openssl but it can be used without to
# do things like dynamic WEP keying. The default is to build
# wpa_supplicant only with WPA-PSK support.
# Set this to disable building 802.1X and EAP support in wpa_supplicant.
#
#ENABLE_WPA_SUPPLICANT_EAPOL=true
#NO_WPA_SUPPLICANT_EAPOL=true

View file

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd October 22, 2005
.Dd February 14, 2006
.Dt MAKE.CONF 5
.Os
.Sh NAME
@ -435,18 +435,13 @@ will not be able to change users' groups.
Set this to install
.Xr ssh 1
with the set-user-ID bit turned on.
.It Va ENABLE_WPA_SUPPLICANT_EAPOL
.It Va NO_WPA_SUPPLICANT_EAPOL
.Pq Vt str
Build
.Xr wpa_supplicant 8
with support for the IEEE 802.1X protocol and with
without support for the IEEE 802.1X protocol and without
support for EAP-PEAP, EAP-TLS, EAP-LEAP, and EAP-TTLS
protocols (usable only via 802.1X).
This option is ignored if
.Va NO_CRYPT
or
.Va NO_OPENSSL
are set.
.It Va MAKE_IDEA
.Pq Vt bool
Set to build the IDEA encryption code.

View file

@ -19,7 +19,7 @@ CFLAGS+= -g
DPADD+= ${LIBPCAP}
LDADD+= -lpcap
.if defined(ENABLE_WPA_SUPPLICANT_EAPOL)
.if !defined(NO_WPA_SUPPLICANT_EAPOL)
SRCS+= eapol_sm.c eap.c
CFLAGS+= -DIEEE8021X_EAPOL

View file

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd June 16, 2005
.Dd February 14, 2006
.Dt WPA_SUPPLICANT.CONF 5
.Os
.Sh NAME
@ -248,11 +248,11 @@ If not set this defaults to all available methods compiled in to
.Xr wpa_supplicant 8 .
Note that by default
.Xr wpa_supplicant 8
is not compiled with EAP support; see
is compiled with EAP support; see
.Xr make.conf 5
for the
.Va ENABLE_WPA_SUPPLICANT_EAPOL
configuration variable.
.Va NO_WPA_SUPPLICANT_EAPOL
configuration variable that can be used to disable EAP support.
.It Va identity
Identity string for EAP.
.It Va anonymous_identity