dany/luasec
1
0
Fork 0
mirror of https://github.com/brunoos/luasec.git synced 2024-11-08 06:28:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

context: no_compression is options, not verify

Browse Source 
The OpenSSL 0.9.8 compat needs to be handled as part of the options, not the
verification flags.
This commit is contained in:
Paul Aurich 2013-06-12 18:33:19 -07:00
parent f77fb40033
commit 9bda3322fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/context.c
View File

@ -406,12 +406,6 @@ static int set_verify(lua_State *L)
int max = lua_gettop(L); int max = lua_gettop(L);
for (i = 2; i <= max; i++) { for (i = 2; i <= max; i++) {
str = luaL_checkstring(L, i); str = luaL_checkstring(L, i);
#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL)
/* Version 0.9.8 has a different way to disable compression */
if (!strcmp(luaL_checkstring(L, i), "no_compression"))
ctx->comp_methods = NULL;
else
#endif
if (!set_verify_flag(str, &flag)) { if (!set_verify_flag(str, &flag)) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "invalid verify option"); lua_pushstring(L, "invalid verify option");
@ -435,6 +429,12 @@ static int set_options(lua_State *L)
/* any option? */ /* any option? */
if (max > 1) { if (max > 1) {
for (i = 2; i <= max; i++) { for (i = 2; i <= max; i++) {
#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL)
/* Version 0.9.8 has a different way to disable compression */
if (!strcmp(luaL_checkstring(L, i), "no_compression"))
ctx->comp_methods = NULL;
else
#endif
if (!set_option_flag(luaL_checkstring(L, i), &flag)) { if (!set_option_flag(luaL_checkstring(L, i), &flag)) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "invalid option"); lua_pushstring(L, "invalid option");