aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-12-15 10:43:44 +0000
committerMatt Caswell <matt@openssl.org>2015-12-15 11:26:38 +0000
commit8caab744f5698ed2b55eca20f032540f713327fd (patch)
tree595b532b5149361b2a71decd6ecafdcbf1964142 /doc
parent73cd6175b970fa63c9c70d769febd91f3c7b5cdd (diff)
downloadopenssl-8caab744f5698ed2b55eca20f032540f713327fd.tar.gz
Fix s_server problem with no-ec
s_server was trying to set the ECDH curve when no-ec was defined. This also highlighted the fact that the -no_ecdhe option to s_server is broken, and doesn't make any sense any more (ECDHE is on by default and the only way it can be disabled is through the cipherstring). Therefore this commit removes the option. Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/apps/s_server.pod6
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index c1a1d1a022..59d600d99c 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -76,7 +76,6 @@ B<openssl> B<s_server>
[B<-no_ssl3>]
[B<-no_tls1>]
[B<-no_dhe>]
-[B<-no_ecdhe>]
[B<-bugs>]
[B<-brief>]
[B<-www>]
@@ -180,11 +179,6 @@ 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 loaded effectively
-disabling the ephemeral ECDH cipher suites.
-
=item B<-crl_check>, B<-crl_check_all>
Check the peer certificate has not been revoked by its CA.