recent changes from 0.9.8: fix cipher list order in s3_lib.c,

make "no-ssl2" work again

PR: 1217
This commit is contained in:
Nils Larsch
2006-01-15 17:35:28 +00:00
parent 9e9bececa9
commit 00fe865dbe
3 changed files with 112 additions and 101 deletions

View File

@@ -63,13 +63,21 @@
static const SSL_METHOD *ssl23_get_method(int ver);
static const SSL_METHOD *ssl23_get_method(int ver)
{
#ifndef OPENSSL_NO_SSL2
if (ver == SSL2_VERSION)
return(SSLv2_method());
else if (ver == SSL3_VERSION)
else
#endif
#ifndef OPENSSL_NO_SSL3
if (ver == SSL3_VERSION)
return(SSLv3_method());
else if (ver == TLS1_VERSION)
else
#endif
#ifndef OPENSSL_NO_TLS1
if (ver == TLS1_VERSION)
return(TLSv1_method());
else
#endif
return(NULL);
}