Commit Graph

127 Commits

Author SHA1 Message Date
Simon J. Gerraty
34b33809b7 Updated dependencies 2013-10-13 00:24:00 +00:00
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