[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  51ac82702dc91cabd3dbf890d8f65b285282c0ce (commit)
      from  800c4883d0a0e98fa511ee166bd0c6fbfb4baf22 (commit)


- Log -----------------------------------------------------------------
commit 51ac82702dc91cabd3dbf890d8f65b285282c0ce
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Sep 21 07:18:10 2017 -0500

    Reenable s_server -dhparam option
    
    This option was lost when converting to a table-driven option parser
    in commit 7e1b7485706c2b11091b5fa897fe496a2faa56cc.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4398)

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

Summary of changes:
 apps/s_server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/s_server.c b/apps/s_server.c
index c45256a..d54909a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -795,6 +795,7 @@ const OPTIONS s_server_options[] = {
     {"pass", OPT_PASS, 's', "Private key file pass phrase source"},
     {"dcert", OPT_DCERT, '<',
      "Second certificate file to use (usually for DSA)"},
+    {"dhparam", OPT_DHPARAM, '<', "DH parameters file to use"},
     {"dcertform", OPT_DCERTFORM, 'F',
      "Second certificate format (PEM or DER) PEM default"},
     {"dkey", OPT_DKEY, '<',