- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge hostapd / wpa_supplicant 2.0.

Reviewed by: adrian (driver_bsd + usr.sbin/wpa)

Teach wpa_supplicant to properly compute wireless signal strength.

PR: bin/170631
Submitted by: Daan Vreeken <Daan@vitsch.nl>
Reviewed by: adrian

Document all of the options that wpa_supplicant accepts.

PR: docs/171755
Reviewed by: gavin
Approved by: gabor (mentor)
MFC after: 5 days

Xref mwl(4) and rum(4) in hostapd(8).

MFC after: 3 days

Fixes to man8 groff mandoc style, usage mistakes, or typos.

PR: 168016
Submitted by: Nobuyuki Koganemaru
Approved by: gjb
MFC after: 3 days

Reword hostapd.conf(5) sentence.

Suggested by: hrs
MFC after: 3 days
X-MFC-With: r235337 (a bit delayed...)

Remove end of line whitespace.

General mdoc(7) and typo fixes.

PR: 167804
Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org)
MFC after: 3 days

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

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

not only the file names have changed from eap_xxx.c to eap_server_xxx.c,
the defines too

MFC after: 2 weeks

enable EAP_GTC and EAP_OTP to match upstream's default configuration

MFC after: 2 weeks

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

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

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

Mention run(4)

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

Spelling fixes for usr.sbin/

Remove duplicated header files

* 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

Add notes about ASCII/Hex WEP keys

Fix build on bigendian archs.

Unbreak hostapd. This code has been explicitly removed in upstream versions.

Fix some whitespace nits.

Change order in wpa_driver_bsd_ops to match upstream code. Add description
while here.

Add a comment explaining the undefs, while here remove one which is not
required.

Rename bsd_set_iface_flags to bsd_ctrl_iface and change arguments to match
upstream. For the same reason rewrite bsd_get_seqnum.

Import bsd_configure_wpa() to sync with upstream code.

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.

Remove some unused variables and unnecessary casts.

Remove debug messages which are no longer present in upstream code. While
here remove some explicit line breaks.

Rename iface to ifname to match the upstream code.

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.

Move some functions around to match the upstream order.

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

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

Aggregate SIOCS80211 and SIOCG80211 ioctl request code. While here, bring
the wpa_printf()/perror() messages in sync with upstream code.

Adapt for wpa_supplicant / hostapd 0.7.3.

mdoc: remove unused/empty macros

- 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)

Update for hostapd & wpa_supplicant 0.6.10.

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

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

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

fix Jouni's email address

Approved by: re (blanket)

o Fix usage() prototype [1] and correct its call.

Submitted by: ed [1]

o style(9) usage() definition: it doesn't need an argument.

o Remove unneeded argument in fprintf(3) call in usage().

Submitted by: Pawel Worach

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

no need to for gnu89 any more

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.)

uupdate for 0.6.8

update for 0.6.8

update for 0.6.8

update to 0.6.8

Reviewed by: thompsa

use ansi prototypes

Submitted by: Pawel Worach <pawel.worach@gmail.com>

'Strict EAP conformance' makes more sense here than 'String EAP
conformance.'

- 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

o update for vaps
o add private wired driver that fixes various bugs in the vendor version

Submitted by: thompsa (ndis fixups)

o update for vaps
o add+enable radius acl support

Supported by: Hobnob
Submitted by: Chris Zimmermann (acl support)

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

MFC after: 3 weeks

Add some missing Xrefs to drivers.

MFC after: 3 days

enable wired driver support

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

install hostapd.conf and related files for folks that don't have source

MFC after: 1 week

fix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL

MFC after: 1 week

install sample wpa_supplicant.conf; not everyone has source to reference

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

Document the '-P pidfile' command line argument.

PR: docs/116658
Submitted by: Henrik Brix Andersen <henrik@brixandersen.dk>
MFC after: 3 days

Update for libpcap 0.9.8

Remove a -N flag.

Reviewed by: sam
Approved by: re (kensmith)

fix building with NO_CRYPT=true

PR: 116439
Approved by: re (gnn)

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

Remove stray comma left over from previous commit.

Approved by: re (blanket)

- 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

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)

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)

update for 0.5.8 import

Approved by: re (hrs)

fixup mcast handling in bpf program; this enables forthcoming support
for 802.1x over wired interfaces

Submitted by: Jouke Witteveen
Approved by: re (hrs)

track net80211 changes to get scan results ioctl

must byte swap key rsc for big-endian systems

Obtained from: netbsd
MFC after: 1 week

add wpa_passphrase utility to the build

PR: bin/104457
Submitted by: Henrik Brix Andersen
MFC after: 1 week

Markup fixes.

incorporate Rui Paulo's work

Obtained from: netbsd

avoid null ptr deref

Obtained from: netbsd

correct static array overrun

Obtained from: netbsd

add debug msg

remove some unnecessary perror calls

Noticed by: Jouni Malinen
MFC after: 2 weeks

Add missing library dependencies.

adapt PacketGetAdapterNames to 0.4.8 calling convention

PR: bin/94735
Submitted by: Scot Hetzel <swhetzel@gmail.com>
Requested by: scottl

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)

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

update for v0.4.8 import of wpa_supplicant and hostapd

MFC after: 2 weeks

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

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

Add an example for WEP.

OK-ed by: sam

Hide a diagnostic message under if (verbose) to avoid cluttering the
system log when not in verbose logging mode.

Fix small grammar nit.

Implement the PacketGetVersion() routine, which is used in
the 0.4.x versions of wpa_supplicant.

Drain all pending events from the driver when we get an
RTM_IFINFO message, in case some were posted before ndis_events
was run. This keeps us in sync with wpa_supplicant.

Make forwarding of connect/disconnect events optional. wpa_supplicant
seems to already be able to tell when it's associated and the extra
events just confuse it. Only forward media-specific events by default.

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.

o correct alignment of 802.11 addresses passed to ether_ntoa to fix
segfaults on amd64
o while here correct printf formats for size_t args

Identified by: Pascal Hofstee
MFC after: 3 days

save+restore wpa, privacy, and roaming settings

MFC after: 2 weeks

Fix all the spelling mistakes I could find in the man pages for words
that have at least 3 characters.

MFC after: 1 week
Thanks to: Music band ``Chingon''
for keeping me company while searching for these.

Correct problems with handling interfaces that go away (e.g. when
a card is ejected). wpa_supplicant requires that internal events
for interfaces coming+going include a name but after an interface
is removed you cannot use if_indextoname to map the interface index
in the RTM_IFINFO (or RTM_IFANNOUNCE) msg to an interface name.
Instead record the interface index in the driver-private data area
and use that to filter msgs from the routing socket. This insures
that when we have a message to process we know the interface name.
The end result is that we can now dispatch an "interface removed"
event that is understood when notified than an interface went away
(where previously the event dispatched was ignored because the
interface name was unrecognized).

This change also insures we only process events for our interface.

The only downside is that we can no longer wait for an interface
to arrive as we need to map the interface name to an index at
startup. This is not important as wpa_supplicant should be launched
by devd and not include a separate mechanism for doing interface
discovery.

MFC after: 3 days

clear eloop registration when deinit'd the l2 packet support

MFC after: 3 days

Spelling and grammar fixes.

MFC after: 3 days

handle RTM_IFINFO events so we terminate when an interface is
marked down

Reviewed by: brooks, avatar
Approved by: re (scottl)

explicitly set IEEE80211_KEY_GROUP instead of depending on kernel kludge

Reviewed by: avatar
Approved by: re (scottl)

Update key handling:
o use proper api for setting/deleting keys instead of depending
on key indices
o check mac address to decide whether a key is unicast or group/global
o check set_tx on key set to decide whether a group/global key should
also be marked as default
o explicitly set IEEE80211_KEY_GROUP flag for group keys instead of
depending on kernel auto-add kludge

With the above changes static wep key handling works.

Reviewed by: avatar
Approved by: re (scottl)

Tidy up the markup (fixing some nearby content bugs).

Timeout from: sam
Approved by: re (blanket manpages)

move hostapd_cli to section 8

Approved by: re (blanket wpa)

o move hostapd to section 8
o add placeholder for hostapd.conf

Approved by: re (blanket wpa)

o move wpa_supplicant to section 8
o fillin wpa_supplicant.conf.5

Approved by: re (blanket wpa)

move wpa_cli to section 8 + minor wordsmithing

Approved by: re (blanket wpa)

o improve error msg for ioctl failures
o zero mlme struct before use

add EAP-TTLS to the EAPOL group; may want a separate knob later

Catch up with changes in wpa_supplicant:
o reorg driver to consolidate state setup in the associate method
o add set_auth_alg method
o cleanup interface state on deinit
o change associate to use revised MLME ioctl api so we can support
ap_scan=2 methodology
o cleanup associate to support WEP and no cipher cases
o s/__FUNCTION__/__func__/

freebsd pieces of hostapd support

freebsd pieces of wpa supplicant support

Reviewed by: brooks