From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Thu, 21 Sep 2017 12:18:10 +0000 (-0500)
Subject: Reenable s_server -dhparam option
X-Git-Tag: OpenSSL_1_1_0g~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae386c988c79119f7ae24740e3d388858c73da3f;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4398)

(cherry picked from commit 51ac82702dc91cabd3dbf890d8f65b285282c0ce)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index bf1f104e5c..a445ad2cc2 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -711,6 +711,7 @@ 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, '<',