dany/luasec
1
0
Fork 0
mirror of https://github.com/brunoos/luasec.git synced 2024-12-27 12:58:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Assuming that TLS 1.1 and TLS 1.2 are available

Browse Source 
Fix some #if's also.
This commit is contained in:
Bruno Silvestre 2018-09-12 18:03:37 -03:00
parent f42c171d55
commit 5514c4a06e
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/context.c
View File

@ -59,7 +59,23 @@ static int set_option_flag(const char *opt, unsigned long *flag)
return 0; return 0;
} }
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) #if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) || (OPENSSL_VERSION_NUMBER < 0x1010000fL)
/**
* Find the protocol.
*/
static const SSL_METHOD* str2method(const char *method, int *vmin, int *vmax)
{
(void)vmin;
(void)vmax;
if (!strcmp(method, "any")) return SSLv23_method();
if (!strcmp(method, "sslv23")) return SSLv23_method(); // deprecated
if (!strcmp(method, "tlsv1")) return TLSv1_method();
if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();
if (!strcmp(method, "tlsv1_2")) return TLSv1_2_method();
return NULL;
}
#else
/** /**
* Find the protocol. * Find the protocol.
@ -89,26 +105,6 @@ static const SSL_METHOD* str2method(const char *method, int *vmin, int *vmax)
return NULL; return NULL;
} }
#else
/**
* Find the protocol.
*/
static const SSL_METHOD* str2method(const char *method, int *vmin, int *vmax)
{
(void)vmin;
(void)vmax;
if (!strcmp(method, "any")) return SSLv23_method();
if (!strcmp(method, "sslv23")) return SSLv23_method(); // deprecated
if (!strcmp(method, "tlsv1")) return TLSv1_method();
#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();
if (!strcmp(method, "tlsv1_2")) return TLSv1_2_method();
#endif
return NULL;
}
#endif #endif
/** /**
@ -329,7 +325,7 @@ static int create(lua_State *L)
ERR_reason_error_string(ERR_get_error())); ERR_reason_error_string(ERR_get_error()));
return 2; return 2;
} }
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) #if ! ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) || (OPENSSL_VERSION_NUMBER < 0x1010000fL))
SSL_CTX_set_min_proto_version(ctx->context, vmin); SSL_CTX_set_min_proto_version(ctx->context, vmin);
SSL_CTX_set_max_proto_version(ctx->context, vmax); SSL_CTX_set_max_proto_version(ctx->context, vmax);
#endif #endif