summaryrefslogtreecommitdiffstats
path: root/doc/man1/s_server.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_server.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_server.pod')
-rw-r--r--doc/man1/s_server.pod20
1 files changed, 16 insertions, 4 deletions
diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index ad04359efd..2f0f79ac78 100644
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -113,6 +113,7 @@ B<openssl> B<s_server>
[B<-curves val>]
[B<-named_curve val>]
[B<-cipher val>]
+[B<-ciphersuites val>]
[B<-dhparam infile>]
[B<-record_padding val>]
[B<-debug_broken_protocol>]
@@ -533,12 +534,23 @@ For a list of all possible curves, use:
=item B<-cipher val>
-This allows the cipher list used by the server to be modified. When
-the client sends a list of supported ciphers the first client cipher
-also included in the server list is used. Because the client specifies
-the preference order, the order of the server cipherlist irrelevant. See
+This allows the list of TLSv1.2 and below ciphersuites used by the server to be
+modified. This list is combined with any TLSv1.3 ciphersuites that have been
+configured. When the client sends a list of supported ciphers the first client
+cipher also included in the server list is used. Because the client specifies
+the preference order, the order of the server cipherlist is irrelevant. See
the B<ciphers> command for more information.
+=item B<-ciphersuites val>
+
+This allows the list of TLSv1.3 ciphersuites used by the server to be modified.
+This list is combined with any TLSv1.2 and below ciphersuites that have been
+configured. When the client sends a list of supported ciphers the first client
+cipher also included in the server list is used. Because the client specifies
+the preference order, the order of the server cipherlist is irrelevant. 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<-dhparam infile>
The DH parameter file to use. The ephemeral DH cipher suites generate keys