Blame SOURCES/rh948453-man-page.patch

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