diff -up wpa_supplicant-2.0/wpa_supplicant/doc/docbook/eapol_test.sgml.man-page wpa_supplicant-2.0/wpa_supplicant/doc/docbook/eapol_test.sgml --- wpa_supplicant-2.0/wpa_supplicant/doc/docbook/eapol_test.sgml.man-page 2014-01-20 16:40:02.340869189 -0600 +++ wpa_supplicant-2.0/wpa_supplicant/doc/docbook/eapol_test.sgml 2014-01-20 16:40:02.340869189 -0600 @@ -0,0 +1,205 @@ + + + + + eapol_test + 8 + + + eapol_test + + EAP peer and RADIUS client testing + + + + + eapol_test + -nWS + -cconfig file + -aserver IP address + -Aclient IP address + -pUDP port + -sshared secret + -rre-authentications + -ttimeout + -CConnect-Info + -MMAC address + -ofile + -Nattr spec + + + eapol_test scard + + + eapol_test sim + PIN + num triplets + + + + + Overview + + eapol_test is a program that links together the same EAP + peer implementation that wpa_supplicant is using and the RADIUS + authentication client code from hostapd. In addition, it has + minimal glue code to combine these two components in similar + ways to IEEE 802.1X/EAPOL Authenticator state machines. In other + words, it integrates IEEE 802.1X Authenticator (normally, an + access point) and IEEE 802.1X Supplicant (normally, a wireless + client) together to generate a single program that can be used to + test EAP methods without having to setup an access point and a + wireless client. + + The main uses for eapol_test are in interoperability testing + of EAP methods against RADIUS servers and in development testing + for new EAP methods. It can be easily used to automate EAP testing + for interoperability and regression since the program can be run + from shell scripts without require additional test components apart + from a RADIUS server. For example, the automated EAP tests described + in eap_testing.txt are implemented with eapol_test. Similarly, + eapol_test could be used to implement an automated regression + test suite for a RADIUS authentication server. + + + As an example: + +
+eapol_test -ctest.conf -a127.0.0.1 -p1812 -ssecret -r1 +
+ + tries to complete EAP authentication based on the network + configuration from test.conf against the RADIUS server running + on the local host. A re-authentication is triggered to test fast + re-authentication. The configuration file uses the same format for + network blocks as wpa_supplicant. + +
+ + Command Arguments + + + -c configuration file path + + A configuration to use. The configuration should + use the same format for network blocks as wpa_supplicant. + + + + + -a AS address + + IP address of the authentication server. The + default is '127.0.0.1'. + + + + -A client address + + IP address of the client. The default is to + select an address automatically. + + + + -p AS port + + UDP port of the authentication server. The + default is '1812'. + + + + -s AS secret + + Shared secret with the authentication server. + The default is 'radius'. + + + + -r count + + Number of reauthentications. + + + + -t timeout + + Timeout in seconds. The default is 30. + + + + -C info + + RADIUS Connect-Info. The default is + 'CONNECT 11Mbps 802.11b'. + + + + + -M mac address + + Client MAC address (Calling-Station-Id). The + default is '02:00:00:00:00:01'. + + + + -o file + + Location to write out server certificate. + + + + + -N attr spec + + Send arbitrary attribute specific by + attr_id:syntax:value, or attr_id alone. attr_id should be the numeric + ID of the attribute, and syntax should be one of 's' (string), + 'd' (integer), or 'x' (octet string). The value is the attribute value + to send. When attr_id is given alone, NULL is used as the attribute + value. Multiple attributes can be specified by using the option + several times. + + + + -n + + Indicates that no MPPE keys are expected. + + + + + -W + + Wait for a control interface monitor before starting. + + + + + -S + + Save configuration after authentication. + + + + + + + See Also + + + wpa_supplicant + 8 + + + + + Legal + wpa_supplicant is copyright (c) 2003-2012, + Jouni Malinen j@w1.fi and + contributors. + All Rights Reserved. + + This program is licensed under the BSD license (the one with + advertisement clause removed). + +
diff -up wpa_supplicant-2.0/wpa_supplicant/doc/docbook/Makefile.man-page wpa_supplicant-2.0/wpa_supplicant/doc/docbook/Makefile --- wpa_supplicant-2.0/wpa_supplicant/doc/docbook/Makefile.man-page 2013-01-12 09:42:53.000000000 -0600 +++ wpa_supplicant-2.0/wpa_supplicant/doc/docbook/Makefile 2014-01-20 16:40:02.342869164 -0600 @@ -1,4 +1,4 @@ -all: man html pdf +all: man FILES += wpa_background FILES += wpa_cli @@ -7,6 +7,7 @@ FILES += wpa_passphrase FILES += wpa_priv FILES += wpa_supplicant.conf FILES += wpa_supplicant +FILES += eapol_test man: for i in $(FILES); do docbook2man $$i.sgml; done @@ -20,7 +21,7 @@ pdf: clean: - rm -f wpa_background.8 wpa_cli.8 wpa_gui.8 wpa_passphrase.8 wpa_priv.8 wpa_supplicant.8 + rm -f wpa_background.8 wpa_cli.8 wpa_gui.8 wpa_passphrase.8 wpa_priv.8 wpa_supplicant.8 eapol_test.8 rm -f wpa_supplicant.conf.5 rm -f manpage.links manpage.refs rm -f $(FILES:%=%.pdf) diff -up wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_cli.sgml.man-page wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_cli.sgml --- wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_cli.sgml.man-page 2013-01-12 09:42:53.000000000 -0600 +++ wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_cli.sgml 2014-01-20 16:40:02.339869202 -0600 @@ -15,10 +15,12 @@ wpa_cli -p path to ctrl sockets + -g path to global ctrl_interface socket -i ifname -hvB -a action file -P pid file + -G ping interval command ... @@ -111,6 +113,14 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed + -g control socket path + + Connect to the global control socket at the + indicated path rather than an interface-specific control + socket. + + + -i ifname Specify the interface that is being @@ -161,6 +171,13 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed + -G ping interval + + Set the interval (in seconds) at which + wpa_cli pings the supplicant. + + + command Run a command. The available commands are diff -up wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_supplicant.sgml.man-page wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_supplicant.sgml --- wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_supplicant.sgml.man-page 2013-01-12 09:42:53.000000000 -0600 +++ wpa_supplicant-2.0/wpa_supplicant/doc/docbook/wpa_supplicant.sgml 2014-01-20 16:40:02.339869202 -0600 @@ -12,7 +12,7 @@ wpa_supplicant - -BddfhKLqqtuvW + -BddfhKLqqsTtuvW -iifname -cconfig file -Ddriver @@ -344,9 +344,20 @@ + -e entropy file + + File for wpa_supplicant to use to + maintain its internal entropy store in over restarts. + + + + -f output file - Log output to specified file instead of stdout. + Log output to specified file instead of stdout. (This + is only available if wpa_supplicant was + built with the CONFIG_DEBUG_FILE + option.) @@ -387,6 +398,22 @@ + -o override driver + + Override the driver parameter for new + interfaces. + + + + + -O override ctrl_interface + + Override the ctrl_interface parameter for new + interfaces. + + + + -p Driver parameters. (Per interface) @@ -409,10 +436,40 @@ + -s + + Log output to syslog instead of stdout. (This is only + available if wpa_supplicant was built + with the CONFIG_DEBUG_SYSLOG + option.) + + + + + -T + + Log output to Linux tracing in addition to any other + destinations. (This is only available + if wpa_supplicant was built with + the CONFIG_DEBUG_LINUX_TRACING + option.) + + + + + -t + + Include timestamp in debug messages. + + + + -u - Enabled DBus control interface. If enabled, interface - definitions may be omitted. + Enable DBus control interface. If enabled, interface + definitions may be omitted. (This is only available + if wpa_supplicant was built with + the CONFIG_DBUS option.) diff -up wpa_supplicant-2.0/wpa_supplicant/main.c.man-page wpa_supplicant-2.0/wpa_supplicant/main.c --- wpa_supplicant-2.0/wpa_supplicant/main.c.man-page 2013-01-12 09:42:53.000000000 -0600 +++ wpa_supplicant-2.0/wpa_supplicant/main.c 2014-01-20 16:40:02.340869189 -0600 @@ -23,11 +23,11 @@ static void usage(void) int i; printf("%s\n\n%s\n" "usage:\n" - " wpa_supplicant [-BddhKLqqstuvW] [-P] " + " wpa_supplicant [-BddhKLqqtvW] [-P] " "[-g] \\\n" " -i -c [-C] [-D] " "[-p] \\\n" - " [-b] [-f] [-e] " + " [-b] [-e] " "\\\n" " [-o] [-O] \\\n" " [-N -i -c [-C] "