summaryrefslogtreecommitdiffstats
path: root/doc
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:26:18 +0100
commit27c9c6b2629a75b5646524311bb8329dba7e99c8 (patch)
tree581ace86d84e6d6d1bc9eb05c273c0dc7023e661 /doc
parentc6f2dc757f2456c788cf62323f0a434936896710 (diff)
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) (cherry picked from commit 254b58fd7335fa3c58e2535d46658109ffd8bdcd)
Diffstat (limited to 'doc')
-rw-r--r--doc/apps/s_client.pod15
-rw-r--r--doc/apps/s_server.pod14
2 files changed, 29 insertions, 0 deletions
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index b617c415f5..764a63dbfb 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -88,6 +88,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>]
@@ -425,6 +427,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/apps/s_server.pod b/doc/apps/s_server.pod
index 94065ba753..6aaefe400e 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -69,6 +69,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>]
@@ -402,6 +404,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