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:
017a15c
)
Fix s_server -ssl2. Previously this reported "Error setting EC curve"
author
Matt Caswell
<matt@openssl.org>
Wed, 19 Nov 2014 16:02:49 +0000
(16:02 +0000)
committer
Matt Caswell
<matt@openssl.org>
Wed, 19 Nov 2014 23:57:02 +0000
(23:57 +0000)
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit
13d568661c14f71b3c6af263e1b60b92be738f57
)
apps/s_server.c
patch
|
blob
|
history
diff --git
a/apps/s_server.c
b/apps/s_server.c
index a2004b065b596912233f5fa7a74a8f325097f9da..dbc4373044f9650d91306c586c7a17121aca4bc9 100644
(file)
--- a/
apps/s_server.c
+++ b/
apps/s_server.c
@@
-1400,7
+1400,10
@@
int MAIN(int argc, char *argv[])
{ www=3; }
#ifndef OPENSSL_NO_SSL2
else if (strcmp(*argv,"-ssl2") == 0)
- { meth=SSLv2_server_method(); }
+ {
+ no_ecdhe=1;
+ meth=SSLv2_server_method();
+ }
#endif
#ifndef OPENSSL_NO_SSL3_METHOD
else if (strcmp(*argv,"-ssl3") == 0)