head	1.13;
access;
symbols
	perseant-exfatfs-base-20250801:1.13
	perseant-exfatfs-base-20240630:1.13
	perseant-exfatfs:1.13.0.24
	perseant-exfatfs-base:1.13
	cjep_sun2x:1.13.0.22
	cjep_sun2x-base:1.13
	cjep_staticlib_x-base1:1.13
	cjep_staticlib_x:1.13.0.20
	cjep_staticlib_x-base:1.13
	phil-wifi-20200421:1.13
	phil-wifi-20200411:1.13
	phil-wifi-20200406:1.13
	pgoyette-compat-merge-20190127:1.13
	pgoyette-compat-20190127:1.13
	pgoyette-compat-20190118:1.13
	pgoyette-compat-1226:1.13
	pgoyette-compat-1126:1.13
	pgoyette-compat-1020:1.13
	pgoyette-compat-0930:1.13
	pgoyette-compat-0906:1.13
	pgoyette-compat-0728:1.13
	pgoyette-compat-0625:1.13
	pgoyette-compat-0521:1.13
	pgoyette-compat-0502:1.13
	pgoyette-compat-0422:1.13
	pgoyette-compat-0415:1.13
	pgoyette-compat-0407:1.13
	pgoyette-compat-0330:1.13
	pgoyette-compat-0322:1.13
	pgoyette-compat-0315:1.13
	pgoyette-compat:1.13.0.18
	pgoyette-compat-base:1.13
	perseant-stdc-iso10646:1.13.0.16
	perseant-stdc-iso10646-base:1.13
	prg-localcount2-base3:1.13
	prg-localcount2-base2:1.13
	prg-localcount2-base1:1.13
	prg-localcount2:1.13.0.14
	prg-localcount2-base:1.13
	pgoyette-localcount-20170426:1.13
	bouyer-socketcan-base1:1.13
	pgoyette-localcount-20170320:1.13
	bouyer-socketcan:1.13.0.12
	bouyer-socketcan-base:1.13
	pgoyette-localcount-20170107:1.13
	pgoyette-localcount-20161104:1.13
	localcount-20160914:1.13
	pgoyette-localcount-20160806:1.13
	pgoyette-localcount-20160726:1.13
	pgoyette-localcount:1.13.0.10
	pgoyette-localcount-base:1.13
	netbsd-5-2-3-RELEASE:1.10.2.2
	netbsd-5-1-5-RELEASE:1.10.2.2
	yamt-pagecache-base9:1.13
	yamt-pagecache-tag8:1.13
	tls-earlyentropy:1.13.0.6
	tls-earlyentropy-base:1.13
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.13
	riastradh-drm2-base3:1.13
	netbsd-5-2-2-RELEASE:1.10.2.2
	netbsd-5-1-4-RELEASE:1.10.2.2
	netbsd-5-2-1-RELEASE:1.10.2.2
	netbsd-5-1-3-RELEASE:1.10.2.2
	agc-symver:1.13.0.8
	agc-symver-base:1.13
	tls-maxphys-base:1.13
	yamt-pagecache-base8:1.13
	netbsd-5-2:1.10.2.2.0.6
	yamt-pagecache-base7:1.13
	netbsd-5-2-RELEASE:1.10.2.2
	netbsd-5-2-RC1:1.10.2.2
	yamt-pagecache-base6:1.13
	yamt-pagecache-base5:1.13
	yamt-pagecache-base4:1.13
	netbsd-5-1-2-RELEASE:1.10.2.2
	netbsd-5-1-1-RELEASE:1.10.2.2
	yamt-pagecache-base3:1.13
	yamt-pagecache-base2:1.13
	yamt-pagecache:1.13.0.4
	yamt-pagecache-base:1.13
	bouyer-quota2-nbase:1.13
	bouyer-quota2:1.13.0.2
	bouyer-quota2-base:1.13
	matt-nb5-mips64-premerge-20101231:1.10.2.1.4.1
	matt-nb5-pq3:1.10.2.2.0.4
	matt-nb5-pq3-base:1.10.2.2
	netbsd-5-1:1.10.2.2.0.2
	netbsd-5-1-RELEASE:1.10.2.2
	netbsd-5-1-RC4:1.10.2.2
	matt-nb5-mips64-k15:1.10.2.1.4.1
	netbsd-5-1-RC3:1.10.2.2
	netbsd-5-1-RC2:1.10.2.2
	netbsd-5-1-RC1:1.10.2.2
	netbsd-5-0-2-RELEASE:1.10.2.1
	matt-nb5-mips64-premerge-20091211:1.10.2.1
	matt-premerge-20091211:1.11
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.10.2.1
	matt-nb4-mips64-k7-u2a-k9b:1.10.2.1
	matt-nb5-mips64-u1-k1-k5:1.10.2.1
	matt-nb5-mips64:1.10.2.1.0.4
	netbsd-5-0-1-RELEASE:1.10.2.1
	jym-xensuspend-nbase:1.11
	netbsd-5-0:1.10.2.1.0.2
	netbsd-5-0-RELEASE:1.10.2.1
	netbsd-5-0-RC4:1.10.2.1
	netbsd-5-0-RC3:1.10.2.1
	netbsd-5-0-RC2:1.10.2.1
	jym-xensuspend:1.11.0.2
	jym-xensuspend-base:1.11
	netbsd-5-0-RC1:1.10.2.1
	netbsd-5:1.10.0.2
	netbsd-5-base:1.10
	matt-mips64-base2:1.10
	matt-mips64:1.5.0.16
	netbsd-4-0-1-RELEASE:1.5
	wrstuden-revivesa-base-3:1.8
	wrstuden-revivesa-base-2:1.8
	wrstuden-fixsa-newbase:1.5
	wrstuden-revivesa-base-1:1.7
	yamt-pf42-base4:1.7
	yamt-pf42-base3:1.7
	hpcarm-cleanup-nbase:1.7
	yamt-pf42-baseX:1.7
	yamt-pf42-base2:1.7
	wrstuden-revivesa:1.7.0.6
	wrstuden-revivesa-base:1.7
	yamt-pf42:1.7.0.4
	yamt-pf42-base:1.7
	keiichi-mipv6-nbase:1.7
	keiichi-mipv6:1.7.0.2
	keiichi-mipv6-base:1.7
	matt-armv6-nbase:1.7
	matt-armv6-prevmlocking:1.5
	wrstuden-fixsa-base-1:1.5
	netbsd-4-0:1.5.0.14
	netbsd-4-0-RELEASE:1.5
	cube-autoconf:1.5.0.12
	cube-autoconf-base:1.5
	netbsd-4-0-RC5:1.5
	netbsd-4-0-RC4:1.5
	netbsd-4-0-RC3:1.5
	netbsd-4-0-RC2:1.5
	netbsd-4-0-RC1:1.5
	matt-armv6:1.5.0.10
	matt-armv6-base:1.5
	matt-mips64-base:1.5
	hpcarm-cleanup:1.5.0.8
	hpcarm-cleanup-base:1.7
	wrstuden-fixsa:1.5.0.6
	wrstuden-fixsa-base:1.5
	abandoned-netbsd-4-base:1.5
	abandoned-netbsd-4:1.5.0.2
	netbsd-4:1.5.0.4
	netbsd-4-base:1.5;
locks; strict;
comment	@# @;


1.13
date	2010.08.26.14.58.30;	author christos;	state dead;
branches;
next	1.12;

1.12
date	2010.01.22.16.41.57;	author sborrill;	state Exp;
branches;
next	1.11;

1.11
date	2008.12.12.21.41.04;	author christos;	state Exp;
branches;
next	1.10;

1.10
date	2008.10.18.14.40.48;	author scw;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2008.10.18.12.32.50;	author scw;	state Exp;
branches;
next	1.8;

1.8
date	2008.08.30.07.33.58;	author christos;	state Exp;
branches;
next	1.7;

1.7
date	2008.02.16.07.23.37;	author matt;	state Exp;
branches
	1.7.6.1;
next	1.6;

1.6
date	2008.01.26.21.50.22;	author christos;	state Exp;
branches;
next	1.5;

1.5
date	2006.04.12.15.35.34;	author rpaulo;	state Exp;
branches
	1.5.10.1;
next	1.4;

1.4
date	2006.03.02.04.49.25;	author dyoung;	state Exp;
branches;
next	1.3;

1.3
date	2005.11.17.13.55.29;	author rpaulo;	state Exp;
branches;
next	1.2;

1.2
date	2005.10.01.20.46.43;	author christos;	state Exp;
branches;
next	1.1;

1.1
date	2005.10.01.18.50.12;	author scw;	state Exp;
branches;
next	;

1.10.2.1
date	2009.01.22.22.58.01;	author snj;	state Exp;
branches
	1.10.2.1.4.1;
next	1.10.2.2;

1.10.2.2
date	2010.01.27.21.42.23;	author bouyer;	state Exp;
branches;
next	;

1.10.2.1.4.1
date	2010.04.21.05.27.22;	author matt;	state Exp;
branches;
next	;

1.7.6.1
date	2008.09.18.04.30.16;	author wrstuden;	state Exp;
branches;
next	;

1.5.10.1
date	2008.03.23.00.50.09;	author matt;	state Exp;
branches;
next	;


desc
@@


1.13
log
@bye old wpa.
@
text
@# $NetBSD: Makefile,v 1.12 2010/01/22 16:41:57 sborrill Exp $

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

PROG=	wpa_supplicant
SRCS=	aes.c aes_wrap.c base64.c blacklist.c common.c config.c config_file.c \
	ctrl_iface.c ctrl_iface_unix.c driver_bsd.c drivers.c eap_common.c \
	eap_methods.c eapol_supp_sm.c eloop.c events.c l2_packet_freebsd.c \
	main.c md5.c os_unix.c pmksa_cache.c preauth.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

MAN=	wpa_supplicant.8 wpa_supplicant.conf.5

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

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

CPPFLAGS+= -DCONFIG_DRIVER_BSD
CPPFLAGS+= -DCONFIG_CTRL_IFACE
CPPFLAGS+= -DCONFIG_DEBUG_FILE
DPADD+=	${LIBPCAP}
LDADD+=	-lpcap

.if !defined(NO_ENABLE_WPA_SUPPLICANT_EAPOL)
SRCS+=	eap.c
CPPFLAGS+= -DIEEE8021X_EAPOL

.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
CPPFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
	-DEAP_TLV -DEAP_TLS_FUNCS
SRCS+=	chap.c crypto_openssl.c eap_leap.c eap_mschapv2.c \
	eap_peap.c eap_psk.c eap_psk_common.c eap_tls.c eap_tls_common.c \
	mschapv2.c ms_funcs.c tls_openssl.c eap_peap_common.c

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

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

DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
LDADD+= -lssl -lcrypto -ldes
.else
CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1
SRCS+=	tls_none.c
.endif

.endif

.include <bsd.prog.mk>
@


1.12
log
@Enable CONFIG_DEBUG_FILE option to allow debug messages to be sent to
a file instead of stdout.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2008/12/12 21:41:04 christos Exp $
@


1.11
log
@don't need this anymore.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2008/10/18 14:40:48 scw Exp $
d28 1
@


1.10
log
@Fix previous.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2008/10/18 12:32:50 scw Exp $
d7 1
a7 1
	ctrl_iface.c ctrl_iface_unix.c driver_netbsd.c drivers.c eap_common.c \
@


1.10.2.1
log
@Pull up following revision(s) (requested by christos in ticket #301):
	usr.sbin/wpa/wpa_supplicant/Makefile: revision 1.11
	usr.sbin/wpa/wpa_supplicant/driver_netbsd.c: file removal
don't need this anymore.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2008/10/18 14:40:48 scw Exp $
d7 1
a7 1
	ctrl_iface.c ctrl_iface_unix.c driver_bsd.c drivers.c eap_common.c \
@


1.10.2.1.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10.2.2 2010/01/27 21:42:23 bouyer Exp $
a27 1
CPPFLAGS+= -DCONFIG_DEBUG_FILE
@


1.10.2.2
log
@Pull up following revision(s) (requested by sborrill in ticket #1267):
	usr.sbin/wpa/wpa_supplicant/Makefile: revision 1.12
	usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8: revision 1.6
	usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8: revision 1.7
Enable CONFIG_DEBUG_FILE option to allow debug messages to be sent to
a file instead of stdout.
-f is not mandatory.
@
text
@d1 1
a1 1
# $NetBSD$
a27 1
CPPFLAGS+= -DCONFIG_DEBUG_FILE
@


1.9
log
@Ditch crypto_libc.c in favour of the internal AES/MD5/SHA1 implementations
in the WPA distribution when building without native crypto.

For hostapd in particular, using crypto_libc.c unconditionally meant that
up until now the program has been pretty much unusable for anything which
requires cryptographic key exchanges. E.g. WPA/WPA2.

Also add support for a range of authentication protocols (EAP) in hostapd
if we're building with native crypto support.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 2008/08/30 07:33:58 christos Exp $
d6 1
a6 1
SRCS=	aes_wrap base64.c blacklist.c common.c config.c config_file.c \
d53 1
a53 1
SRCS+=	tls_none.c aes.c
@


1.8
log
@adjust to 0.64
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 2008/02/16 07:23:37 matt Exp $
d6 6
a11 6
SRCS=	base64.c blacklist.c common.c config.c config_file.c ctrl_iface.c \
	ctrl_iface_unix.c driver_netbsd.c drivers.c eap_common.c eap_methods.c \
	eapol_supp_sm.c eloop.c events.c l2_packet_freebsd.c main.c md5.c \
	os_unix.c pmksa_cache.c preauth.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 mschapv2.c
d38 1
a38 1
SRCS+=	aes_wrap.c chap.c crypto_openssl.c eap_leap.c eap_mschapv2.c \
d40 1
a40 1
	ms_funcs.c tls_openssl.c eap_peap_common.c
d52 2
a53 1
SRCS+=	tls_none.c crypto_libc.c
@


1.7
log
@Change incorrect use of CFLAGS to CPPFLAGS.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2008/01/26 21:50:22 christos Exp $
d11 1
a11 1
	wpas_glue.c
d40 1
a40 1
	eap_tlv.c ms_funcs.c tls_openssl.c
@


1.7.6.1
log
@Sync with wrstuden-revivesa-base-2.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 2008/02/16 07:23:37 matt Exp $
d11 1
a11 1
	wpas_glue.c mschapv2.c
d40 1
a40 1
	ms_funcs.c tls_openssl.c eap_peap_common.c
@


1.6
log
@Adjust to the new wpa tree structure.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 2006/04/12 15:35:34 rpaulo Exp $
d36 1
a36 1
CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
@


1.5
log
@Pull ../Makefile.inc and override PATH.c.
Adapt to WPA supplicant 0.4.8.
Change the logic behind ENABLE_WPA_SUPPLICANT_EAPOL: it's now enabled by
default (EAP code has been reviewed by FreeBSD folks according to Sam Leffer).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2006/03/02 04:49:25 dyoung Exp $
d6 6
a11 4
SRCS=	aes_wrap.c base64.c common.c config.c config_file.c \
	ctrl_iface.c driver_netbsd.c drivers.c eloop.c events.c \
	l2_packet.c main.c md5.c preauth.c rc4.c sha1.c wpa.c \
	wpa_supplicant.c
d15 10
a24 1
.PATH.c: ${.CURDIR}/.. ${WPA_SUPPLICANT_DISTDIR}
a25 1
CPPFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
a27 1
CFLAGS+= -g
d32 1
a32 1
SRCS+=	eapol_sm.c eap.c
d38 3
a40 3
SRCS+=	eap_tls.c eap_peap.c eap_mschapv2.c eap_leap.c eap_psk.c \
	eap_psk_common.c eap_tlv.c eap_tls_common.c tls_openssl.c \
	ms_funcs.c crypto.c
d52 1
a52 1
SRCS+=	tls_none.c
@


1.5.10.1
log
@sync with HEAD
@
text
@d1 1
a1 1
# Makefile,v 1.5 2006/04/12 15:35:34 rpaulo Exp
d6 4
a9 6
SRCS=	base64.c blacklist.c common.c config.c config_file.c ctrl_iface.c \
	ctrl_iface_unix.c driver_netbsd.c drivers.c eap_common.c eap_methods.c \
	eapol_supp_sm.c eloop.c events.c l2_packet_freebsd.c main.c md5.c \
	os_unix.c pmksa_cache.c preauth.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
d13 1
a13 10
.PATH.c:  \
	${WPA_SUPPLICANT_DISTDIR} \
	${WPA_DISTDIR}/src/drivers \
	${WPA_DISTDIR}/src/eap_peer \
	${WPA_DISTDIR}/src/rsn_supp

CPPFLAGS+= \
	-I${WPA_SUPPLICANT_DISTDIR} \
	-I${WPA_DISTDIR}/src/drivers \
	-I${WPA_DISTDIR}/src/rsn_supp
d15 1
d18 1
d23 1
a23 1
SRCS+=	eap.c
d27 1
a27 1
CPPFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
d29 3
a31 3
SRCS+=	aes_wrap.c chap.c crypto_openssl.c eap_leap.c eap_mschapv2.c \
	eap_peap.c eap_psk.c eap_psk_common.c eap_tls.c eap_tls_common.c \
	eap_tlv.c ms_funcs.c tls_openssl.c
d43 1
a43 1
SRCS+=	tls_none.c crypto_libc.c
@


1.4
log
@Makefile nit: put -Ddefinitions into CPPFLAGS instead of CFLAGS,
since we need the -Ddefinitions not just for cc(1), but for cpp(1),
lint(1), etc.
@
text
@d1 3
a3 1
# $NetBSD: Makefile,v 1.3 2005/11/17 13:55:29 rpaulo Exp $
d6 4
a9 3
SRCS=	config.c eloop.c common.c md5.c rc4.c sha1.c aes_wrap.c \
	wpa_supplicant.c wpa.c \
	ctrl_iface.c l2_packet.c drivers.c driver_netbsd.c
d13 1
a13 2
# XXX for l2_packet.c
.PATH.c: ${.CURDIR}/..
d22 1
a22 1
.if defined(ENABLE_WPA_SUPPLICANT_EAPOL)
d27 1
a27 1
CPPFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
d30 2
a31 1
	eap_tlv.c eap_tls_common.c tls_openssl.c ms_funcs.c crypto.c
@


1.3
log
@If ENABLE_WPA_SUPPLICANT_EAPOL is defined, add libdes to ${DPADD} and
${LDADD} so that it builds fine.
While there, add libssl to ${DPADD}.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2005/10/01 20:46:43 christos Exp $
d13 3
a15 3
CFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
CFLAGS+= -DCONFIG_DRIVER_BSD
CFLAGS+= -DCONFIG_CTRL_IFACE
d22 1
a22 1
CFLAGS+= -DIEEE8021X_EAPOL
d25 1
a25 1
CFLAGS+=-DEAP_TLS -DEAP_PEAP -DEAP_MSCHAPv2 -DEAP_LEAP -DEAP_PSK \
d30 1
a30 1
CFLAGS+=-DEAP_TTLS -DEAP_MD5
d34 1
a34 1
#CFLAGS+= -DEAP_FAST
@


1.2
log
@make this build again after the source move to gnu/dist.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1 2005/10/01 18:50:12 scw Exp $
d37 2
a38 2
DPADD+= ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
@


1.1
log
@Add wpa_cli and wpa_supplicant, based on Sam Leffler's work for FreeBSD.

NetBSD can now access a WPA-encrypted wireless LAN.
@
text
@d1 1
a1 4
# $NetBSD$

WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../dist/wpa_supplicant
.PATH: ${.CURDIR}/.. ${WPA_SUPPLICANT_DISTDIR}
d10 3
@