dany/luasec
1
0
Fork 0
mirror of https://github.com/brunoos/luasec.git synced 2024-10-05 01:56:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add useful context to various error messages

Browse Source
This commit is contained in:
Paul Aurich 2013-09-07 15:56:55 -07:00
parent 9262f9e7de
commit 9c7c96f2a0
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/context.c
View File

@ -272,12 +272,14 @@ static EC_KEY *find_ec_key(const char *str)
static int create(lua_State *L) static int create(lua_State *L)
{ {
p_context ctx; p_context ctx;
const char *str_method;
LSEC_SSL_METHOD *method; LSEC_SSL_METHOD *method;
method = str2method(luaL_checkstring(L, 1)); str_method = luaL_checkstring(L, 1);
method = str2method(str_method);
if (!method) { if (!method) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "invalid protocol"); lua_pushfstring(L, "invalid protocol (%s)", str_method);
return 2; return 2;
} }
ctx = (p_context) lua_newuserdata(L, sizeof(t_context)); ctx = (p_context) lua_newuserdata(L, sizeof(t_context));
@ -289,7 +291,8 @@ static int create(lua_State *L)
ctx->context = SSL_CTX_new(method); ctx->context = SSL_CTX_new(method);
if (!ctx->context) { if (!ctx->context) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "error creating context"); lua_pushfstring(L, "error creating context (%s)",
ERR_reason_error_string(ERR_get_error()));
return 2; return 2;
} }
ctx->mode = LSEC_MODE_INVALID; ctx->mode = LSEC_MODE_INVALID;
@ -414,7 +417,7 @@ static int set_verify(lua_State *L)
str = luaL_checkstring(L, i); str = luaL_checkstring(L, i);
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_pushfstring(L, "invalid verify option (%s)", str);
return 2; return 2;
} }
} }
@ -445,7 +448,7 @@ static int set_options(lua_State *L)
#endif #endif
if (!set_option_flag(str, &flag)) { if (!set_option_flag(str, &flag)) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "invalid option"); lua_pushfstring(L, "invalid option (%s)", str);
return 2; return 2;
} }
} }
@ -473,7 +476,7 @@ static int set_mode(lua_State *L)
return 1; return 1;
} }
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "invalid mode"); lua_pushfstring(L, "invalid mode (%s)", str);
return 1; return 1;
} }
@ -514,7 +517,7 @@ static int set_curve(lua_State *L)
if (!key) { if (!key) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "elliptic curve not supported"); lua_pushfstring(L, "elliptic curve %s not supported", str);
return 2; return 2;
} }
@ -524,7 +527,8 @@ static int set_curve(lua_State *L)
if (!ret) { if (!ret) {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "error setting elliptic curve"); lua_pushfstring(L, "error setting elliptic curve (%s)",
ERR_reason_error_string(ERR_get_error()));
return 2; return 2;
} }
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
@ -608,7 +612,7 @@ static int meth_set_verify_ext(lua_State *L)
crl_flag |= X509_V_FLAG_CRL_CHECK_ALL; crl_flag |= X509_V_FLAG_CRL_CHECK_ALL;
} else { } else {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
lua_pushstring(L, "invalid verify option"); lua_pushfstring(L, "invalid verify option (%s)", str);
return 2; return 2;
} }
} }

3
src/ssl.c
View File

@ -245,7 +245,8 @@ static int meth_create(lua_State *L)
ssl->ssl = SSL_new(ctx); ssl->ssl = SSL_new(ctx);
if (!ssl->ssl) { if (!ssl->ssl) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "error creating SSL object"); lua_pushfstring(L, "error creating SSL object (%s)",
ERR_reason_error_string(ERR_get_error()));
return 2; return 2;
} }
ssl->state = LSEC_STATE_NEW; ssl->state = LSEC_STATE_NEW;

5
src/x509.c
View File

@ -306,12 +306,13 @@ static int meth_digest(lua_State* L)
} }
if (!digest) { if (!digest) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "digest algorithm not supported"); lua_pushfstring(L, "digest algorithm not supported (%s)", str);
return 2; return 2;
} }
if (!X509_digest(cert, digest, buffer, &bytes)) { if (!X509_digest(cert, digest, buffer, &bytes)) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "error processing the certificate"); lua_pushfstring(L, "error processing the certificate (%s)",
ERR_reason_error_string(ERR_get_error()));
return 2; return 2;
} }
to_hex((char*)buffer, bytes, hex_buffer); to_hex((char*)buffer, bytes, hex_buffer);