feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for "wc_ecc_make_key_ex" if call to rng fails. Issue only applies to !USE_FAST_MATH case on failure response from call to "wc_RNG_GenerateBlock".

Browse Source
This commit is contained in:
David Garske
2016-11-10 11:39:29 -08:00
parent af44b2527a
commit 1aca9a6079
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfcrypt/src/ecc.c
View File

@@ -2505,23 +2505,27 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
/* make up random string */ /* make up random string */
err = wc_RNG_GenerateBlock(rng, buf, keysize); err = wc_RNG_GenerateBlock(rng, buf, keysize);
if (err != 0) {
#ifdef WOLFSSL_SMALL_STACK
XFREE(buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return err;
}
/* setup the key variables */ /* setup the key variables */
if (err == 0) { err = mp_init_multi(&key->k, &prime, &order, &a, NULL, NULL);
err = mp_init_multi(&key->k, &prime, &order, &a, NULL, NULL); if (err == MP_OKAY) {
if (err == MP_OKAY) { #ifndef ALT_ECC_SIZE
#ifndef ALT_ECC_SIZE err = mp_init_multi(key->pubkey.x, key->pubkey.y, key->pubkey.z,
err = mp_init_multi(key->pubkey.x, key->pubkey.y, key->pubkey.z, NULL, NULL, NULL);
NULL, NULL, NULL); #else
#else key->pubkey.x = (mp_int*)&key->pubkey.xyz[0];
key->pubkey.x = (mp_int*)&key->pubkey.xyz[0]; key->pubkey.y = (mp_int*)&key->pubkey.xyz[1];
key->pubkey.y = (mp_int*)&key->pubkey.xyz[1]; key->pubkey.z = (mp_int*)&key->pubkey.xyz[2];
key->pubkey.z = (mp_int*)&key->pubkey.xyz[2]; alt_fp_init(key->pubkey.x);
alt_fp_init(key->pubkey.x); alt_fp_init(key->pubkey.y);
alt_fp_init(key->pubkey.y); alt_fp_init(key->pubkey.z);
alt_fp_init(key->pubkey.z); #endif
#endif
}
} }
if (err == MP_OKAY) { if (err == MP_OKAY) {