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:
7e47a69
)
Fix in ssltest is no-ssl2 configured
author
Dr. Stephen Henson
<steve@openssl.org>
Mon, 11 Feb 2013 18:17:50 +0000
(18:17 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Mon, 11 Feb 2013 18:29:05 +0000
(18:29 +0000)
(cherry picked from commit
cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4
)
ssl/ssltest.c
patch
|
blob
|
history
diff --git
a/ssl/ssltest.c
b/ssl/ssltest.c
index 542ae0eef1ee5dbc6de379cd47d4bdf6319ea2c0..db87b1a35ea1af9f76ae6f6d4cea17c293ac113b 100644
(file)
--- a/
ssl/ssltest.c
+++ b/
ssl/ssltest.c
@@
-977,7
+977,13
@@
bad:
meth=SSLv23_method();
#else
#ifdef OPENSSL_NO_SSL2
- meth=SSLv3_method();
+ if (tls1)
+ meth=TLSv1_method();
+ else
+ if (ssl3)
+ meth=SSLv3_method();
+ else
+ meth=SSLv23_method();
#else
meth=SSLv2_method();
#endif