projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22e311c
)
Reenable s_server -dhparam option
author
Benjamin Kaduk
<bkaduk@akamai.com>
Thu, 21 Sep 2017 12:18:10 +0000
(07:18 -0500)
committer
Benjamin Kaduk
<kaduk@mit.edu>
Thu, 21 Sep 2017 18:50:12 +0000
(13:50 -0500)
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
)
apps/s_server.c
patch
|
blob
|
history
diff --git
a/apps/s_server.c
b/apps/s_server.c
index bf1f104e5ce97ebb667aa0d377d58a0ff9f9323a..a445ad2cc26763429c911c3df1bd6e8c08761b22 100644
(file)
--- 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, '<',