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

Fix valgrind issues

Browse Source 
Test program was re-using RSA and ECC key with multiple imports ops.
wc_RsaPublicKeyDecode() leaked if n parseable but not e.
This commit is contained in:
Sean Parkinson
2017-03-14 09:47:34 +10:00
parent a6cbfe6f93
commit 81731df72f
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/asn.c
View File

@@ -2220,8 +2220,10 @@ int wc_RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
} }
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
if (GetInt(&key->n, input, inOutIdx, inSz) < 0 || if (GetInt(&key->n, input, inOutIdx, inSz) < 0)
GetInt(&key->e, input, inOutIdx, inSz) < 0) { return ASN_RSA_KEY_E;
if (GetInt(&key->e, input, inOutIdx, inSz) < 0) {
mp_clear(&key->n);
return ASN_RSA_KEY_E; return ASN_RSA_KEY_E;
} }

33
wolfcrypt/test/test.c
View File

@@ -5879,11 +5879,19 @@ static int rsa_decode_test(void)
ret = -525; ret = -525;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, -1, &keyPub); ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, -1, &keyPub);
if (ret != 0) { if (ret != 0) {
ret = -526; ret = -526;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
/* Use API. */ /* Use API. */
ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, sizeof(e), &keyPub); ret = wc_RsaPublicKeyDecodeRaw(n, sizeof(n), e, sizeof(e), &keyPub);
@@ -5891,6 +5899,10 @@ static int rsa_decode_test(void)
ret = -527; ret = -527;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
/* Parameter Validation testing. */ /* Parameter Validation testing. */
inSz = sizeof(good); inSz = sizeof(good);
@@ -5984,6 +5996,10 @@ static int rsa_decode_test(void)
goto done; goto done;
} }
/* TODO: Shouldn't ignore object id's data. */ /* TODO: Shouldn't ignore object id's data. */
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
/* Valid data cases. */ /* Valid data cases. */
inSz = sizeof(good); inSz = sizeof(good);
@@ -5997,6 +6013,10 @@ static int rsa_decode_test(void)
ret = -551; ret = -551;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
inSz = sizeof(goodAlgId); inSz = sizeof(goodAlgId);
inOutIdx = 0; inOutIdx = 0;
@@ -6009,6 +6029,10 @@ static int rsa_decode_test(void)
ret = -553; ret = -553;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
inSz = sizeof(goodAlgIdNull); inSz = sizeof(goodAlgIdNull);
inOutIdx = 0; inOutIdx = 0;
@@ -6021,6 +6045,10 @@ static int rsa_decode_test(void)
ret = -555; ret = -555;
goto done; goto done;
} }
wc_FreeRsaKey(&keyPub);
ret = wc_InitRsaKey(&keyPub, NULL);
if (ret != 0)
return -520;
inSz = sizeof(goodBitStrNoZero); inSz = sizeof(goodBitStrNoZero);
inOutIdx = 0; inOutIdx = 0;
@@ -10239,6 +10267,9 @@ static int ecc_exp_imp_test(ecc_key* key)
goto done; goto done;
} }
wc_ecc_free(&keyImp);
wc_ecc_init(&keyImp);
ret = wc_ecc_import_raw_ex(&keyImp, qx, qy, d, ECC_SECP256R1); ret = wc_ecc_import_raw_ex(&keyImp, qx, qy, d, ECC_SECP256R1);
if (ret != 0) { if (ret != 0) {
ret = -1073; ret = -1073;
@@ -12558,7 +12589,7 @@ int mp_test()
* - if p and a are even it will fail. * - if p and a are even it will fail.
*/ */
ret = mp_invmod(&a, &p, &r1); ret = mp_invmod(&a, &p, &r1);
if (ret != 0 && ret != FP_VAL) if (ret != 0 && ret != MP_VAL)
return -11019; return -11019;
ret = 0; ret = 0;