head	1.26;
access;
symbols
	RELENG_8_4:1.25.0.2
	RELENG_9_1_0_RELEASE:1.19.2.3.2.2
	RELENG_9_1:1.19.2.3.0.2
	RELENG_9_1_BP:1.19.2.3
	RELENG_8_3_0_RELEASE:1.17.2.3.2.1
	RELENG_8_3:1.17.2.3.0.2
	RELENG_8_3_BP:1.17.2.3
	RELENG_9_0_0_RELEASE:1.19.2.1.2.1
	RELENG_9_0:1.19.2.1.0.2
	RELENG_9_0_BP:1.19.2.1
	RELENG_9:1.19.0.2
	RELENG_9_BP:1.19
	RELENG_7_4_0_RELEASE:1.11.2.5.8.1
	RELENG_8_2_0_RELEASE:1.17.2.1.6.1
	RELENG_7_4:1.11.2.5.0.8
	RELENG_7_4_BP:1.11.2.5
	RELENG_8_2:1.17.2.1.0.6
	RELENG_8_2_BP:1.17.2.1
	RELENG_8_1_0_RELEASE:1.17.2.1.4.1
	RELENG_8_1:1.17.2.1.0.4
	RELENG_8_1_BP:1.17.2.1
	RELENG_7_3_0_RELEASE:1.11.2.5.6.1
	RELENG_7_3:1.11.2.5.0.6
	RELENG_7_3_BP:1.11.2.5
	RELENG_8_0_0_RELEASE:1.17.2.1.2.1
	RELENG_8_0:1.17.2.1.0.2
	RELENG_8_0_BP:1.17.2.1
	RELENG_8:1.17.0.2
	RELENG_8_BP:1.17
	RELENG_7_2_0_RELEASE:1.11.2.5.4.1
	RELENG_7_2:1.11.2.5.0.4
	RELENG_7_2_BP:1.11.2.5
	RELENG_7_1_0_RELEASE:1.11.2.5.2.1
	RELENG_6_4_0_RELEASE:1.3.2.3.8.1
	RELENG_7_1:1.11.2.5.0.2
	RELENG_7_1_BP:1.11.2.5
	RELENG_6_4:1.3.2.3.0.8
	RELENG_6_4_BP:1.3.2.3
	RELENG_7_0_0_RELEASE:1.11.2.2
	RELENG_6_3_0_RELEASE:1.3.2.3
	RELENG_7_0:1.11.2.2.0.2
	RELENG_7_0_BP:1.11.2.2
	RELENG_6_3:1.3.2.3.0.6
	RELENG_6_3_BP:1.3.2.3
	RELENG_7:1.11.0.2
	RELENG_7_BP:1.11
	RELENG_6_2_0_RELEASE:1.3.2.3
	RELENG_6_2:1.3.2.3.0.4
	RELENG_6_2_BP:1.3.2.3
	RELENG_6_1_0_RELEASE:1.3.2.3
	RELENG_6_1:1.3.2.3.0.2
	RELENG_6_1_BP:1.3.2.3
	RELENG_6_0_0_RELEASE:1.3.4.1
	RELENG_6_0:1.3.0.4
	RELENG_6_0_BP:1.3
	RELENG_6:1.3.0.2
	RELENG_6_BP:1.3;
locks; strict;
comment	@# @;


1.26
date	2013.07.05.00.54.38;	author svnexp;	state Exp;
branches;
next	1.25;

1.25
date	2012.11.17.01.55.00;	author svnexp;	state Exp;
branches
	1.25.2.1;
next	1.24;

1.24
date	2012.04.29.12.48.52;	author bschmidt;	state Exp;
branches;
next	1.23;

1.23
date	2012.04.28.11.11.53;	author bschmidt;	state Exp;
branches;
next	1.22;

1.22
date	2012.04.28.11.01.12;	author bschmidt;	state Exp;
branches;
next	1.21;

1.21
date	2012.04.28.10.59.29;	author bschmidt;	state Exp;
branches;
next	1.20;

1.20
date	2012.01.18.02.44.22;	author emaste;	state Exp;
branches;
next	1.19;

1.19
date	2010.11.03.10.44.25;	author rpaulo;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2010.06.14.15.38.30;	author rpaulo;	state Exp;
branches;
next	1.17;

1.17
date	2009.03.02.02.28.22;	author sam;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2008.07.01.21.52.49;	author danger;	state Exp;
branches;
next	1.15;

1.15
date	2008.03.24.20.19.20;	author sam;	state Exp;
branches;
next	1.14;

1.14
date	2007.12.20.00.52.02;	author sam;	state Exp;
branches;
next	1.13;

1.13
date	2007.11.10.20.26.08;	author sam;	state Exp;
branches;
next	1.12;

1.12
date	2007.11.10.20.24.28;	author sam;	state Exp;
branches;
next	1.11;

1.11
date	2007.09.28.15.52.28;	author sam;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2007.09.25.16.08.16;	author sam;	state Exp;
branches;
next	1.9;

1.9
date	2007.07.11.16.04.08;	author sam;	state Exp;
branches;
next	1.8;

1.8
date	2006.04.13.12.49.24;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2006.03.17.18.54.44;	author ru;	state Exp;
branches;
next	1.6;

1.6
date	2006.03.07.05.54.20;	author sam;	state Exp;
branches;
next	1.5;

1.5
date	2006.02.14.23.51.20;	author sam;	state Exp;
branches;
next	1.4;

1.4
date	2005.10.10.17.51.12;	author wpaul;	state Exp;
branches;
next	1.3;

1.3
date	2005.06.17.05.32.48;	author sam;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	2005.06.07.23.50.37;	author sam;	state Exp;
branches;
next	1.1;

1.1
date	2005.06.05.21.18.53;	author sam;	state Exp;
branches;
next	;

1.25.2.1
date	2012.11.17.01.55.00;	author svnexp;	state dead;
branches;
next	1.25.2.2;

1.25.2.2
date	2013.03.28.13.06.28;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.19.2.1.2.1;
next	1.19.2.2;

1.19.2.2
date	2012.02.01.03.28.19;	author emaste;	state Exp;
branches;
next	1.19.2.3;

1.19.2.3
date	2012.05.12.08.22.41;	author bschmidt;	state Exp;
branches
	1.19.2.3.2.1;
next	1.19.2.4;

1.19.2.4
date	2012.11.17.11.37.48;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.19.2.1.2.2;

1.19.2.1.2.2
date	2012.11.17.08.37.45;	author svnexp;	state Exp;
branches;
next	;

1.19.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.19.2.3.2.2;

1.19.2.3.2.2
date	2012.11.17.08.48.37;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.17.2.1.2.1
	1.17.2.1.4.1
	1.17.2.1.6.1;
next	1.17.2.2;

1.17.2.2
date	2012.02.01.01.28.35;	author emaste;	state Exp;
branches;
next	1.17.2.3;

1.17.2.3
date	2012.02.01.01.36.46;	author emaste;	state Exp;
branches
	1.17.2.3.2.1;
next	1.17.2.4;

1.17.2.4
date	2012.11.17.10.37.28;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.17.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.17.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.17.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.17.2.3.2.2;

1.17.2.3.2.2
date	2012.11.17.08.25.59;	author svnexp;	state Exp;
branches;
next	;

1.11.2.1
date	2007.11.21.06.02.50;	author sam;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2007.11.21.06.07.12;	author sam;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2008.04.25.05.31.43;	author sam;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2008.04.25.17.39.55;	author sam;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2008.07.05.11.08.26;	author danger;	state Exp;
branches
	1.11.2.5.2.1
	1.11.2.5.4.1
	1.11.2.5.6.1
	1.11.2.5.8.1;
next	1.11.2.6;

1.11.2.6
date	2012.11.17.08.09.06;	author svnexp;	state Exp;
branches;
next	;

1.11.2.5.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.11.2.5.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.11.2.5.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.11.2.5.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.11.2.5.8.2;

1.11.2.5.8.2
date	2012.11.17.08.17.51;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2005.10.27.17.06.47;	author wpaul;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2006.02.21.17.19.54;	author sam;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2006.03.24.01.43.18;	author sam;	state Exp;
branches
	1.3.2.3.8.1;
next	1.3.2.4;

1.3.2.4
date	2009.01.06.12.39.28;	author danger;	state Exp;
branches;
next	1.3.2.5;

1.3.2.5
date	2009.01.06.20.19.49;	author brueffer;	state Exp;
branches;
next	1.3.2.6;

1.3.2.6
date	2012.11.17.07.46.48;	author svnexp;	state Exp;
branches;
next	;

1.3.2.3.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.3.4.1
date	2005.10.27.17.08.56;	author wpaul;	state Exp;
branches;
next	;


desc
@@


1.26
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252726
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/usr.sbin/wpa/wpa_supplicant/Makefile 252726 2013-07-04 21:12:58Z rpaulo $

.include "${.CURDIR}/../Makefile.inc"

.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
	${WPA_DISTDIR}/src/drivers

PROG=	wpa_supplicant
SRCS=	aes-unwrap.c base64.c blacklist.c bss.c common.c config.c \
	config_file.c ctrl_iface.c ctrl_iface_unix.c driver_bsd.c \
	driver_common.c driver_ndis.c driver_wired.c drivers.c \
	eap_register.c eloop.c events.c gas.c gas_query.c hs20.c \
	hs20_supplicant.c http_client.c http_server.c httpread.c \
	ieee802_11_common.c interworking.c l2_packet_freebsd.c main.c \
	md5.c notify.c offchannel.c os_unix.c peerkey.c pmksa_cache.c \
	preauth.c scan.c upnp_xml.c uuid.c wpa.c wpa_common.c wpa_debug.c \
	wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c wps.c \
	wps_attr_build.c wps_attr_parse.c wps_attr_process.c \
	wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \
	wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \
	wps_upnp_ssdp.c wps_upnp_web.c Packet32.c

MAN=	wpa_supplicant.8 wpa_supplicant.conf.5

.if ${MK_EXAMPLES} != "no"
FILESDIR= ${SHAREDIR}/examples/etc
.PATH:	${WPA_SUPPLICANT_DISTDIR}
FILES=	wpa_supplicant.conf
.endif

CFLAGS+=-DCONFIG_BACKEND_FILE \
	-DCONFIG_DEBUG_SYSLOG \
	-DCONFIG_DRIVER_BSD \
	-DCONFIG_DRIVER_NDIS \
	-DCONFIG_DRIVER_WIRED \
	-DCONFIG_PEERKEY \
	-DCONFIG_SMARTCARD \
	-DCONFIG_TERMINATE_ONLASTIF \
	-DCONFIG_WPS \
	-DCONFIG_WPS2 \
	-DCONFIG_WPS_UPNP \
	-DCONFIG_TLS=openssl \
	-DCONFIG_IEEE80211R \
	-DCONFIG_INTERWORKING \
	-DCONFIG_PRIVSEP \
	-DCONFIG_HS20 \
	-DCONFIG_GAS \
	-DPKCS12_FUNCS
#CFLAGS+= -g
DPADD+=	${LIBPCAP}
LDADD+=	-lpcap

# User customizations to the wpa_supplicant build environment
CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
#DPADD+=${WPA_SUPPLICANT_DPADD}
LDADD+=${WPA_SUPPLICANT_LDADD}
#LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}

.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
CFLAGS+=-DEAP_GTC \
	-DEAP_LEAP \
	-DEAP_MD5 \
	-DEAP_MSCHAPv2 \
	-DEAP_OTP \
	-DEAP_PEAP \
	-DEAP_PSK \
	-DEAP_TLS \
	-DEAP_TTLS \
	-DEAP_GTC \
	-DEAP_OTP \
	-DEAP_LEAP \
	-DIEEE8021X_EAPOL
SRCS+=	chap.c \
	eap.c \
	eap_common.c \
	eap_gtc.c \
	eap_leap.c \
	eap_md5.c \
	eap_methods.c \
	eap_mschapv2.c \
	eap_otp.c \
	eap_peap.c \
	eap_peap_common.c \
	eap_psk.c \
	eap_psk_common.c \
	eap_tls.c \
	eap_tls_common.c \
	eap_ttls.c \
	eapol_supp_sm.c \
	ms_funcs.c \
	mschapv2.c
TLS_FUNCS=y
NEED_AES_EAX=y
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
NEED_AES_CBC=y
.endif

.if !empty(CFLAGS:M*-DEAP_SIM)
SRCS+=	eap_sim.c
NEED_SIM_COMMON=y
NEED_AES_CBC=y
.endif

.if defined(NEED_SIM_COMMON)
SRCS+=	eap_sim_common.c
NEED_FIPS186_2_PRF=y
.endif

# PC/SC interface for smartcards (USIM, GSM SIM)
# GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
# NB: requires devel/pcsc-lite
#
# WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC
# WPA_SUPPLICANT_LDADD=-L/usr/local/lib
#
.if !empty(CFLAGS:M*-DPCSC_FUNCS)
SRCS+=	pcsc_funcs.c
DPADD+=${LIBPTHREAD}
LDADD+=-lpcsclite -lpthread
.endif

.if !empty(CFLAGS:M*-DEAP_GPSK)
CFLAGS+=-DEAP_GPSK_SHA256
SRCS+=	eap_gpsk.c \
	eap_gpsk_common.c
NEED_AES_OMAC1=y
.endif

.if !empty(CFLAGS:M*-DEAP_PAX)
SRCS+=	eap_pax.c \
	eap_pax_common.c
.endif

.if !empty(CFLAGS:M*-DEAP_SAKE)
SRCS+=	eap_sake.c \
	eap_sake_common.c
.endif

.include "${.CURDIR}/../Makefile.crypto"

.include <bsd.prog.mk>
@


1.25
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/usr.sbin/wpa/wpa_supplicant/Makefile 234786 2012-04-29 12:48:52Z bschmidt $
d9 13
a21 35
SRCS=	aes-unwrap.c \
	base64.c \
	blacklist.c \
	bss.c \
	common.c \
	config.c \
	config_file.c \
	ctrl_iface.c \
	ctrl_iface_unix.c \
	driver_ndis.c \
	driver_wired.c \
	drivers.c \
	eap_register.c \
	eloop.c \
	events.c \
	main.c \
	md5.c \
	notify.c \
	os_unix.c \
	peerkey.c \
	pmksa_cache.c \
	preauth.c \
	scan.c \
	sha1-pbkdf2.c \
	sha1.c \
	wpa.c \
	wpa_common.c \
	wpa_debug.c \
	wpa_ie.c \
	wpa_supplicant.c \
	wpabuf.c \
	wpas_glue.c
SRCS+=	driver_freebsd.c \
	l2_packet_freebsd.c \
	Packet32.c
d39 9
d69 3
d96 4
a99 1
NEED_SHA256=y
@


1.25.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:28 +0000
@
text
@d1 158
@


1.25.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 150
# $FreeBSD: releng/8.4/usr.sbin/wpa/wpa_supplicant/Makefile 230855 2012-02-01 01:36:46Z emaste $

.include "${.CURDIR}/../Makefile.inc"

.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
	${WPA_DISTDIR}/src/drivers \
	${WPA_DISTDIR}/src/eap_peer \
	${WPA_DISTDIR}/src/rsn_supp

PROG=	wpa_supplicant
SRCS=	aes.c aes_wrap.c blacklist.c common.c config.c ctrl_iface.c \
	ctrl_iface_unix.c drivers.c eloop.c events.c l2_packet.c main.c \
	md5.c preauth.c pmksa_cache.c rc4.c scan.c scan_helpers.c sha1.c \
	wpa.c wpa_common.c wpa_debug.c wpa_ie.c wpa_supplicant.c \
	wpabuf.c wpas_glue.c \
	driver_ndis.c Packet32.c \
	driver_wired.c \
	driver_freebsd.c os_unix.c

MAN=	wpa_supplicant.8 wpa_supplicant.conf.5

.if ${MK_EXAMPLES} != "no"
FILESDIR= ${SHAREDIR}/examples/etc
.PATH:	${WPA_SUPPLICANT_DISTDIR}
FILES=	wpa_supplicant.conf
.endif

CFLAGS+=-I${WPA_SUPPLICANT_DISTDIR}
CFLAGS+=-I${WPA_DISTDIR}/src/drivers
CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp

CFLAGS+= -DCONFIG_DRIVER_BSD
CFLAGS+= -DCONFIG_DRIVER_NDIS
CFLAGS+= -DCONFIG_DRIVER_WIRED
CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF
CFLAGS+= -DCONFIG_DEBUG_SYSLOG
CFLAGS+= -g
DPADD+=	${LIBPCAP}
LDADD+=	-lpcap

# NB: we only support wpa_supplicant.conf file
SRCS+=	config_file.c base64.c
CFLAGS+=-DCONFIG_BACKEND_FILE

# User customizations to the wpa_supplicant build environment
CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
#DPADD+=${WPA_SUPPLICANT_DPADD}
LDADD+=${WPA_SUPPLICANT_LDADD}
#LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}

.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
SRCS+=	eapol_supp_sm.c eap.c eap_common.c eap_methods.c
CFLAGS+= -DIEEE8021X_EAPOL

.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
	-DEAP_TLV -DEAP_TLS_FUNCS -DEAP_TLS_OPENSSL
SRCS+=	chap.c crypto_openssl.c \
	eap_leap.c \
	eap_mschapv2.c \
	eap_peap.c eap_peap_common.c \
	eap_psk.c eap_psk_common.c \
	eap_tls.c eap_tls_common.c \
	mschapv2.c ms_funcs.c tls_openssl.c

CFLAGS+=-DEAP_TTLS -DEAP_MD5
SRCS+=	eap_ttls.c eap_md5.c

.if !empty(CFLAGS:M*-DEAP_GTC)
SRCS+=	eap_gtc.c
.endif

.if !empty(CFLAGS:M*-DEAP_OTP)
SRCS+=	eap_otp.c
.endif

.if !empty(CFLAGS:M*-DEAP_AKA)
NEED_SIM_COMMON=	true
SRCS+=	eap_aka.c
.endif

.if !empty(CFLAGS:M*-DEAP_SIM)
NEED_SIM_COMMON=	true
SRCS+=	eap_sim.c
.endif

.if defined(NEED_SIM_COMMON)
SRCS+=	eap_sim_common.c

# PC/SC interface for smartcards (USIM, GSM SIM)
# GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
# NB: requires devel/pcsc-lite
#
# WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC
# WPA_SUPPLICANT_LDADD=-L/usr/local/lib
#
.if !empty(CFLAGS:M*-DPCSC_FUNCS)
SRCS+=	pcsc_funcs.c
DPADD+=${LIBPTHREAD}
LDADD+=-lpcsclite -lpthread
.endif
.endif

.if !empty(CFLAGS:M*-DEAP_GPSK)
CFLAGS+=-DEAP_GPSK_SHA256
SRCS+=	eap_gpsk.c eap_gpsk_common.c
NEED_SHA256=	true
.endif

.if !empty(CFLAGS:M*-DEAP_PAX)
SRCS+=	eap_pax.c eap_pax_common.c
.endif

.if !empty(CFLAGS:M*-DEAP_SAKE)
SRCS+=	eap_sake.c eap_sake_common.c
.endif

# NB: requires patch to openssl
#CFLAGS+= -DEAP_FAST
#SRCS+=	eap_fast.c

NEED_LIBSSL=	true
.else
CFLAGS+= -DEAP_TLS_NONE
SRCS+=	tls_none.c
.endif

.endif

#
# Configure crypto/cipher support.
#
# EAPOL support requires openssl in which case we use their
# cipher code.  Otherwise we use our internal versions.
#
.if !defined(NEED_LIBSSL)
CFLAGS+= -DINTERNAL_AES
CFLAGS+= -DINTERNAL_SHA1
CFLAGS+= -DINTERNAL_MD5
.else
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif

.if defined(NEED_SHA256)
CFLAGS+=-DINTERNAL_SHA256
SRCS+=	sha256.c
.endif

.include <bsd.prog.mk>
@


1.24
log
@SVN rev 234786 on 2012-04-29 12:48:52Z by bschmidt

Fix WITHOUT_EXAMPLES build:
While removing unnecessary entries from .PATH.c I missed that for the
examples WPA_SUPPLICANT_DISTDIR/HOSTAPD_DISTDIR is explicitly added to
.PATH.

Tested by:	lev
MFC after:	2 weeks
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.23
log
@SVN rev 234759 on 2012-04-28 11:11:53Z by bschmidt

Move crypto stuff into a common Makefile.  While here fix the
WITHOUT_OPENSSL build by using the wpa's internal crypto support if
openssl is not available, this allows us to unconditionally enable
EAP support.

MFC after:	2 weeks
@
text
@d5 2
a6 1
.PATH.c:${WPA_DISTDIR}/src/drivers
@


1.22
log
@SVN rev 234757 on 2012-04-28 11:01:12Z by bschmidt

enable EAP_GTC and EAP_OTP to match upstream's default configuration

MFC after:	2 weeks
@
text
@d8 1
a8 8
SRCS=	aes-cbc.c \
	aes-ctr.c \
	aes-eax.c \
	aes-encblock.c \
	aes-internal.c \
	aes-omac1.c \
	aes-unwrap.c \
	aes-wrap.c \
a31 2
	sha1-tlsprf.c \
	sha1-tprf.c \
a71 3

.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)

a79 3
	-DEAP_TLV \
	-DEAP_TLS_FUNCS \
	-DEAP_TLS_OPENSSL \
a82 1
	crypto_openssl.c \
d100 7
a106 2
	mschapv2.c \
	tls_openssl.c
a108 1
NEED_SIM_COMMON=	true
d110 2
a114 1
NEED_SIM_COMMON=	true
d116 2
d122 1
d142 1
a142 1
NEED_SHA256=	true
d155 1
a155 27
NEED_LIBSSL=	true
.else
CFLAGS+= -DEAP_TLS_NONE
SRCS+=	tls_none.c
.endif

.endif

#
# Configure crypto/cipher support.
#
# EAPOL support requires openssl in which case we use their
# cipher code.  Otherwise we use our internal versions.
#
.if !defined(NEED_LIBSSL)
CFLAGS+= -DINTERNAL_AES
CFLAGS+= -DINTERNAL_SHA1
CFLAGS+= -DINTERNAL_MD5
.else
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif

.if defined(NEED_SHA256)
CFLAGS+=-DINTERNAL_SHA256
SRCS+=	sha256.c
.endif
@


1.21
log
@SVN rev 234756 on 2012-04-28 10:59:29Z by bschmidt

Follow up r234711 and do same for the supplicant, one file/option per
line. While here merge the options which are always enabled.

MFC after:	2 weeks
@
text
@d84 2
a85 1
CFLAGS+=-DEAP_LEAP \
d88 1
d101 1
d106 1
a118 8
.if !empty(CFLAGS:M*-DEAP_GTC)
SRCS+=	eap_gtc.c
.endif

.if !empty(CFLAGS:M*-DEAP_OTP)
SRCS+=	eap_otp.c
.endif

@


1.20
log
@SVN rev 230293 on 2012-01-18 02:44:22Z by emaste

Add missing line continuation \.  It did not cause any issue because
the same path is already being included in ../Makefile.inc.

PR:		164192
Submitted by:	Devin Teske <dteske vicor com>
MFC after:	2 weeks
@
text
@d5 1
a5 5
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
	${WPA_DISTDIR}/src/drivers \
	${WPA_DISTDIR}/src/eap_peer \
	${WPA_DISTDIR}/src/rsn_supp \
	${WPA_DISTDIR}/src/crypto
d8 17
a24 9
SRCS=	aes-cbc.c aes-ctr.c aes-eax.c aes-encblock.c \
	aes-internal.c aes-omac1.c aes-unwrap.c \
	aes-wrap.c bss.c blacklist.c common.c config.c ctrl_iface.c \
	ctrl_iface_unix.c drivers.c eloop.c events.c l2_packet_freebsd.c main.c\
	md5.c notify.c preauth.c pmksa_cache.c scan.c \
	sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c \
	wpa.c wpa_common.c wpa_debug.c wpa_ie.c wpa_supplicant.c \
	wpabuf.c wpas_glue.c \
	driver_ndis.c Packet32.c \
d26 26
a51 1
	driver_freebsd.c os_unix.c
d61 9
a69 9
CFLAGS+=-I${WPA_SUPPLICANT_DISTDIR}
CFLAGS+=-I${WPA_DISTDIR}/src/drivers
CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp

CFLAGS+= -DCONFIG_DRIVER_BSD
CFLAGS+= -DCONFIG_DRIVER_NDIS
CFLAGS+= -DCONFIG_DRIVER_WIRED
CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF
CFLAGS+= -DCONFIG_DEBUG_SYSLOG
a73 4
# NB: we only support wpa_supplicant.conf file
SRCS+=	config_file.c base64.c
CFLAGS+=-DCONFIG_BACKEND_FILE

a80 2
SRCS+=	eapol_supp_sm.c eap.c eap_common.c eap_methods.c eap_register.c
CFLAGS+= -DIEEE8021X_EAPOL
d83 16
a98 3
CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
	-DEAP_TLV -DEAP_TLS_FUNCS -DEAP_TLS_OPENSSL
SRCS+=	chap.c crypto_openssl.c \
d100 2
d103 11
a113 7
	eap_peap.c eap_peap_common.c \
	eap_psk.c eap_psk_common.c \
	eap_tls.c eap_tls_common.c \
	mschapv2.c ms_funcs.c tls_openssl.c

CFLAGS+=-DEAP_TTLS -DEAP_MD5
SRCS+=	eap_ttls.c eap_md5.c
d135 1
a148 1
.endif
d152 2
a153 1
SRCS+=	eap_gpsk.c eap_gpsk_common.c
d158 2
a159 1
SRCS+=	eap_pax.c eap_pax_common.c
d163 2
a164 1
SRCS+=	eap_sake.c eap_sake_common.c
a166 4
# NB: requires patch to openssl
#CFLAGS+= -DEAP_FAST
#SRCS+=	eap_fast.c

@


1.19
log
@SVN rev 214735 on 2010-11-03 10:44:25Z by rpaulo

Adapt for wpa_supplicant / hostapd 0.7.3.
@
text
@d8 1
a8 1
	${WPA_DISTDIR}/src/rsn_supp
@


1.19.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.19.2.2
log
@SVN rev 230858 on 2012-02-01 03:28:19Z by emaste

MFC r230293:

  Add missing line continuation \.  It did not cause any issue because
  the same path is already being included in ../Makefile.inc.

  PR:           164192
  Submitted by: Devin Teske <dteske vicor com>
@
text
@d8 1
a8 1
	${WPA_DISTDIR}/src/rsn_supp \
@


1.19.2.3
log
@SVN rev 235328 on 2012-05-12 08:22:41Z by bschmidt

MFC r234711, r234756-234759, r234786:

r234711:
fix EAP server support after the 0.7.3 import:
- eap_xxx.c files have been renamed to eap_server_xxx.c
- additional crypto files are required for some options
- EAP_MD5 and EAP_GTC is now enabled by default to match vendor config
- move each file on its own line to hopefully make further diffs easier
  to read

EAP_SERVER is now enabled by default. Fiddling with HOSTAPD_CFLAGS in
src.conf is no longer required to get a basic WPA-EAP/radius setup
running. [1]

r234756-234758:
- Follow up r234711 and do same for the supplicant, one file/option per
  line. While here merge the options which are always enabled.
- enable EAP_GTC and EAP_OTP to match upstream's default configuration
- not only the file names have changed from eap_xxx.c to eap_server_xxx.c,
  the defines too

r234759:
Move crypto stuff into a common Makefile.  While here fix the
WITHOUT_OPENSSL build by using the wpa's internal crypto support if
openssl is not available, this allows us to unconditionally enable
EAP support.

r234786:
Fix WITHOUT_EXAMPLES build:
While removing unnecessary entries from .PATH.c I missed that for the
examples WPA_SUPPLICANT_DISTDIR/HOSTAPD_DISTDIR is explicitly added to
.PATH.
@
text
@d6 4
a9 1
	${WPA_DISTDIR}/src/drivers
d12 9
a20 10
SRCS=	aes-unwrap.c \
	base64.c \
	blacklist.c \
	bss.c \
	common.c \
	config.c \
	config_file.c \
	ctrl_iface.c \
	ctrl_iface_unix.c \
	driver_ndis.c \
d22 1
a22 24
	drivers.c \
	eap_register.c \
	eloop.c \
	events.c \
	main.c \
	md5.c \
	notify.c \
	os_unix.c \
	peerkey.c \
	pmksa_cache.c \
	preauth.c \
	scan.c \
	sha1-pbkdf2.c \
	sha1.c \
	wpa.c \
	wpa_common.c \
	wpa_debug.c \
	wpa_ie.c \
	wpa_supplicant.c \
	wpabuf.c \
	wpas_glue.c
SRCS+=	driver_freebsd.c \
	l2_packet_freebsd.c \
	Packet32.c
d32 9
a40 9
CFLAGS+=-DCONFIG_BACKEND_FILE \
	-DCONFIG_DEBUG_SYSLOG \
	-DCONFIG_DRIVER_BSD \
	-DCONFIG_DRIVER_NDIS \
	-DCONFIG_DRIVER_WIRED \
	-DCONFIG_PEERKEY \
	-DCONFIG_SMARTCARD \
	-DCONFIG_TERMINATE_ONLASTIF \
	-DPKCS12_FUNCS
d45 4
d56 7
a62 14
CFLAGS+=-DEAP_GTC \
	-DEAP_LEAP \
	-DEAP_MD5 \
	-DEAP_MSCHAPv2 \
	-DEAP_OTP \
	-DEAP_PEAP \
	-DEAP_PSK \
	-DEAP_TLS \
	-DEAP_TTLS \
	-DIEEE8021X_EAPOL
SRCS+=	chap.c \
	eap.c \
	eap_common.c \
	eap_gtc.c \
a63 2
	eap_md5.c \
	eap_methods.c \
d65 14
a78 16
	eap_otp.c \
	eap_peap.c \
	eap_peap_common.c \
	eap_psk.c \
	eap_psk_common.c \
	eap_tls.c \
	eap_tls_common.c \
	eap_ttls.c \
	eapol_supp_sm.c \
	ms_funcs.c \
	mschapv2.c
TLS_FUNCS=y
NEED_AES_EAX=y
NEED_AES_ENCBLOCK=y
NEED_AES_OMAC1=y
NEED_SHA256=y
d82 1
a83 2
NEED_SIM_COMMON=y
NEED_AES_CBC=y
d87 1
a88 2
NEED_SIM_COMMON=y
NEED_AES_CBC=y
a92 2
NEED_FIPS186_2_PRF=y
.endif
d106 1
d110 2
a111 3
SRCS+=	eap_gpsk.c \
	eap_gpsk_common.c
NEED_AES_OMAC1=y
d115 1
a115 2
SRCS+=	eap_pax.c \
	eap_pax_common.c
d119 1
a119 2
SRCS+=	eap_sake.c \
	eap_sake_common.c
d122 31
a152 1
.include "${.CURDIR}/../Makefile.crypto"
@


1.19.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/wpa/wpa_supplicant/Makefile 235328 2012-05-12 08:22:41Z bschmidt $
@


1.19.2.3.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.19.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/wpa/wpa_supplicant/Makefile 235328 2012-05-12 08:22:41Z bschmidt $
@


1.19.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.19.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/wpa/wpa_supplicant/Makefile 214735 2010-11-03 10:44:25Z rpaulo $
@


1.18
log
@SVN rev 209159 on 2010-06-14 15:38:30Z by rpaulo

Update for hostapd & wpa_supplicant 0.6.10.
@
text
@d9 1
d12 3
a14 1
SRCS=	aes.c aes_wrap.c blacklist.c common.c config.c ctrl_iface.c \
d16 2
a17 1
	md5.c preauth.c pmksa_cache.c rc4.c scan.c scan_helpers.c sha1.c \
d41 1
a41 1
CFLAGS+= -g
d56 1
a56 1
SRCS+=	eapol_supp_sm.c eap.c eap_common.c eap_methods.c
@


1.17
log
@SVN rev 189263 on 2009-03-02 02:28:22Z by sam

update to 0.6.8

Reviewed by:	thompsa
@
text
@d12 1
a12 1
	ctrl_iface_unix.c drivers.c eloop.c events.c l2_packet.c main.c \
@


1.17.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.17.2.2
log
@SVN rev 230854 on 2012-02-01 01:28:35Z by emaste

MFC r230293:

  Add missing line continuation \.  It did not cause any issue because
  the same path is already being included in ../Makefile.inc.

  PR:           164192
  Submitted by: Devin Teske <dteske vicor com>
@
text
@d8 1
a8 1
	${WPA_DISTDIR}/src/rsn_supp \
@


1.17.2.3
log
@SVN rev 230855 on 2012-02-01 01:36:46Z by emaste

Revert r230854 as the change does not apply to stable/8.
@
text
@d8 1
a8 1
	${WPA_DISTDIR}/src/rsn_supp
@


1.17.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/wpa/wpa_supplicant/Makefile 230855 2012-02-01 01:36:46Z emaste $
@


1.17.2.3.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.17.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/wpa/wpa_supplicant/Makefile 230855 2012-02-01 01:36:46Z emaste $
@


1.17.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.17.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.17.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.16
log
@SVN rev 180158 on 2008-07-01 21:52:49Z by danger

- install the example wpa_supplicant.conf file to the share/examples/etc
  directory [1]
- add the FILES section to the wpa_supplicant.conf.5 file, so that people
  will be able to detect the example configuration file easier. [2]

PR:		docs/121821 [2]
Approved by:	brooks [1]
MFC after:	3 days
@
text
@d3 1
a3 1
.include <bsd.own.mk>
d5 4
a8 2
WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
.PATH: ${.CURDIR}/.. ${WPA_SUPPLICANT_DISTDIR}
d11 5
a15 3
SRCS=	config.c eloop.c common.c md5.c rc4.c sha1.c aes_wrap.c \
	wpa_supplicant.c events.c wpa.c preauth.c pmksa_cache.c \
	ctrl_iface.c ctrl_iface_unix.c l2_packet.c main.c drivers.c \
d24 1
d28 4
a31 1
CFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
a34 2
CFLAGS+= -DCONFIG_CTRL_IFACE
CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
d52 1
a52 1
SRCS+=	eapol_sm.c eap.c eap_methods.c
d58 4
a61 1
SRCS+=	eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c \
d63 2
a64 1
	eap_tlv.c eap_tls_common.c tls_openssl.c ms_funcs.c crypto.c
@


1.15
log
@enable syslog support and add -s option to the man page

MFC after:	3 weeks
@
text
@d19 1
a19 1
FILESDIR= ${SHAREDIR}/examples/wpa_supplicant
@


1.14
log
@enable wired driver support

Submitted by:	"Paul B. Mahol" <onemda@@gmail.com>
MFC after:	1 week
@
text
@d30 1
@


1.13
log
@fix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL

MFC after:	1 week
@
text
@d13 1
d26 1
@


1.12
log
@install sample wpa_supplicant.conf; not everyone has source to reference
@
text
@a104 5
.if defined(NEED_SHA256)
CFLAGS+=-DINTERNAL_SHA256
SRCS+=	sha256.c
.endif

d109 1
a109 2
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
d112 12
d127 3
a129 1
SRCS+=	tls_none.c
d132 3
@


1.11
log
@fix building with NO_CRYPT=true

PR:		116439
Approved by:	re (gnn)
@
text
@d15 1
d17 4
a20 1
MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
@


1.11.2.1
log
@MFC 1.13: ix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL

Approved by:	re (kensmith)
@
text
@d101 5
d110 2
a111 1
NEED_LIBSSL=	true
a113 12
SRCS+=	tls_none.c
.endif

.endif

#
# Configure crypto/cipher support.
#
# EAPOL support requires openssl in which case we use their
# cipher code.  Otherwise we use our internal versions.
#
.if !defined(NEED_LIBSSL)
d117 1
a117 3
.else
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
a119 3
.if defined(NEED_SHA256)
CFLAGS+=-DINTERNAL_SHA256
SRCS+=	sha256.c
@


1.11.2.2
log
@MFC: install example files for folks that don't have source

Approved by:	re (kensmith)
@
text
@d15 1
a17 5
.if ${MK_EXAMPLES} != "no"
FILESDIR= ${SHAREDIR}/examples/wpa_supplicant
FILES=	wpa_supplicant.conf
.endif

@


1.11.2.3
log
@MFC 1.14: enable wired driver support
@
text
@a12 1
	driver_wired.c \
a24 1
CFLAGS+= -DCONFIG_DRIVER_WIRED
@


1.11.2.4
log
@MFC: enable syslog support and add -s option to the man page
@
text
@a29 1
CFLAGS+= -DCONFIG_DEBUG_SYSLOG
@


1.11.2.5
log
@SVN rev 180290 on 2008-07-05 11:08:26Z by danger

MFC r180158:

- install the example wpa_supplicant.conf file to the share/examples/etc
  directory [1]
- add the FILES section to the wpa_supplicant.conf.5 file, so that people
  will be able to detect the example configuration file easier. [2]

PR:		docs/121821 [2]
@
text
@d19 1
a19 1
FILESDIR= ${SHAREDIR}/examples/etc
@


1.11.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/wpa/wpa_supplicant/Makefile 180290 2008-07-05 11:08:26Z danger $
@


1.11.2.5.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.11.2.5.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/wpa/wpa_supplicant/Makefile 180290 2008-07-05 11:08:26Z danger $
@


1.11.2.5.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.11.2.5.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.11.2.5.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.10
log
@o enable use of EAP methods w/o modification to the base system; use
  WPA_SUPPLICANT_CFLAGS, etc. (consult the Makefile's for details)
o enable ipv6 support in hostapd (for communication w/ a radius backend)

PR:		bin/116164
Submitted by:	"Scot Hetzel" <swhetzel@@gmail.com>
Approved by:	re (gnn)
MFC after:	2 weeks
@
text
@d114 3
@


1.9
log
@update for wpa_supplicant 0.5.8 import:
o unix domain socket to wpa_cli is configured w/ CONFIG_CTRL_IFACE_UNIX
o terminate on last interface option is configured w/ CONFIG_TERMINATE_ONLASTIF
o ndis/Packet32.c fixups to force roaming mode to manual
o document new mixed_cell config knob

Submitted by:	thompsa (Packet32.c)
Reviewed by:	thompsa, sephe
Approved by:	re (hrs)
@
text
@d32 6
d44 1
a44 1
	-DEAP_TLV -DEAP_TLS_FUNCS
d52 54
d113 1
@


1.8
log
@Add missing library dependencies.
@
text
@d10 5
a14 3
	wpa_supplicant.c events.c wpa.c preauth.c \
	ctrl_iface.c l2_packet.c main.c drivers.c driver_freebsd.c \
	driver_ndis.c driver_ndis_.c Packet32.c
d22 2
d33 1
a33 1
SRCS+=	eapol_sm.c eap.c
@


1.7
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d46 1
a46 1
DPADD+= ${LIBCRYPTO}
@


1.6
log
@update for v0.4.8 import of wpa_supplicant and hostapd

MFC after:	2 weeks
@
text
@d3 2
d28 1
a28 1
.if !defined(NO_WPA_SUPPLICANT_EAPOL)
d32 1
a32 1
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
@


1.5
log
@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
@
text
@d8 2
a9 2
	wpa_supplicant.c wpa.c \
	ctrl_iface.c l2_packet.c drivers.c driver_freebsd.c \
d22 4
d33 2
a34 1
SRCS+=	eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c eap_psk.c \
@


1.4
log
@Enable -D ndis support in wpa_supplicant and add the ndis_events utility.
This allows wpa_supplicant to work with WPA and WPA2 compliant NDIS
drivers.
@
text
@d22 1
a22 1
.if defined(ENABLE_WPA_SUPPLICANT_EAPOL)
@


1.3
log
@o move wpa_supplicant to section 8
o fillin wpa_supplicant.conf.5

Approved by:	re (blanket wpa)
@
text
@d9 2
a10 1
	ctrl_iface.c l2_packet.c drivers.c driver_freebsd.c
d16 1
@


1.3.4.1
log
@MFC: synchronize the NDISulator with the head and RELENG_5 branches,
add -D ndis support to wpa_supplicant

Approved by:	re
@
text
@d9 1
a9 2
	ctrl_iface.c l2_packet.c drivers.c driver_freebsd.c \
	driver_ndis.c driver_ndis_.c Packet32.c
a14 1
CFLAGS+= -DCONFIG_DRIVER_NDIS
@


1.3.2.1
log
@MFC: synchronize the NDISulator with the head and RELENG_5 branches,
add -D ndis support to wpa_supplicant

Approved by:	re
@
text
@d9 1
a9 2
	ctrl_iface.c l2_packet.c drivers.c driver_freebsd.c \
	driver_ndis.c driver_ndis_.c Packet32.c
a14 1
CFLAGS+= -DCONFIG_DRIVER_NDIS
@


1.3.2.2
log
@MFC: Change default build of wpa_supplicant to include EAPOL support

Approved by:	re (scottl, hrs)
@
text
@d22 1
a22 1
.if !defined(NO_WPA_SUPPLICANT_EAPOL)
@


1.3.2.3
log
@MFC: update for v0.4.8 import of wpa_supplicant and hostapd

Approved by:	re (hrs)
@
text
@d8 2
a9 2
	wpa_supplicant.c events.c wpa.c preauth.c \
	ctrl_iface.c l2_packet.c main.c drivers.c driver_freebsd.c \
a21 4
# NB: we only support wpa_supplicant.conf file
SRCS+=	config_file.c base64.c
CFLAGS+=-DCONFIG_BACKEND_FILE

d29 1
a29 2
SRCS+=	eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c \
	eap_psk.c eap_psk_common.c \
@


1.3.2.4
log
@SVN rev 186816 on 2009-01-06 12:39:28Z by danger

MFC r180158:

- install the example wpa_supplicant.conf file to the share/examples/etc
  directory [1]
- add the FILES section to the wpa_supplicant.conf.5 file, so that people
  will be able to detect the example configuration file easier. [2]

PR:		docs/121821 [2]
Submitted by:	edwin [2]
Approved by:	brooks [1]
@
text
@a13 5
.if ${MK_EXAMPLES} != "no"
FILESDIR= ${SHAREDIR}/examples/etc
FILES=	wpa_supplicant.conf
.endif

@


1.3.2.5
log
@SVN rev 186838 on 2009-01-06 20:19:49Z by brueffer

Unbreak build by fixing the conditional.

Approved by:	bz
Pointy Hat To:	danger
@
text
@d14 1
a14 1
.if !defined(NO_SHARE)
@


1.3.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/wpa/wpa_supplicant/Makefile 186838 2009-01-06 20:19:49Z brueffer $
@


1.3.2.3.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.2
log
@add EAP-TTLS to the EAPOL group; may want a separate knob later
@
text
@d11 2
@


1.1
log
@freebsd pieces of wpa supplicant support

Reviewed by:	brooks
@
text
@d28 3
@

