ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 10:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify error handling, check mp_copy return value

Browse Source
This commit is contained in:
Matt Johnston 2018-02-10 19:25:00 +08:00
parent cfe99a79bd
commit 3953018c2d
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ecc.c
View File

@ -221,46 +221,41 @@ mp_int * dropbear_ecc_shared_secret(ecc_key *public_key, const ecc_key *private_
/* type valid? */ /* type valid? */
if (private_key->type != PK_PRIVATE) { if (private_key->type != PK_PRIVATE) {
goto done; goto out;
} }
if (private_key->dp != public_key->dp) { if (private_key->dp != public_key->dp) {
goto done; goto out;
} }
/* make new point */ /* make new point */
result = ltc_ecc_new_point(); result = ltc_ecc_new_point();
if (result == NULL) { if (result == NULL) {
goto done; goto out;
} }
prime = m_malloc(sizeof(*prime)); prime = m_malloc(sizeof(*prime));
m_mp_init(prime); m_mp_init(prime);
if (mp_read_radix(prime, (char *)private_key->dp->prime, 16) != CRYPT_OK) { if (mp_read_radix(prime, (char *)private_key->dp->prime, 16) != CRYPT_OK) {
goto done; goto out;
} }
if (ltc_mp.ecc_ptmul(private_key->k, &public_key->pubkey, result, prime, 1) != CRYPT_OK) { if (ltc_mp.ecc_ptmul(private_key->k, &public_key->pubkey, result, prime, 1) != CRYPT_OK) {
goto done; goto out;
} }
err = DROPBEAR_SUCCESS;
done:
if (err == DROPBEAR_SUCCESS) {
shared_secret = m_malloc(sizeof(*shared_secret)); shared_secret = m_malloc(sizeof(*shared_secret));
m_mp_init(shared_secret); m_mp_init(shared_secret);
mp_copy(result->x, shared_secret); if (mp_copy(result->x, shared_secret) != CRYPT_OK) {
goto out;
} }
if (prime) {
mp_clear(prime); mp_clear(prime);
m_free(prime); m_free(prime);
}
if (result)
{
ltc_ecc_del_point(result); ltc_ecc_del_point(result);
}
err = DROPBEAR_SUCCESS;
out:
if (err == DROPBEAR_FAILURE) { if (err == DROPBEAR_FAILURE) {
dropbear_exit("ECC error"); dropbear_exit("ECC error");
} }