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:
5584a95
)
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:28:48 +0000
(18:28 +0000)
(cherry picked from commit
cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4
)
ssl/ssltest.c
patch
|
blob
|
history
diff --git
a/ssl/ssltest.c
b/ssl/ssltest.c
index 3c010409abeb5e3cd8d5908c867a074eb86b46da..f8c75c09d78e6aab649ddc7025e5a5a1ee7c9d38 100644
(file)
--- a/
ssl/ssltest.c
+++ b/
ssl/ssltest.c
@@
-970,7
+970,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