aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Collison <steven@raycoll.com>2017-03-28 09:02:37 -0700
committerMatt Caswell <matt@openssl.org>2017-03-29 09:25:44 +0100
commit254b58fd7335fa3c58e2535d46658109ffd8bdcd (patch)
treee4b07af05f359a79a9c37aa7923eb8087e052e70
parentdc8da7b1b8ba276f179ea1232c9df764dcd38775 (diff)
downloadopenssl-254b58fd7335fa3c58e2535d46658109ffd8bdcd.tar.gz
doc: Add missing options in s_{server,client}
These were added to the help in ad775e04f6dab but not the pods. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3065)
-rw-r--r--doc/man1/s_client.pod15
-rw-r--r--doc/man1/s_server.pod14
2 files changed, 29 insertions, 0 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index bbb86c2e22..24ef1e4bc3 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -89,6 +89,8 @@ B<openssl> B<s_client>
[B<-bugs>]
[B<-comp>]
[B<-no_comp>]
+[B<-sigalgs sigalglist>]
+[B<-curves curvelist>]
[B<-cipher cipherlist>]
[B<-serverpref>]
[B<-starttls protocol>]
@@ -435,6 +437,19 @@ OpenSSL 1.1.0.
only provide a brief summary of connection parameters instead of the
normal verbose output.
+=item B<-sigalgs sigalglist>
+
+Specifies the list of signature algorithms that are sent by the client.
+The server selects one entry in the list based on its preferences.
+For example strings, see L<SSL_CTX_set1_sigalgs(3)>
+
+=item B<-curves curvelist>
+
+Specifies the list of supported curves to be sent by the client. The curve is
+is ultimately selected by the server. For a list of all curves, use:
+
+ $ openssl ecparam -list_curves
+
=item B<-cipher cipherlist>
this allows the cipher list sent by the client to be modified. Although
diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index b34dadd650..6fe16f3d86 100644
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -70,6 +70,8 @@ B<openssl> B<s_server>
[B<-verify_name name>]
[B<-x509_strict>]
[B<-nocert>]
+[B<-client_sigalgs sigalglist>]
+[B<-named_curve curve>]
[B<-cipher cipherlist>]
[B<-serverpref>]
[B<-quiet>]
@@ -413,6 +415,18 @@ OpenSSL 1.1.0.
Provide a brief summary of connection parameters instead of the normal verbose
output.
+=item B<-client_sigalgs sigalglist>
+
+Signature algorithms to support for client certificate authentication
+(colon-separated list)
+
+=item B<-named_curve curve>
+
+Specifies the elliptic curve to use. NOTE: this is single curve, not a list.
+For a list of all possible curves, use:
+
+ $ openssl ecparam -list_curves
+
=item B<-cipher cipherlist>
This allows the cipher list used by the server to be modified. When