diff options
author | Matt Caswell <matt@openssl.org> | 2017-02-24 16:17:00 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-03-02 17:44:16 +0000 |
commit | 6437b802f19fb022da88f59cb3071ebdcd2838f6 (patch) | |
tree | 8b0380c5bcda5f333d9454e16adfc8ffe48d081d /doc/man1 | |
parent | 0a5ece5bd20aac050d3c77c4f1fb760aa7892ab0 (diff) |
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)
Diffstat (limited to 'doc/man1')
-rw-r--r-- | doc/man1/s_client.pod | 10 | ||||
-rw-r--r-- | doc/man1/s_server.pod | 12 |
2 files changed, 21 insertions, 1 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 0c9329d999..bbb86c2e22 100644 --- 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 94289e810b..3807a6cd3d 100644 --- 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 |