[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ad775e04f6dab51b7f929b54f5aa3c2393f957c5 (commit)
      from  8cbb153357896c4b224e0678550944f7851bc3b2 (commit)


- Log -----------------------------------------------------------------
commit ad775e04f6dab51b7f929b54f5aa3c2393f957c5
Author: Hubert Kario <hkario at redhat.com>
Date:   Fri Jul 31 18:32:39 2015 +0200

    GH350: -help text few s_client and s_server flags
    
    add -help description of sigalgs, client_sigalgs, curves
    and named_curve
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 apps/apps.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index 99c5809..48c82e8 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -296,10 +296,15 @@ void unbuffer(FILE *fp);
         {"no_resumption_on_reneg", OPT_S_ONRESUMP, '-' }, \
         {"no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-' }, \
         {"strict", OPT_S_STRICT, '-' }, \
-        {"sigalgs", OPT_S_SIGALGS, 's', }, \
-        {"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', }, \
-        {"curves", OPT_S_CURVES, 's', }, \
-        {"named_curve", OPT_S_NAMEDCURVE, 's', }, \
+        {"sigalgs", OPT_S_SIGALGS, 's', \
+            "Signature algorithms to support (colon-separated list)" }, \
+        {"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
+            "Signature algorithms to support for client certificate" \
+            " authentication (colon-separated list)" }, \
+        {"curves", OPT_S_CURVES, 's', \
+            "Elliptic curves to advertise (colon-separated list)" }, \
+        {"named_curve", OPT_S_NAMEDCURVE, 's', \
+            "Elliptic curve used for ECDHE (server-side only)" }, \
         {"cipher", OPT_S_CIPHER, 's', }, \
         {"dhparam", OPT_S_DHPARAM, '<' }, \
         {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-' }