Guard SSLv3_method() with #ifndef OPENSSL_NO_SSL3.

Use TLS_method() instead of SSLv32_method(), when it is the case.
This commit is contained in:
Bruno Silvestre 2015-11-20 18:54:57 -02:00
parent 21aefcf67d
commit d36e156fac

View File

@ -35,6 +35,10 @@ typedef const SSL_METHOD LSEC_SSL_METHOD;
typedef SSL_METHOD LSEC_SSL_METHOD; typedef SSL_METHOD LSEC_SSL_METHOD;
#endif #endif
#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#define SSLv23_method() TLS_method()
#endif
/*--------------------------- Auxiliary Functions ----------------------------*/ /*--------------------------- Auxiliary Functions ----------------------------*/
/** /**
@ -66,7 +70,9 @@ static int set_option_flag(const char *opt, unsigned long *flag)
static LSEC_SSL_METHOD* str2method(const char *method) static LSEC_SSL_METHOD* str2method(const char *method)
{ {
if (!strcmp(method, "sslv23")) return SSLv23_method(); if (!strcmp(method, "sslv23")) return SSLv23_method();
#ifndef OPENSSL_NO_SSL3
if (!strcmp(method, "sslv3")) return SSLv3_method(); if (!strcmp(method, "sslv3")) return SSLv3_method();
#endif
if (!strcmp(method, "tlsv1")) return TLSv1_method(); if (!strcmp(method, "tlsv1")) return TLSv1_method();
#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) #if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method(); if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();