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

Perform all validation before allocating structures

Browse Source 
Check that all arguments are certificates before allocating OpenSSL
structures that require cleanup afterwards.

API of issued() changes (again) to root:issued(cert, [chain]*)
This commit is contained in:
Kim Alvefur 2015-03-31 17:48:44 +02:00
parent aa0c7ea1e5
commit 4e59c719df
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/x509.c
View File

@ -403,16 +403,25 @@ static int meth_issued(lua_State* L)
X509_STORE_CTX* ctx = NULL; X509_STORE_CTX* ctx = NULL;
X509_STORE* root = NULL; X509_STORE* root = NULL;
STACK_OF(X509)* chain = sk_X509_new_null(); STACK_OF(X509)* chain = NULL;
X509* issuer = lsec_checkx509(L, 1); X509* issuer = lsec_checkx509(L, 1);
X509* subject; X509* subject = lsec_checkx509(L, 2);
X509* cert = NULL;
ctx = X509_STORE_CTX_new();
root = X509_STORE_new();
len = lua_gettop(L); len = lua_gettop(L);
/* fprintf(stderr, "len = %d\n", len); */
/* Check that all arguments are certificates */
for (i = 3; i <= len; i++) {
lsec_checkx509(L, i);
}
/* Before allocating things that require freeing afterwards */
chain = sk_X509_new_null();
ctx = X509_STORE_CTX_new();
root = X509_STORE_new();
if (ctx == NULL || root == NULL) { if (ctx == NULL || root == NULL) {
lua_pushnil(L); lua_pushnil(L);
@ -430,16 +439,11 @@ static int meth_issued(lua_State* L)
goto cleanup; goto cleanup;
} }
for (i = 2; i < len && lua_isuserdata(L, i); i++) { for (i = 3; i <= len && lua_isuserdata(L, i); i++) {
/* fprintf(stderr, "i = %d\n", i); */ cert = lsec_checkx509(L, i);
/* FIXME Don't leak stuff if it's wrong */ sk_X509_push(chain, cert);
subject = lsec_checkx509(L, i);
sk_X509_push(chain, subject);
issuer = subject;
} }
subject = lsec_checkx509(L, len);
ret = X509_STORE_CTX_init(ctx, root, subject, chain); ret = X509_STORE_CTX_init(ctx, root, subject, chain);
if(!ret) { if(!ret) {
@ -470,7 +474,7 @@ cleanup:
X509_STORE_free(root); X509_STORE_free(root);
} }
sk_X509_free(chain); sk_X509_free(chain);
return ret; return ret;
} }