From: Hubert Kario <hkario@redhat.com>
Date: Mon, 27 Aug 2018 13:21:18 +0000 (+0800)
Subject: document the -no_ecdhe option in s_server man page
X-Git-Tag: OpenSSL_1_0_2q~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19096672b48b3282bb9f11c4adadbcdd545f54a3;p=oweals%2Fopenssl.git

document the -no_ecdhe option in s_server man page

the option is provided in the -help message of the s_server utility
but it is not documented in the man page, this fixes it

Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/7046)
---

diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 9916fc3ef6..84777ee80a 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -49,6 +49,7 @@ B<openssl> B<s_server>
 [B<-no_ssl3>]
 [B<-no_tls1>]
 [B<-no_dhe>]
+[B<-no_ecdhe>]
 [B<-bugs>]
 [B<-hack>]
 [B<-www>]
@@ -144,6 +145,11 @@ a static set of parameters hard coded into the s_server program will be used.
 if this option is set then no DH parameters will be loaded effectively
 disabling the ephemeral DH cipher suites.
 
+=item B<-no_ecdhe>
+
+if this option is set then no ECDH parameters will be selected, effectively
+disabling the ephemeral ECDH cipher suites.
+
 =item B<-no_tmp_rsa>
 
 certain export cipher suites sometimes use a temporary RSA key, this option