Add documentation for the new s_client and s_server early_data options

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)

diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index 0c9329d999917e03d6ecc0232a6e46b625a6723b..bbb86c2e22e6ca4efdb08bdea57a1aa8fa38552c 100644 (file)
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -105,6 +105,8 @@ B<openssl> B<s_client>
 [B<-nextprotoneg protocols>]
 [B<-ct|noct>]
 [B<-ctlogfile>]
+[B<-keylogfile file>]
+[B<-early_data file>]
 
 =head1 DESCRIPTION
 
@@ -528,11 +530,17 @@ for SCTs.
 A file containing a list of known Certificate Transparency logs. See
 L<SSL_CTX_set_ctlog_list_file(3)> for the expected file format.
 
-=item B<-keylogfile path>
+=item B<-keylogfile file>
 
 Appends TLS secrets to the specified keylog file such that external programs
 (like Wireshark) can decrypt TLS connections.
 
+=item B<-early_data file>
+
+Reads the contents of the specified file and attempts to send it as early data
+to the server. This will only work with resumed sessions that support early
+data and when the server accepts the early data.
+
 =back
 
 =head1 CONNECTED COMMANDS

diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index 94289e810b404403cbe98804f6556bd1c0378e31..3807a6cd3d92e7cb4fd7349a6b5848d88c1f7c32 100644 (file)
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -113,6 +113,8 @@ B<openssl> B<s_server>
 [B<-status_file file>]
 [B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
+[B<-max_early_data>]
+[B<-early_data>]
 
 =head1 DESCRIPTION
 
@@ -527,6 +529,16 @@ The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or
 "spdy/3".
 
+=item B<-max_early_data>
+
+Change the default maximum early data bytes that are specified for new sessions
+and any incoming early data (when used in conjunction with the B<-early_data>
+flag). The default value is approximately 16k.
+
+=item B<-early_data>
+
+Accept early data where possible.
+
 =back
 
 =head1 CONNECTED COMMANDS