mirror of https://github.com/wolfSSL/wolfssl
Fixes to cleanup unnecessary ECC make key, check key and free in ECC vector item test.
This commit is contained in:
parent
1649af37be
commit
03765ecca7
|
@ -6239,7 +6239,7 @@ typedef struct eccVector {
|
|||
word32 keySize;
|
||||
} eccVector;
|
||||
|
||||
static int ecc_test_vector_item(const eccVector* vector, WC_RNG* rng)
|
||||
static int ecc_test_vector_item(const eccVector* vector)
|
||||
{
|
||||
int ret, verify;
|
||||
word32 x;
|
||||
|
@ -6248,18 +6248,9 @@ static int ecc_test_vector_item(const eccVector* vector, WC_RNG* rng)
|
|||
|
||||
wc_ecc_init(&userA);
|
||||
|
||||
ret = wc_ecc_make_key(rng, vector->keySize, &userA);
|
||||
if (ret != 0)
|
||||
return -1014;
|
||||
|
||||
ret = wc_ecc_check_key(&userA);
|
||||
if (ret != 0)
|
||||
return -1024;
|
||||
|
||||
memset(sig, 0, sizeof(sig));
|
||||
x = sizeof(sig);
|
||||
|
||||
wc_ecc_free(&userA); /* free key before importing a new one over the top */
|
||||
ret = wc_ecc_import_raw(&userA, vector->Qx, vector->Qy,
|
||||
vector->d, vector->curveName);
|
||||
if (ret != 0)
|
||||
|
@ -6281,7 +6272,7 @@ static int ecc_test_vector_item(const eccVector* vector, WC_RNG* rng)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ecc_test_vector(WC_RNG* rng, int keySize)
|
||||
static int ecc_test_vector(int keySize)
|
||||
{
|
||||
int ret;
|
||||
eccVector vec;
|
||||
|
@ -6433,7 +6424,7 @@ static int ecc_test_vector(WC_RNG* rng, int keySize)
|
|||
return NOT_COMPILED_IN; /* Invalid key size / Not supported */
|
||||
}; /* Switch */
|
||||
|
||||
ret = ecc_test_vector_item(&vec, rng);
|
||||
ret = ecc_test_vector_item(&vec);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
@ -6689,7 +6680,7 @@ static int ecc_test_curve(WC_RNG* rng, int keySize)
|
|||
}
|
||||
|
||||
#ifdef HAVE_ECC_VECTOR_TEST
|
||||
ret = ecc_test_vector(rng, keySize);
|
||||
ret = ecc_test_vector(keySize);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue