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

+

+

+<refentry>

+  <refmeta>

+    <refentrytitle>eapol_test</refentrytitle>

+    <manvolnum>8</manvolnum>

+  </refmeta>

+  <refnamediv>

+    <refname>eapol_test</refname>

+

+    <refpurpose>EAP peer and RADIUS client testing</refpurpose>

+  </refnamediv>

+

+  <refsynopsisdiv>

+    <cmdsynopsis>

+      <command>eapol_test</command>

+      <arg>-nWS</arg>

+      <arg>-c<replaceable>config file</replaceable></arg>

+      <arg>-a<replaceable>server IP address</replaceable></arg>

+      <arg>-A<replaceable>client IP address</replaceable></arg>

+      <arg>-p<replaceable>UDP port</replaceable></arg>

+      <arg>-s<replaceable>shared secret</replaceable></arg>

+      <arg>-r<replaceable>re-authentications</replaceable></arg>

+      <arg>-t<replaceable>timeout</replaceable></arg>

+      <arg>-C<replaceable>Connect-Info</replaceable></arg>

+      <arg>-M<replaceable>MAC address</replaceable></arg>

+      <arg>-o<replaceable>file</replaceable></arg>

+      <arg>-N<replaceable>attr spec</replaceable></arg>

+    </cmdsynopsis>

+    <cmdsynopsis>

+      <command>eapol_test scard</command>

+    </cmdsynopsis>

+    <cmdsynopsis>

+      <command>eapol_test sim</command>

+      <arg>PIN</arg>

+      <arg>num triplets</arg>

+    </cmdsynopsis>

+  </refsynopsisdiv>

+

+  <refsect1>

+    <title>Overview</title>

+

+    <para>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.</para>

+

+    <para>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.</para>

+

+

+    <para>As an example:</para>

+

+
<programlisting>

+eapol_test -ctest.conf -a127.0.0.1 -p1812 -ssecret -r1

+</programlisting>

+

+    <para>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.</para>

+

+  </refsect1>

+  <refsect1>

+    <title>Command Arguments</title>

+    <variablelist>

+      <varlistentry>

+	<term>-c configuration file path</term>

+

+	<listitem><para>A configuration to use.  The configuration should

+	use the same format for network blocks as wpa_supplicant.

+	</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-a AS address</term>

+

+	<listitem><para>IP address of the authentication server.  The

+	default is '127.0.0.1'.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-A client address</term>

+

+	<listitem><para>IP address of the client.  The default is to

+	select an address automatically.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-p AS port</term>

+

+        <listitem><para>UDP port of the authentication server. The

+        default is '1812'.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-s AS secret</term>

+

+	<listitem><para>Shared secret with the authentication server.

+	The default is 'radius'.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-r count</term>

+

+	<listitem><para>Number of reauthentications.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-t timeout</term>

+

+	<listitem><para>Timeout in seconds. The default is 30.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-C info</term>

+

+	<listitem><para>RADIUS Connect-Info.  The default is

+	'CONNECT 11Mbps 802.11b'.</para></listitem>

+      </varlistentry>

+

+

+      <varlistentry>

+	<term>-M mac address</term>

+

+	<listitem><para>Client MAC address (Calling-Station-Id).  The

+	default is '02:00:00:00:00:01'.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-o file</term>

+

+	<listitem><para>Location to write out server certificate.

+	</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-N attr spec</term>

+

+	<listitem><para>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.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-n</term>

+

+	<listitem><para>Indicates that no MPPE keys are expected.

+	</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-W</term>

+

+	<listitem><para>Wait for a control interface monitor before starting.

+	</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-S</term>

+

+	<listitem><para>Save configuration after authentication.

+	</para></listitem>

+      </varlistentry>

+

+    </variablelist>

+  </refsect1>

+  <refsect1>

+    <title>See Also</title>

+    <para>

+      <citerefentry>

+	<refentrytitle>wpa_supplicant</refentrytitle>

+	<manvolnum>8</manvolnum>

+      </citerefentry>

+    </para>

+  </refsect1>

+  <refsect1>

+    <title>Legal</title>

+    <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 licensed under the BSD license (the one with

+    advertisement clause removed).</para>

+  </refsect1>

+</refentry>

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

     <cmdsynopsis>

       <command>wpa_cli</command>

       <arg>-p <replaceable>path to ctrl sockets</replaceable></arg>

+      <arg>-g <replaceable>path to global ctrl_interface socket</replaceable></arg>

       <arg>-i <replaceable>ifname</replaceable></arg>

       <arg>-hvB</arg>

       <arg>-a <replaceable>action file</replaceable></arg>

       <arg>-P <replaceable>pid file</replaceable></arg>

+      <arg>-G <replaceable>ping interval</replaceable></arg>

       <arg><replaceable>command ...</replaceable></arg>

     </cmdsynopsis>

   </refsynopsisdiv>

@@ -111,6 +113,14 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed

       </varlistentry>

       <varlistentry>

+	<term>-g control socket path</term>

+

+	<listitem><para>Connect to the global control socket at the

+	indicated path rather than an interface-specific control

+	socket.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

 	<term>-i ifname</term>

         <listitem><para>Specify the interface that is being

@@ -161,6 +171,13 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed

       </varlistentry>

       <varlistentry>

+	<term>-G ping interval</term>

+

+	<listitem><para>Set the interval (in seconds) at which

+	wpa_cli pings the supplicant.</para></listitem>

+      </varlistentry>

+

+      <varlistentry>

 	<term>command</term>

 	<listitem><para>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 @@

   <refsynopsisdiv>

     <cmdsynopsis>

       <command>wpa_supplicant</command>

-      <arg>-BddfhKLqqtuvW</arg>

+      <arg>-BddfhKLqqsTtuvW</arg>

       <arg>-i<replaceable>ifname</replaceable></arg>

       <arg>-c<replaceable>config file</replaceable></arg>

       <arg>-D<replaceable>driver</replaceable></arg>

@@ -344,9 +344,20 @@

       </varlistentry>

       <varlistentry>

+	<term>-e entropy file</term>

+	<listitem>

+	  <para>File for <command>wpa_supplicant</command> to use to

+	  maintain its internal entropy store in over restarts.</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

 	<term>-f output file</term>

 	<listitem>

-	  <para>Log output to specified file instead of stdout.</para>

+	  <para>Log output to specified file instead of stdout. (This

+	  is only available if <command>wpa_supplicant</command> was

+	  built with the <literal>CONFIG_DEBUG_FILE</literal>

+	  option.)</para>

 	</listitem>

       </varlistentry>

@@ -387,6 +398,22 @@

       </varlistentry>

       <varlistentry>

+	<term>-o override driver</term>

+	<listitem>

+	  <para>Override the driver parameter for new

+	  interfaces.</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-O override ctrl_interface</term>

+	<listitem>

+	  <para>Override the ctrl_interface parameter for new

+	  interfaces.</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

 	<term>-p</term>

 	<listitem>

 	  <para>Driver parameters. (Per interface)</para>

@@ -409,10 +436,40 @@

       </varlistentry>

       <varlistentry>

+	<term>-s</term>

+	<listitem>

+	  <para>Log output to syslog instead of stdout. (This is only

+	  available if <command>wpa_supplicant</command> was built

+	  with the <literal>CONFIG_DEBUG_SYSLOG</literal>

+	  option.)</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-T</term>

+	<listitem>

+	  <para>Log output to Linux tracing in addition to any other

+	  destinations. (This is only available

+	  if <command>wpa_supplicant</command> was built with

+	  the <literal>CONFIG_DEBUG_LINUX_TRACING</literal>

+	  option.)</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

+	<term>-t</term>

+	<listitem>

+	  <para>Include timestamp in debug messages.</para>

+	</listitem>

+      </varlistentry>

+

+      <varlistentry>

 	<term>-u</term>

 	<listitem>

-	  <para>Enabled DBus control interface. If enabled, interface

-	  definitions may be omitted.</para>

+	  <para>Enable DBus control interface. If enabled, interface

+	  definitions may be omitted. (This is only available

+	  if <command>wpa_supplicant</command> was built with

+	  the <literal>CONFIG_DBUS</literal> option.)</para>

 	</listitem>

       </varlistentry>

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<pid file>] "

+	       "  wpa_supplicant [-BddhKLqqtvW] [-P<pid file>] "

 	       "[-g<global ctrl>] \\\n"

 	       "        -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "

 	       "[-p<driver_param>] \\\n"

-	       "        [-b<br_ifname>] [-f<debug file>] [-e<entropy file>] "

+	       "        [-b<br_ifname>] [-e<entropy file>] "

 	       "\\\n"

 	       "        [-o<override driver>] [-O<override ctrl>] \\\n"

 	       "        [-N -i<ifname> -c<conf> [-C<ctrl>] "