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

Fixes for using WOLFSSL_CUSTOM_CURVES and wc_ecc_set_custom_curve. Fixes resolves issue with ->dp and ->idx getting reset which caused curve parameters to not be set correctly. Proper sequence for using custom curves is ‘wc_ecc_init, wc_ecc_set_custom_curve then wc_ecc_make_key_ex(…, ECC_CUSTOM_IDX)’ or wc_ecc_import_x963_ex(…, ECC_CUSTOM_IDX). Test case and example to follow shortly.

Browse Source
This commit is contained in:
David Garske
2017-07-21 10:50:12 -07:00
parent 36c2ee92dc
commit f147b01674
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wolfcrypt/src/ecc.c
View File

@ -1245,6 +1245,10 @@ int wc_ecc_set_curve(ecc_key* key, int keysize, int curve_id)
if (key->idx != ECC_CUSTOM_IDX) { if (key->idx != ECC_CUSTOM_IDX) {
int x; int x;
/* default values */
key->idx = 0;
key->dp = NULL;
/* find ecc_set based on curve_id or key size */ /* find ecc_set based on curve_id or key size */
for (x = 0; ecc_sets[x].size != 0; x++) { for (x = 0; ecc_sets[x].size != 0; x++) {
if (curve_id > ECC_CURVE_DEF) { if (curve_id > ECC_CURVE_DEF) {
@ -2969,6 +2973,12 @@ static int wc_ecc_gen_k(WC_RNG* rng, int size, mp_int* k, mp_int* order)
} }
#endif /* !WOLFSSL_ATECC508A */ #endif /* !WOLFSSL_ATECC508A */
static INLINE void wc_ecc_reset(ecc_key* key)
{
/* make sure required key variables are reset */
key->state = ECC_STATE_NONE;
}
int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id) int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
{ {
int err; int err;
@ -2981,10 +2991,8 @@ 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 */ /* make sure required variables are reset */
key->state = ECC_STATE_NONE; wc_ecc_reset(key);
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) {
@ -4777,7 +4785,6 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
#ifndef WOLFSSL_ATECC508A #ifndef WOLFSSL_ATECC508A
int compressed = 0; int compressed = 0;
#endif /* !WOLFSSL_ATECC508A */ #endif /* !WOLFSSL_ATECC508A */
void* heap;
if (in == NULL || key == NULL) if (in == NULL || key == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -4787,9 +4794,8 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
return ECC_BAD_ARG_E; return ECC_BAD_ARG_E;
} }
heap = key->heap; /* save heap */ /* make sure required variables are reset */
XMEMSET(key, 0, sizeof(ecc_key)); wc_ecc_reset(key);
key->heap = heap; /* restore heap */
#ifdef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
/* TODO: Implement equiv call to ATECC508A */ /* TODO: Implement equiv call to ATECC508A */
@ -5086,18 +5092,14 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
/* public optional, NULL if only importing private */ /* public optional, NULL if only importing private */
if (pub != NULL) { if (pub != NULL) {
ret = wc_ecc_import_x963_ex(pub, pubSz, key, curve_id); ret = wc_ecc_import_x963_ex(pub, pubSz, key, curve_id);
}
} else { else {
if (key == NULL || priv == NULL) if (key == NULL || priv == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
/* make sure required key variables are reset */ /* make sure required variables are reset */
key->state = ECC_STATE_NONE; wc_ecc_reset(key);
key->idx = 0;
key->dp = NULL;
/* set key size */ /* set key size */
ret = wc_ecc_set_curve(key, privSz, curve_id); ret = wc_ecc_set_curve(key, privSz, curve_id);
@ -5236,16 +5238,14 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
const char* qy, const char* d, int curve_id) const char* qy, const char* d, int curve_id)
{ {
int err = MP_OKAY; int err = MP_OKAY;
void* heap;
/* if d is NULL, only import as public key using Qx,Qy */ /* if d is NULL, only import as public key using Qx,Qy */
if (key == NULL || qx == NULL || qy == NULL) { if (key == NULL || qx == NULL || qy == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
heap = key->heap; /* save heap */ /* make sure required variables are reset */
XMEMSET(key, 0, sizeof(ecc_key)); wc_ecc_reset(key);
key->heap = heap; /* restore heap */
/* set curve type and index */ /* set curve type and index */
err = wc_ecc_set_curve(key, 0, curve_id); err = wc_ecc_set_curve(key, 0, curve_id);