Commit Graph

176 Commits

Author SHA1 Message Date
Simon J. Gerraty
d1d0158641 Merge from head 2013-09-05 20:18:59 +00:00
Rui Paulo
f05cddf940 Merge hostapd / wpa_supplicant 2.0.
Reviewed by:	adrian (driver_bsd + usr.sbin/wpa)
2013-07-04 21:12:58 +00:00
Eitan Adler
ffa7c28828 Teach wpa_supplicant to properly compute wireless signal strength.
PR:		bin/170631
Submitted by:	Daan Vreeken <Daan@vitsch.nl>
Reviewed by:	adrian
2013-05-11 20:55:14 +00:00
Simon J. Gerraty
7cf3a1c6b2 Updated dependencies 2013-03-11 17:21:52 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
David E. O'Brien
d9a447559b Sync with HEAD. 2013-02-08 16:10:16 +00:00
Isabell Long
7c6257cffe Document all of the options that wpa_supplicant accepts.
PR:		docs/171755
Reviewed by:	gavin
Approved by:	gabor (mentor)
MFC after:	5 days
2012-11-07 15:47:36 +00:00
Simon J. Gerraty
23090366f7 Sync from head 2012-11-04 02:52:03 +00:00
Marcel Moolenaar
7750ad47a9 Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
2012-08-22 19:25:57 +00:00
Glen Barber
abded2bcf2 Xref mwl(4) and rum(4) in hostapd(8).
MFC after:	3 days
2012-07-18 23:32:12 +00:00
Warren Block
344c81a166 Fixes to man8 groff mandoc style, usage mistakes, or typos.
PR:		168016
Submitted by:	Nobuyuki Koganemaru
Approved by:	gjb
MFC after:	3 days
2012-05-24 02:24:03 +00:00
Glen Barber
47d29bba92 Reword hostapd.conf(5) sentence.
Suggested by:	hrs
MFC after:	3 days
X-MFC-With:	r235337 (a bit delayed...)
2012-05-16 01:59:09 +00:00
Joel Dahl
4228c8a2b1 Remove end of line whitespace. 2012-05-12 19:59:37 +00:00
Glen Barber
7b1d17a1bc General mdoc(7) and typo fixes.
PR:		167804
Submitted by:	Nobuyuki Koganemaru (kogane!jp.freebsd.org)
MFC after:	3 days
2012-05-12 15:08:22 +00:00
Bernhard Schmidt
620c4e951f 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
2012-04-29 12:48:52 +00:00
Bernhard Schmidt
d9246288a0 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
2012-04-28 11:11:53 +00:00
Bernhard Schmidt
80bcb7437d not only the file names have changed from eap_xxx.c to eap_server_xxx.c,
the defines too

MFC after:	2 weeks
2012-04-28 11:02:32 +00:00
Bernhard Schmidt
2e8de11a06 enable EAP_GTC and EAP_OTP to match upstream's default configuration
MFC after:	2 weeks
2012-04-28 11:01:12 +00:00
Bernhard Schmidt
9243c06122 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
2012-04-28 10:59:29 +00:00
David Chisnall
57c4d565e2 Add a note to hostapd.conf about an unhelpful error message in the hope that
it won't confuse anyone else in the future.

MFC after:	1 week
2012-04-27 15:35:09 +00:00
Bernhard Schmidt
54ad8e8273 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.

Tested by:	Johann Hugo <jhugo at meraka.csir.co.za>
MFC after:	2 weeks
2012-04-26 17:35:11 +00:00
Kevin Lo
870a6d5181 Mention run(4) 2012-02-09 08:33:04 +00:00
Ed Maste
b0ba9fbc47 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
2012-01-18 02:44:22 +00:00
Ulrich Spörlein
3df5ecac8c Spelling fixes for usr.sbin/ 2011-12-30 10:58:14 +00:00
Kevin Lo
fdb6437f73 Remove duplicated header files 2011-06-24 07:05:20 +00:00
David E. O'Brien
1e3f14466b * Add the readline(3) API to libedit. The libedit versions of
{readline,history}.h are in /usr/include/edit so as to not conflict with
  the GNU libreadline versions.  To use the libedit readline(3) one should
  add "-I/usr/include/edit" to their Makefile
  (spelled "-I${DESTDIR}/${INCLUDEDIR}/edit" within the FreeBSD source tree).

* Enable its use in the BSD licensed utilities that support readline(3).

* To make it easier to sync libedit development with NetBSD, histedit.h
  is moved into libedit's directory as history shows shown we keep merging
  it into that location.

Obtained from:	NetBSD
Sponsored by:	Juniper Networks
2011-04-05 18:41:01 +00:00
Warner Losh
4b30d59062 Add notes about ASCII/Hex WEP keys 2011-02-20 17:54:49 +00:00
Bernhard Schmidt
1375a2d077 Fix build on bigendian archs. 2010-12-19 09:18:14 +00:00
Bernhard Schmidt
2f4f5fffa5 Unbreak hostapd. This code has been explicitly removed in upstream versions. 2010-12-18 20:29:41 +00:00
Bernhard Schmidt
32d18ddd6d Fix some whitespace nits. 2010-12-18 20:27:09 +00:00
Bernhard Schmidt
fd7e85ad14 Change order in wpa_driver_bsd_ops to match upstream code. Add description
while here.
2010-12-18 20:25:25 +00:00
Bernhard Schmidt
85b9231041 Add a comment explaining the undefs, while here remove one which is not
required.
2010-12-18 20:23:28 +00:00
Bernhard Schmidt
78092e9221 Rename bsd_set_iface_flags to bsd_ctrl_iface and change arguments to match
upstream. For the same reason rewrite bsd_get_seqnum.
2010-12-18 20:22:15 +00:00
Bernhard Schmidt
5db98cc304 Import bsd_configure_wpa() to sync with upstream code. 2010-12-18 20:17:10 +00:00
Bernhard Schmidt
916753954d Prefer os_memset, os_strlcpy and os_free. While here adjust the return
value checks for 2 ioctl calls and rewrite error handling in bsd_init
to better integrate with upstream code.
2010-12-18 20:15:47 +00:00
Bernhard Schmidt
eb79579b7f Remove some unused variables and unnecessary casts. 2010-12-18 20:13:42 +00:00
Bernhard Schmidt
c40a627cbf Remove debug messages which are no longer present in upstream code. While
here remove some explicit line breaks.
2010-12-18 20:11:09 +00:00
Bernhard Schmidt
14ad6b5c09 Rename iface to ifname to match the upstream code. 2010-12-18 20:08:21 +00:00
Bernhard Schmidt
fa9823dc59 Rename ioctl_sock to just sock to match the upstream code. While here
remove the no longer used wext_sock and bsd_driver_ops variables.
2010-12-18 20:04:47 +00:00
Bernhard Schmidt
1bff693455 Move some functions around to match the upstream order. 2010-12-18 20:00:28 +00:00
Bernhard Schmidt
aae0884ea6 Add bsd_send_mlme_param to aggregate IEEE80211_IOC_MLME ioctls:
- merge bsd_set_sta_authorized and bsd_sta_set_flags
- change bsd_set_sta_authorized, bsd_sta_deauth and bsd_sta_disassoc
  to use bsd_send_mlme_param
2010-12-18 19:58:23 +00:00
Bernhard Schmidt
fbd8297efc Change bsd_del_key() to match upstream code:
- change order of if/else
- move wpa_printf() into the condition
- change unsigned char* to u8*
- prefer os_memset/os_memcpy
2010-12-18 19:56:45 +00:00
Bernhard Schmidt
0a8a5ceb3b Aggregate SIOCS80211 and SIOCG80211 ioctl request code. While here, bring
the wpa_printf()/perror() messages in sync with upstream code.
2010-12-18 19:55:19 +00:00
Rui Paulo
5d6ccd39d5 Adapt for wpa_supplicant / hostapd 0.7.3. 2010-11-03 10:44:25 +00:00
Ulrich Spörlein
b6514098d6 mdoc: remove unused/empty macros 2010-08-02 13:11:27 +00:00
Bernhard Schmidt
5d766a09da - Introduce IEEE80211_KEY_NOREPLAY, a per-key flag to ignore replay
violations.
- Use SIOCGIFMEDIA to determine VAP's opmode, cache it and set
  IEEE80211_KEY_NOREPLAY for AHDEMO and IBSS.

Approved by:	rpaulo (mentor)
2010-07-01 20:50:12 +00:00
Rui Paulo
85afbc31fa Update for hostapd & wpa_supplicant 0.6.10. 2010-06-14 15:38:30 +00:00
Ulrich Spörlein
0b31f1f731 mdoc: move remaining sections into consistent order
This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections.

Found by:	mdocml lint run
Reviewed by:	ru
2010-05-13 12:08:11 +00:00
Bernhard Schmidt
632ee7e3a4 Add WPA-None support:
* WPA-None requires ap_scan=2:
  The major difference between ap_scan=1 (default) and 2 is, that no
  IEEE80211_IOC_SCAN* ioctls/functions are called, though, there is a
  dependency on those. For example the call to wpa_driver_bsd_scan()
  sets the interface UP, this never happens, therefore the interface
  must be marked up in wpa_driver_bsd_associate(). IEEE80211_IOC_SSID
  also is not called, which means that the SSID has not been set prior
  to the IEEE80211_MLME_ASSOC call.
* WPA-None has no support for sequence number updates, it doesn't make
  sense to check for replay violations..
* I had some crashes right after the switch to RUN state, issue is
  that sc->sc_lastrs was not yet defined.

Approved by:	rpaulo (mentor)
MFC after:	3 weeks
2010-04-10 13:54:00 +00:00
Sam Leffler
41fe1fab16 Enable _DIRENT_HAVE_D_TYPE so wpa_cli scans directories properly
for it's unix domain socket.  Before this change wpa_cli would take
the first file in the directory that was not "." or "..".

Submitted by:	Brandon Gooch <jamesbrandongooch@gmail.com>
MFC after:	3 days
2009-08-23 16:04:10 +00:00
Sam Leffler
4365f62b1e fix Jouni's email address
Approved by:	re (blanket)
2009-07-12 19:58:52 +00:00
Maxim Konovalov
fe7bc8cbab o Fix usage() prototype [1] and correct its call.
Submitted by:	ed [1]
2009-06-23 08:51:11 +00:00
Maxim Konovalov
c07af67dc8 o style(9) usage() definition: it doesn't need an argument. 2009-06-23 05:55:56 +00:00
Maxim Konovalov
6e5f06fead o Remove unneeded argument in fprintf(3) call in usage().
Submitted by:	Pawel Worach
2009-06-23 05:51:48 +00:00
Sam Leffler
a4327a3b75 Do not force the mtu to 2290; this was done to insure large EAPOL frames
could be handled w/o fragmentation but clobbers user-specified values
such as those required when the interface is bridged.

Submitted by:	jim@netgate.com
Reviewed by:	Jouni Malinen
MFC after:	3 days
2009-06-05 17:19:55 +00:00
Sam Leffler
eb239d2abd no need to for gnu89 any more 2009-03-15 01:39:16 +00:00
David Schultz
14b55f2f95 Fix build breakage due to the interplay between r189801 and r189824.
In particular, vendor sources that aren't ready for gnu99 should
still be compiled with gnu89. (Before r189824, these would have
generated warnings if you tried to compile them in gnu99 mode,
but the warnings went unheeded due to -Wno-error.)
2009-03-14 22:50:03 +00:00
Sam Leffler
fe708974cd uupdate for 0.6.8 2009-03-02 04:12:41 +00:00
Sam Leffler
79d440447a update for 0.6.8 2009-03-02 04:11:34 +00:00
Sam Leffler
8c70527566 update for 0.6.8 2009-03-02 04:10:40 +00:00
Sam Leffler
7a77de1cac update to 0.6.8
Reviewed by:	thompsa
2009-03-02 02:28:22 +00:00
Sam Leffler
ca38400838 use ansi prototypes
Submitted by:	Pawel Worach <pawel.worach@gmail.com>
2009-03-01 08:01:38 +00:00
Warner Losh
57906381b6 'Strict EAP conformance' makes more sense here than 'String EAP
conformance.'
2008-11-21 18:15:39 +00:00
Daniel Gerzo
283146a239 - 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
2008-07-01 21:52:49 +00:00
Sam Leffler
a18abc8eeb o update for vaps
o add private wired driver that fixes various bugs in the vendor version

Submitted by:	thompsa (ndis fixups)
2008-04-20 20:40:45 +00:00
Sam Leffler
02d51d96ad o update for vaps
o add+enable radius acl support

Supported by:	Hobnob
Submitted by:	Chris Zimmermann (acl support)
2008-04-20 20:39:08 +00:00
Sam Leffler
b685f674de enable syslog support and add -s option to the man page
MFC after:	3 weeks
2008-03-24 20:19:20 +00:00
Christian Brueffer
4bf10a52b0 Add some missing Xrefs to drivers.
MFC after:	3 days
2008-02-21 20:44:25 +00:00
Sam Leffler
74301f9edd enable wired driver support
Submitted by:	"Paul B. Mahol" <onemda@gmail.com>
MFC after:	1 week
2007-12-20 00:52:02 +00:00
Sam Leffler
feb75830c0 install hostapd.conf and related files for folks that don't have source
MFC after:	1 week
2007-11-10 20:27:09 +00:00
Sam Leffler
de663031eb fix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL
MFC after:	1 week
2007-11-10 20:26:08 +00:00
Sam Leffler
3181d4992d install sample wpa_supplicant.conf; not everyone has source to reference 2007-11-10 20:24:28 +00:00
Andrew Thompson
5090437236 Change wpa_supplicant to down the interface at the start of the init routine.
wpa_supplicant expects that it has exclusive access to the net80211 state so
when its starts poking in the WEP/WPA settings and the card is already
scanning it can cause net80211 to try and associate incorrectly with a
protected AP.

This is an inconvenience for firmware based cards such as iwi where it can be
sent an auth instruction with incomplete security info and cause a firmware
error.

Remove the 'ifconfig up' from network.subr since wpa_supplicant will
immediately down the interface again.

Reported by:	Guy Helmer (and others)
Reviewed by:	sam, brooks, avatar
MFC after:	3 days
2007-11-05 06:13:07 +00:00
Simon L. B. Nielsen
e9d5ba06c9 Document the '-P pidfile' command line argument.
PR:		docs/116658
Submitted by:	Henrik Brix Andersen <henrik@brixandersen.dk>
MFC after:	3 days
2007-10-26 16:12:32 +00:00
Max Laier
3765fc7d77 Update for libpcap 0.9.8 2007-10-16 02:12:06 +00:00
Kevin Lo
89d4e7b7da Remove a -N flag.
Reviewed by: sam
Approved by: re (kensmith)
2007-10-02 01:22:14 +00:00
Sam Leffler
b917d7d326 fix building with NO_CRYPT=true
PR:		116439
Approved by:	re (gnn)
2007-09-28 15:52:28 +00:00
Sam Leffler
8d7130ccbc 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
2007-09-25 16:08:16 +00:00
Christian Brueffer
1a1278aecf Remove stray comma left over from previous commit.
Approved by:	re (blanket)
2007-09-07 22:19:29 +00:00
Gabor Kovesdan
9b7995f5f5 - Remove reference for unexisting ndisapi(9)
PR:		docs/113127
Submitted by:	"O. Hartmann"<ohartman@mail.zedat.fu-berlin.de>
Reviewed by:	keramida
Approved by:	re (bmah)
MFC after:	3 days
2007-09-07 21:58:58 +00:00
Simon L. B. Nielsen
ab1438fb95 The wpa_passphrase(8) manual page states that it first appeared in
FreeBSD 6.2, but it didn't make it into RELENG_6_2.

Update the manual page to say "FreeBSD 6.3".

PR:		docs/114429
Submitted by:	Henrik Brix Andersen <henrik@brixandersen.dk>
MFC after:	3 days
Approved by:	re (bmah)
2007-07-17 22:28:51 +00:00
Sam Leffler
f5d5722e6d 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)
2007-07-11 16:04:08 +00:00
Sam Leffler
80e9f71ab5 update for 0.5.8 import
Approved by:	re (hrs)
2007-07-09 16:26:48 +00:00
Sam Leffler
552e0ccfb2 fixup mcast handling in bpf program; this enables forthcoming support
for 802.1x over wired interfaces

Submitted by:	Jouke Witteveen
Approved by:	re (hrs)
2007-07-09 15:57:10 +00:00
Sam Leffler
c49cc04cee track net80211 changes to get scan results ioctl 2007-06-11 03:57:46 +00:00
Sam Leffler
51b527aa32 must byte swap key rsc for big-endian systems
Obtained from:	netbsd
MFC after:	1 week
2007-04-26 20:19:05 +00:00
Sam Leffler
52f01b3b0e add wpa_passphrase utility to the build
PR:		bin/104457
Submitted by:	Henrik Brix Andersen
MFC after:	1 week
2006-11-17 19:38:51 +00:00
Ruslan Ermilov
bc84aa4ba3 Markup fixes. 2006-09-29 17:57:04 +00:00
Sam Leffler
b3f627ac81 incorporate Rui Paulo's work
Obtained from:	netbsd
2006-09-02 17:56:24 +00:00
Sam Leffler
c824b333f6 avoid null ptr deref
Obtained from:	netbsd
2006-05-27 23:04:30 +00:00
Sam Leffler
2767a3d79c correct static array overrun
Obtained from:	netbsd
2006-05-27 23:03:08 +00:00
Sam Leffler
bd6b0820f8 add debug msg 2006-04-20 05:03:21 +00:00
Sam Leffler
d533f717f0 remove some unnecessary perror calls
Noticed by:	Jouni Malinen
MFC after:	2 weeks
2006-04-17 00:17:29 +00:00
Ruslan Ermilov
e4a9274404 Add missing library dependencies. 2006-04-13 12:49:24 +00:00
Sam Leffler
2220e69353 adapt PacketGetAdapterNames to 0.4.8 calling convention
PR:		bin/94735
Submitted by:	Scot Hetzel <swhetzel@gmail.com>
Requested by:	scottl
2006-04-12 17:12:04 +00:00
Ruslan Ermilov
e1fe3dba5c 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)
2006-03-17 18:54:44 +00:00
Hiroki Sato
999b97c5e7 Fix version number when the feature was added.
Submitted by:	Yoshihiko Sarumaru (mistral at imasy dot or dot jp)
PR:		docs/93801 and docs/93803
MFC after:	2 days
2006-03-07 18:25:03 +00:00
Sam Leffler
99122c96a3 update for v0.4.8 import of wpa_supplicant and hostapd
MFC after:	2 weeks
2006-03-07 05:54:20 +00:00
Sam Leffler
7097537784 use the specified key index for non-group keys; this fixes static
wep key configure at key indices > 0 and 802.1x/EAPOL operation
with ap's that want the station to install a key at indices > 0.

Hard work by:	Joe Love
Reviewed by:	avatar
MFC after:	1 week
2006-02-21 23:55:38 +00:00
Sam Leffler
b3babfdc25 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
2006-02-14 23:51:21 +00:00