nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-lib-ecdsa: fix some memory corruption issues

Browse Source 
great, yay, krüger's first sophisticated C piece

I should really get someone to audit my mess
This commit is contained in:
Maciej Krüger 2021-12-21 13:59:55 +01:00 committed by Alexander List
parent 4612ba45af
commit 117659d1c7
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-lib-ecdsa/src/ecdsa.c
View File

@ -48,7 +48,7 @@ static bool verify(lua_State *L, const char *data, const char *sig, const char *
} }
if (!load_pubkeys(&params, 1, &key, false)) { if (!load_pubkeys(&params, 1, &key, false)) {
return luaL_error(L, "failed loading keys"); return luaL_error(L, "failed loading key");
} }
return do_verify(&params); return do_verify(&params);

18
package/gluon-lib-ecdsa/src/ecdsa_util.c
View File

@ -13,7 +13,7 @@
bool do_verify(struct verify_params* params) { bool do_verify(struct verify_params* params) {
ecdsa_verify_context_t ctxs[params->n_signatures]; ecdsa_verify_context_t ctxs[params->n_signatures];
for (size_t i = 0; i < params->n_signatures; i++) for (size_t i = 0; i < params->n_signatures; i++)
ecdsa_verify_prepare_legacy(&ctxs[i], &params->hash, params->signatures[i]); ecdsa_verify_prepare_legacy(&ctxs[i], &params->hash, &params->signatures[i]);
long unsigned int good_signatures = ecdsa_verify_list_legacy(ctxs, params->n_signatures, params->pubkeys, params->n_pubkeys); long unsigned int good_signatures = ecdsa_verify_list_legacy(ctxs, params->n_signatures, params->pubkeys, params->n_pubkeys);
@ -35,12 +35,11 @@ int hash_data(struct verify_params* params, const char* data) {
} }
int load_pubkeys(struct verify_params* params, const size_t n_pubkeys, const char **pubkeys_str, const bool ignore_pubkeys) { int load_pubkeys(struct verify_params* params, const size_t n_pubkeys, const char **pubkeys_str, const bool ignore_pubkeys) {
params->n_pubkeys = n_pubkeys; params->pubkeys = safe_malloc(n_pubkeys * sizeof(ecc_25519_work_t));
params->pubkeys = safe_malloc(n_pubkeys * sizeof(ecc_25519_work_t));
size_t ignored_keys = 0; size_t ignored_keys = 0;
for (size_t i = 0; i < params->n_pubkeys; i++) { for (size_t i = 0; i < n_pubkeys; i++) {
ecc_int256_t pubkey_packed; ecc_int256_t pubkey_packed;
if (!pubkeys_str[i]) if (!pubkeys_str[i])
goto pubkey_fail; goto pubkey_fail;
@ -61,24 +60,21 @@ pubkey_fail:
} }
} }
params->n_pubkeys -= ignored_keys; params->n_pubkeys = n_pubkeys - ignored_keys;
return 1; return 1;
} }
int load_signatures(struct verify_params* params, const size_t n_signatures, const char **signatures_str, const bool ignore_signatures) { int load_signatures(struct verify_params* params, const size_t n_signatures, const char **signatures_str, const bool ignore_signatures) {
params->n_signatures = n_signatures;
params->signatures = safe_malloc(n_signatures * sizeof(ecdsa_signature_t)); params->signatures = safe_malloc(n_signatures * sizeof(ecdsa_signature_t));
size_t ignored_signatures = 0; size_t ignored_signatures = 0;
for (size_t i = 0; i < params->n_pubkeys; i++) { for (size_t i = 0; i < n_signatures; i++) {
ecdsa_signature_t* signature;
if (!signatures_str[i]) if (!signatures_str[i])
goto signature_fail; goto signature_fail;
if (!parsehex(signature, signatures_str[i], 64)) if (!parsehex(&params->signatures[i-ignored_signatures], signatures_str[i], 64))
goto signature_fail; goto signature_fail;
params->signatures[i-ignored_signatures] = &signature;
continue; continue;
signature_fail: signature_fail:
@ -90,7 +86,7 @@ signature_fail:
} }
} }
params->n_signatures -= ignored_signatures; params->n_signatures = n_signatures - ignored_signatures;
return 1; return 1;
} }

2
package/gluon-lib-ecdsa/src/ecdsa_util.h
View File

@ -5,7 +5,7 @@ struct verify_params {
ecc_int256_t hash; ecc_int256_t hash;
size_t n_signatures; size_t n_signatures;
ecdsa_signature_t **signatures; ecdsa_signature_t *signatures;
size_t n_pubkeys; size_t n_pubkeys;
ecc_25519_work_t *pubkeys; ecc_25519_work_t *pubkeys;