diff options
Diffstat (limited to 'contrib/wpa/wpa_supplicant/doc/docbook')
13 files changed, 49 insertions, 258 deletions
diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 index 19162a3..ba838cd 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_BACKGROUND" "8" "07 September 2010" "" "" +.TH "WPA_BACKGROUND" "8" "12 January 2013" "" "" .SH NAME wpa_background \- Background information on Wi-Fi Protected Access and IEEE 802.11i @@ -75,10 +75,10 @@ pre-authentication, and PMKSA caching). \fBwpa_supplicant\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml index f47235b..eb3a089 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml @@ -90,12 +90,12 @@ <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 index e22fc92..886e9b0 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_CLI" "8" "07 September 2010" "" "" +.TH "WPA_CLI" "8" "12 January 2013" "" "" .SH NAME wpa_cli \- WPA command line client @@ -201,10 +201,10 @@ exit wpa_cli \fBwpa_supplicant\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml index 1fe98f4..c080c07 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml @@ -328,12 +328,12 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar </refsect1> <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 index f58a894..f94beb3 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_GUI" "8" "07 September 2010" "" "" +.TH "WPA_GUI" "8" "12 January 2013" "" "" .SH NAME wpa_gui \- WPA Graphical User Interface @@ -42,10 +42,10 @@ shown. \fBwpa_supplicant\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml index 41b5849..0ab6419 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml @@ -74,12 +74,12 @@ </refsect1> <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 index 945c1c0..d9c1e6c 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_PASSPHRASE" "8" "07 September 2010" "" "" +.TH "WPA_PASSPHRASE" "8" "12 January 2013" "" "" .SH NAME wpa_passphrase \- Generate a WPA PSK from an ASCII passphrase for a SSID @@ -31,10 +31,10 @@ passphrase will be read from standard input. \fBwpa_supplicant\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml index 402ea09..336c03b 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml @@ -62,12 +62,12 @@ </refsect1> <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 index 05ad983..108f7ee 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_PRIV" "8" "07 September 2010" "" "" +.TH "WPA_PRIV" "8" "12 January 2013" "" "" .SH NAME wpa_priv \- wpa_supplicant privilege separation helper @@ -111,10 +111,10 @@ processes at the same time, if desired. \fBwpa_supplicant\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml index 89b8a92..eb907a8 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml @@ -137,12 +137,12 @@ wpa_supplicant -i ath0 -c wpa_supplicant.conf </refsect1> <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8 index 3334d0c..7941dcf 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_SUPPLICANT" "8" "07 September 2010" "" "" +.TH "WPA_SUPPLICANT" "8" "12 January 2013" "" "" .SH NAME wpa_supplicant \- Wi-Fi Protected Access client and IEEE 802.1X supplicant @@ -217,31 +217,9 @@ list of supported driver backends that may be used with the -D option on your system, refer to the help output of wpa_supplicant (\fBwpa_supplicant -h\fR). .TP -\fBhostap\fR -(default) Host AP driver (Intersil Prism2/2.5/3). -(this can also be used with Linuxant DriverLoader). -.TP -\fBhermes\fR -Agere Systems Inc. driver (Hermes-I/Hermes-II). -.TP -\fBmadwifi\fR -MADWIFI 802.11 support (Atheros, etc.). -.TP -\fBatmel\fR -ATMEL AT76C5XXx (USB, PCMCIA). -.TP \fBwext\fR Linux wireless extensions (generic). .TP -\fBndiswrapper\fR -Linux ndiswrapper. -.TP -\fBbroadcom\fR -Broadcom wl.o driver. -.TP -\fBipw\fR -Intel ipw2100/2200 driver. -.TP \fBwired\fR wpa_supplicant wired Ethernet driver .TP @@ -303,7 +281,7 @@ Include timestamp in debug messages. Help. Show a usage message. .TP \fB-L\fR -Show license (GPL and BSD). +Show license (BSD). .TP \fB-p\fR Driver parameters. (Per interface) @@ -375,8 +353,8 @@ wpa_supplicant for two interfaces: .nf wpa_supplicant \\ - -c wpa1.conf -i wlan0 -D hostap -N \\ - -c wpa2.conf -i ath0 -D madwifi + -c wpa1.conf -i wlan0 -D nl80211 -N \\ + -c wpa2.conf -i ath0 -D wext .fi .RE .SH "OS REQUIREMENTS" @@ -395,56 +373,6 @@ Microsoft Windows with WinPcap (at least WinXP, may work with other versions) .SH "SUPPORTED DRIVERS" .TP -\fBHost AP driver for Prism2/2.5/3 (development snapshot/v0.2.x)\fR -(http://hostap.epitest.fi/) Driver needs to be set in -Managed mode (\fBiwconfig wlan0 mode managed\fR). -Please note that station firmware version needs to be 1.7.0 or -newer to work in WPA mode. -.TP -\fBLinuxant DriverLoader\fR -(http://www.linuxant.com/driverloader/) -with Windows NDIS driver for your wlan card supporting WPA. -.TP -\fBAgere Systems Inc. Linux Driver\fR -(http://www.agere.com/support/drivers/) Please note -that the driver interface file (driver_hermes.c) and hardware -specific include files are not included in the wpa_supplicant -distribution. You will need to copy these from the source -package of the Agere driver. -.TP -\fBmadwifi driver for cards based on Atheros chip set (ar521x)\fR -(http://sourceforge.net/projects/madwifi/) Please -note that you will need to modify the wpa_supplicant .config -file to use the correct path for the madwifi driver root -directory (CFLAGS += -I../madwifi/wpa line in example -defconfig). -.TP -\fBATMEL AT76C5XXx driver for USB and PCMCIA cards\fR -(http://atmelwlandriver.sourceforge.net/). -.TP -\fBLinux ndiswrapper\fR -(http://ndiswrapper.sourceforge.net/) with Windows -NDIS driver. -.TP -\fBBroadcom wl.o driver\fR -This is a generic Linux driver for Broadcom IEEE -802.11a/g cards. However, it is proprietary driver that is -not publicly available except for couple of exceptions, mainly -Broadcom-based APs/wireless routers that use Linux. The driver -binary can be downloaded, e.g., from Linksys support site -(http://www.linksys.com/support/gpl.asp) for Linksys -WRT54G. The GPL tarball includes cross-compiler and the needed -header file, wlioctl.h, for compiling wpa_supplicant. This -driver support in wpa_supplicant is expected to work also with -other devices based on Broadcom driver (assuming the driver -includes client mode support). -.TP -\fB Intel ipw2100 driver\fR -(http://sourceforge.net/projects/ipw2100/) -.TP -\fBIntel ipw2200 driver\fR -(http://sourceforge.net/projects/ipw2200/) -.TP \fBLinux wireless extensions\fR In theory, any driver that supports Linux wireless extensions can be used with IEEE 802.1X (i.e., not WPA) when @@ -574,10 +502,10 @@ in. \fBwpa_passphrase\fR(8) .SH "LEGAL" .PP -wpa_supplicant is copyright (c) 2003-2007, +wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <j@w1.fi> and contributors. All Rights Reserved. .PP -This program is dual-licensed under both the GPL version 2 -and BSD license. Either license may be used at your option. +This program is licensed under the BSD license (the one with +advertisement clause removed). diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 index 6371965..6f57aa0 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WPA_SUPPLICANT.CONF" "5" "07 September 2010" "" "" +.TH "WPA_SUPPLICANT.CONF" "5" "12 January 2013" "" "" .SH NAME wpa_supplicant.conf \- configuration file for wpa_supplicant diff --git a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml index 3aae51b..aa20e57 100644 --- a/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml +++ b/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml @@ -246,35 +246,6 @@ <variablelist> <varlistentry> - <term>hostap</term> - <listitem> - <para>(default) Host AP driver (Intersil Prism2/2.5/3). - (this can also be used with Linuxant DriverLoader).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>hermes</term> - <listitem> - <para>Agere Systems Inc. driver (Hermes-I/Hermes-II).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>madwifi</term> - <listitem> - <para>MADWIFI 802.11 support (Atheros, etc.).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>atmel</term> - <listitem> - <para>ATMEL AT76C5XXx (USB, PCMCIA).</para> - </listitem> - </varlistentry> - - <varlistentry> <term>wext</term> <listitem> <para>Linux wireless extensions (generic).</para> @@ -282,27 +253,6 @@ </varlistentry> <varlistentry> - <term>ndiswrapper</term> - <listitem> - <para>Linux ndiswrapper.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>broadcom</term> - <listitem> - <para>Broadcom wl.o driver.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>ipw</term> - <listitem> - <para>Intel ipw2100/2200 driver.</para> - </listitem> - </varlistentry> - - <varlistentry> <term>wired</term> <listitem> <para>wpa_supplicant wired Ethernet driver</para> @@ -432,7 +382,7 @@ <varlistentry> <term>-L</term> <listitem> - <para>Show license (GPL and BSD).</para> + <para>Show license (BSD).</para> </listitem> </varlistentry> @@ -527,8 +477,8 @@ wpa_supplicant -Dnl80211,wext -c/etc/wpa_supplicant.conf -iwlan0 <blockquote><programlisting> wpa_supplicant \ - -c wpa1.conf -i wlan0 -D hostap -N \ - -c wpa2.conf -i ath0 -D madwifi + -c wpa1.conf -i wlan0 -D nl80211 -N \ + -c wpa2.conf -i ath0 -D wext </programlisting></blockquote> </refsect1> @@ -558,93 +508,6 @@ wpa_supplicant \ <title>Supported Drivers</title> <variablelist> <varlistentry> - <term>Host AP driver for Prism2/2.5/3 (development - snapshot/v0.2.x)</term> - <listitem> - <para> (http://hostap.epitest.fi/) Driver needs to be set in - Managed mode (<emphasis>iwconfig wlan0 mode managed</emphasis>). - Please note that station firmware version needs to be 1.7.0 or - newer to work in WPA mode.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Linuxant DriverLoader</term> - <listitem> - <para>(http://www.linuxant.com/driverloader/) - with Windows NDIS driver for your wlan card supporting WPA.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Agere Systems Inc. Linux Driver</term> - <listitem> - <para> (http://www.agere.com/support/drivers/) Please note - that the driver interface file (driver_hermes.c) and hardware - specific include files are not included in the wpa_supplicant - distribution. You will need to copy these from the source - package of the Agere driver.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>madwifi driver for cards based on Atheros chip set (ar521x)</term> - <listitem> - <para> (http://sourceforge.net/projects/madwifi/) Please - note that you will need to modify the wpa_supplicant .config - file to use the correct path for the madwifi driver root - directory (CFLAGS += -I../madwifi/wpa line in example - defconfig).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>ATMEL AT76C5XXx driver for USB and PCMCIA cards</term> - <listitem> - <para> (http://atmelwlandriver.sourceforge.net/).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Linux ndiswrapper</term> - <listitem> - <para> (http://ndiswrapper.sourceforge.net/) with Windows - NDIS driver.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Broadcom wl.o driver</term> - <listitem> - <para> This is a generic Linux driver for Broadcom IEEE - 802.11a/g cards. However, it is proprietary driver that is - not publicly available except for couple of exceptions, mainly - Broadcom-based APs/wireless routers that use Linux. The driver - binary can be downloaded, e.g., from Linksys support site - (http://www.linksys.com/support/gpl.asp) for Linksys - WRT54G. The GPL tarball includes cross-compiler and the needed - header file, wlioctl.h, for compiling wpa_supplicant. This - driver support in wpa_supplicant is expected to work also with - other devices based on Broadcom driver (assuming the driver - includes client mode support).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term> Intel ipw2100 driver</term> - <listitem> - <para> (http://sourceforge.net/projects/ipw2100/)</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Intel ipw2200 driver</term> - <listitem> - <para> (http://sourceforge.net/projects/ipw2200/)</para> - </listitem> - </varlistentry> - - <varlistentry> <term>Linux wireless extensions</term> <listitem> <para>In theory, any driver that supports Linux wireless @@ -816,12 +679,12 @@ fi </refsect1> <refsect1> <title>Legal</title> - <para>wpa_supplicant is copyright (c) 2003-2007, + <para>wpa_supplicant is copyright (c) 2003-2012, Jouni Malinen <email>j@w1.fi</email> and contributors. All Rights Reserved.</para> - <para>This program is dual-licensed under both the GPL version 2 - and BSD license. Either license may be used at your option.</para> + <para>This program is licensed under the BSD license (the one with + advertisement clause removed).</para> </refsect1> </refentry> |
