[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  254b58fd7335fa3c58e2535d46658109ffd8bdcd (commit)
      from  dc8da7b1b8ba276f179ea1232c9df764dcd38775 (commit)


- Log -----------------------------------------------------------------
commit 254b58fd7335fa3c58e2535d46658109ffd8bdcd
Author: Steven Collison <steven at raycoll.com>
Date:   Tue Mar 28 09:02:37 2017 -0700

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3065)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/s_client.pod | 15 +++++++++++++++
 doc/man1/s_server.pod | 14 ++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index bbb86c2..24ef1e4 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 b34dadd..6fe16f3 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