wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with wc_ecc_make_key where state failure can occur if the wc_ecc_init hasn’t been called on key prior. Now wc_ecc_make_key and wc_ecc_import_private_key (and _ex versions) can be called without having to call wc_ecc_init first. This keeps backwards compatibility. If async or static memory is desired then wc_ecc_init_ex must be called first.

Browse Source
This commit is contained in:
David Garske
2017-04-11 15:57:09 -07:00
parent 85bef98331
commit d0f31d4a30
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfcrypt/src/ecc.c
View File

@@ -3005,6 +3005,11 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
/* make sure required key variables are reset */
key->state = ECC_STATE_NONE;
key->idx = 0;
key->dp = NULL;
err = wc_ecc_set_curve(key, keysize, curve_id); err = wc_ecc_set_curve(key, keysize, curve_id);
if (err != 0) { if (err != 0) {
return err; return err;
@@ -3255,6 +3260,7 @@ int wc_ecc_init_ex(ecc_key* key, void* heap, int devId)
#endif #endif
XMEMSET(key, 0, sizeof(ecc_key)); XMEMSET(key, 0, sizeof(ecc_key));
key->state = ECC_STATE_NONE;
#ifdef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
key->slot = atmel_ecc_alloc(); key->slot = atmel_ecc_alloc();
@@ -5083,7 +5089,6 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
int curve_id) int curve_id)
{ {
int ret; int ret;
void* heap;
/* public optional, NULL if only importing private */ /* public optional, NULL if only importing private */
if (pub != NULL) { if (pub != NULL) {
@@ -5095,15 +5100,10 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
if (key == NULL || priv == NULL) if (key == NULL || priv == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* init key */ /* make sure required key variables are reset */
heap = key->heap;
ret = wc_ecc_init_ex(key, NULL, INVALID_DEVID);
key->heap = heap;
key->state = ECC_STATE_NONE; key->state = ECC_STATE_NONE;
key->idx = 0;
if (ret != 0) key->dp = NULL;
return ret;
/* set key size */ /* set key size */
ret = wc_ecc_set_curve(key, privSz, curve_id); ret = wc_ecc_set_curve(key, privSz, curve_id);