summaryrefslogtreecommitdiffstats
path: root/doc/man1/s_client.pod
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-02-21 17:23:11 +0000
committerMatt Caswell <matt@openssl.org>2018-03-14 10:15:50 +0000
commit9d2674cd232ab51f5ae7952a63a614b688145527 (patch)
treed2f99d6c79a452bdffd00b0908ff1ac3542416e0 /doc/man1/s_client.pod
parente54b3ccdbe42d614890fb43cee274e6b14e741dd (diff)
Add documentation for TLSv1.3 ciphersuite configuration
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5392)
Diffstat (limited to 'doc/man1/s_client.pod')
-rw-r--r--doc/man1/s_client.pod19
1 files changed, 15 insertions, 4 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index f101b33649..a06d3a6291 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -99,6 +99,7 @@ B<openssl> B<s_client>
[B<-sigalgs sigalglist>]
[B<-curves curvelist>]
[B<-cipher cipherlist>]
+[B<-ciphersuites val>]
[B<-serverpref>]
[B<-starttls protocol>]
[B<-xmpphost hostname>]
@@ -505,10 +506,20 @@ ultimately selected by the server. For a list of all curves, use:
=item B<-cipher cipherlist>
-This allows the cipher list sent by the client to be modified. Although
-the server determines which cipher suite is used it should take the first
-supported cipher in the list sent by the client. See the B<ciphers>
-command for more information.
+This allows the TLSv1.2 and below cipher list sent by the client to be modified.
+This list will be combined with any TLSv1.3 ciphersuites that have been
+configured. Although the server determines which ciphersuite is used it should
+take the first supported cipher in the list sent by the client. See the
+B<ciphers> command for more information.
+
+=item B<-ciphersuites val>
+
+This allows the TLSv1.3 ciphersuites sent by the client to be modified. This
+list will be combined with any TLSv1.2 and below ciphersuites that have been
+configured. Although the server determines which cipher suite is used it should
+take the first supported cipher in the list sent by the client. See the
+B<ciphers> command for more information. The format for this list is a simple
+colon (":") separated list of TLSv1.3 ciphersuite names.
=item B<-starttls protocol>