Commit Graph

161 Commits

Author SHA1 Message Date
bschmidt
b94d273514 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
bschmidt
ec5210f39c 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
bschmidt
b8cfac7d01 enable EAP_GTC and EAP_OTP to match upstream's default configuration
MFC after:	2 weeks
2012-04-28 11:01:12 +00:00
bschmidt
0a3070da3b 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
theraven
83be402c4a 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
bschmidt
c4d8dce696 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
kevlo
0fd71d974e Mention run(4) 2012-02-09 08:33:04 +00:00
emaste
206e1ce96f 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
uqs
415a3a9b96 Spelling fixes for usr.sbin/ 2011-12-30 10:58:14 +00:00
kevlo
80dd636e8f Remove duplicated header files 2011-06-24 07:05:20 +00:00
obrien
cddd210098 * 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
imp
138848dd32 Add notes about ASCII/Hex WEP keys 2011-02-20 17:54:49 +00:00
bschmidt
3a8f983977 Fix build on bigendian archs. 2010-12-19 09:18:14 +00:00
bschmidt
2bbf443a5b Unbreak hostapd. This code has been explicitly removed in upstream versions. 2010-12-18 20:29:41 +00:00
bschmidt
d28d2b63f1 Fix some whitespace nits. 2010-12-18 20:27:09 +00:00
bschmidt
c979129599 Change order in wpa_driver_bsd_ops to match upstream code. Add description
while here.
2010-12-18 20:25:25 +00:00
bschmidt
7f5fd9f20e Add a comment explaining the undefs, while here remove one which is not
required.
2010-12-18 20:23:28 +00:00
bschmidt
ae056a2459 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
bschmidt
428cbdd872 Import bsd_configure_wpa() to sync with upstream code. 2010-12-18 20:17:10 +00:00
bschmidt
d18aa716c5 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
bschmidt
aeb5d16357 Remove some unused variables and unnecessary casts. 2010-12-18 20:13:42 +00:00
bschmidt
b081c6596f 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
bschmidt
2f541c23c7 Rename iface to ifname to match the upstream code. 2010-12-18 20:08:21 +00:00
bschmidt
13a09021da 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
bschmidt
8c7d2b2129 Move some functions around to match the upstream order. 2010-12-18 20:00:28 +00:00
bschmidt
de693bb747 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
bschmidt
7828332436 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
bschmidt
bb1eb85dcb 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
rpaulo
375d9676a4 Adapt for wpa_supplicant / hostapd 0.7.3. 2010-11-03 10:44:25 +00:00
uqs
cc627cc10e mdoc: remove unused/empty macros 2010-08-02 13:11:27 +00:00
bschmidt
3b1f97758a - 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
rpaulo
d466ac1cf2 Update for hostapd & wpa_supplicant 0.6.10. 2010-06-14 15:38:30 +00:00
uqs
64c451d29e 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
bschmidt
a98b1eb99d 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
1ad78eee35 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
6605d521a8 fix Jouni's email address
Approved by:	re (blanket)
2009-07-12 19:58:52 +00:00
maxim
8c6aabce2b o Fix usage() prototype [1] and correct its call.
Submitted by:	ed [1]
2009-06-23 08:51:11 +00:00
maxim
0761ade8ac o style(9) usage() definition: it doesn't need an argument. 2009-06-23 05:55:56 +00:00
maxim
f03ffbff9f o Remove unneeded argument in fprintf(3) call in usage().
Submitted by:	Pawel Worach
2009-06-23 05:51:48 +00:00
sam
ae91f641c2 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
68e7f74c45 no need to for gnu89 any more 2009-03-15 01:39:16 +00:00
das
6335284962 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
ffdb6e3c4e uupdate for 0.6.8 2009-03-02 04:12:41 +00:00
sam
069aa8512b update for 0.6.8 2009-03-02 04:11:34 +00:00
sam
fdc2f0e604 update for 0.6.8 2009-03-02 04:10:40 +00:00
sam
cba727f413 update to 0.6.8
Reviewed by:	thompsa
2009-03-02 02:28:22 +00:00
sam
3ca562853b use ansi prototypes
Submitted by:	Pawel Worach <pawel.worach@gmail.com>
2009-03-01 08:01:38 +00:00
imp
4f79df3b3c 'Strict EAP conformance' makes more sense here than 'String EAP
conformance.'
2008-11-21 18:15:39 +00:00
danger
0938e82123 - 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
0235df2313 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
76668abc13 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
c0e1e43906 enable syslog support and add -s option to the man page
MFC after:	3 weeks
2008-03-24 20:19:20 +00:00
brueffer
109c3fd180 Add some missing Xrefs to drivers.
MFC after:	3 days
2008-02-21 20:44:25 +00:00
sam
e322c994a5 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
5dba252cfc 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
016f03a823 fix building w/ WITHOUT_WPA_SUPPLICANT_EAPOL
MFC after:	1 week
2007-11-10 20:26:08 +00:00
sam
8cb25b93ad install sample wpa_supplicant.conf; not everyone has source to reference 2007-11-10 20:24:28 +00:00
thompsa
e44e0b612b 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
b98fc71fe7 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
mlaier
8ad5ea95ae Update for libpcap 0.9.8 2007-10-16 02:12:06 +00:00
kevlo
f2e84279e6 Remove a -N flag.
Reviewed by: sam
Approved by: re (kensmith)
2007-10-02 01:22:14 +00:00
sam
ed338a5f9c fix building with NO_CRYPT=true
PR:		116439
Approved by:	re (gnn)
2007-09-28 15:52:28 +00:00
sam
a0d2ad9bdb 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
brueffer
eea0d53f8c Remove stray comma left over from previous commit.
Approved by:	re (blanket)
2007-09-07 22:19:29 +00:00
gabor
cd6ee7443e - 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
25fdb9e2e2 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
257b90801d 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
75055779db update for 0.5.8 import
Approved by:	re (hrs)
2007-07-09 16:26:48 +00:00
sam
367201c067 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
9fca1df981 track net80211 changes to get scan results ioctl 2007-06-11 03:57:46 +00:00
sam
d2c88d9200 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
ec1c5d40f7 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
ru
081fcce9b9 Markup fixes. 2006-09-29 17:57:04 +00:00
sam
ba5297eb2d incorporate Rui Paulo's work
Obtained from:	netbsd
2006-09-02 17:56:24 +00:00
sam
42150a0d8f avoid null ptr deref
Obtained from:	netbsd
2006-05-27 23:04:30 +00:00
sam
ec7bf21638 correct static array overrun
Obtained from:	netbsd
2006-05-27 23:03:08 +00:00
sam
8d8f399b4c add debug msg 2006-04-20 05:03:21 +00:00
sam
d1802e1444 remove some unnecessary perror calls
Noticed by:	Jouni Malinen
MFC after:	2 weeks
2006-04-17 00:17:29 +00:00
ru
89e2376997 Add missing library dependencies. 2006-04-13 12:49:24 +00:00
sam
638ab32010 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
ru
388e590f95 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
hrs
6223247e90 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
ccaf726b20 update for v0.4.8 import of wpa_supplicant and hostapd
MFC after:	2 weeks
2006-03-07 05:54:20 +00:00
sam
129e00e81f 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
ff95a0e1eb 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
wilko
d03771dd86 Add an example for WEP.
OK-ed by: sam
2005-12-25 22:09:17 +00:00
wpaul
c956c5f74b Hide a diagnostic message under if (verbose) to avoid cluttering the
system log when not in verbose logging mode.
2005-10-21 16:57:57 +00:00
wpaul
6db27f35d6 Fix small grammar nit. 2005-10-20 18:33:46 +00:00
wpaul
bcc6df344c Implement the PacketGetVersion() routine, which is used in
the 0.4.x versions of wpa_supplicant.
2005-10-20 16:49:31 +00:00
wpaul
1bf7a68287 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.
2005-10-12 00:57:31 +00:00
wpaul
020d6defa5 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.
2005-10-10 20:40:28 +00:00
wpaul
ae456864c8 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.
2005-10-10 17:51:12 +00:00
sam
94cff4b92f 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
2005-08-30 15:59:49 +00:00
sam
4a59272425 save+restore wpa, privacy, and roaming settings
MFC after:	2 weeks
2005-08-13 04:23:33 +00:00
keramida
ac7c9f771d 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.
2005-07-31 03:30:48 +00:00
sam
2626cf3b71 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
2005-07-29 05:57:28 +00:00
sam
5bf3752adf clear eloop registration when deinit'd the l2 packet support
MFC after:	3 days
2005-07-29 05:48:00 +00:00
brueffer
da02241800 Spelling and grammar fixes.
MFC after:	3 days
2005-07-13 05:39:47 +00:00
sam
070db914d4 handle RTM_IFINFO events so we terminate when an interface is
marked down

Reviewed by:	brooks, avatar
Approved by:	re (scottl)
2005-07-08 16:33:52 +00:00
sam
b480c038d1 explicitly set IEEE80211_KEY_GROUP instead of depending on kernel kludge
Reviewed by:	avatar
Approved by:	re (scottl)
2005-07-05 17:42:27 +00:00