forked from wolfSSL/wolfssl
Merge pull request #364 from toddouska/ecc-test-free
Fixes to cleanup unnecessary ECC make key, check key and free in ECC vector item test.
This commit is contained in:
@@ -6239,7 +6239,7 @@ typedef struct eccVector {
|
|||||||
word32 keySize;
|
word32 keySize;
|
||||||
} eccVector;
|
} 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;
|
int ret, verify;
|
||||||
word32 x;
|
word32 x;
|
||||||
@@ -6248,14 +6248,6 @@ static int ecc_test_vector_item(const eccVector* vector, WC_RNG* rng)
|
|||||||
|
|
||||||
wc_ecc_init(&userA);
|
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));
|
memset(sig, 0, sizeof(sig));
|
||||||
x = sizeof(sig);
|
x = sizeof(sig);
|
||||||
|
|
||||||
@@ -6280,7 +6272,7 @@ static int ecc_test_vector_item(const eccVector* vector, WC_RNG* rng)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ecc_test_vector(WC_RNG* rng, int keySize)
|
static int ecc_test_vector(int keySize)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
eccVector vec;
|
eccVector vec;
|
||||||
@@ -6432,7 +6424,7 @@ static int ecc_test_vector(WC_RNG* rng, int keySize)
|
|||||||
return NOT_COMPILED_IN; /* Invalid key size / Not supported */
|
return NOT_COMPILED_IN; /* Invalid key size / Not supported */
|
||||||
}; /* Switch */
|
}; /* Switch */
|
||||||
|
|
||||||
ret = ecc_test_vector_item(&vec, rng);
|
ret = ecc_test_vector_item(&vec);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -6688,7 +6680,7 @@ static int ecc_test_curve(WC_RNG* rng, int keySize)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_ECC_VECTOR_TEST
|
#ifdef HAVE_ECC_VECTOR_TEST
|
||||||
ret = ecc_test_vector(rng, keySize);
|
ret = ecc_test_vector(keySize);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user