@@ -13939,6 +13939,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aes_cbc_test(void)
1393913939 if ((bigCipher == NULL) ||
1394013940 (bigPlain == NULL)) {
1394113941 XFREE(bigCipher, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
13942+ XFREE(bigPlain, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
1394213943 ERROR_OUT(WC_TEST_RET_ENC_NC, out);
1394313944 }
1394413945#else
@@ -35099,6 +35100,16 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t curve25519_test(void)
3509935100 (void)x;
3510035101 WOLFSSL_ENTER("curve25519_test");
3510135102
35103+ /* wc_FreeRng is always called on exit. Therefore wc_InitRng should be
35104+ * called before any exit goto's */
35105+ #ifndef HAVE_FIPS
35106+ ret = wc_InitRng_ex(&rng, HEAP_HINT, devId);
35107+ #else
35108+ ret = wc_InitRng(&rng);
35109+ #endif
35110+ if (ret != 0)
35111+ ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup);
35112+
3510235113#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
3510335114 userA = wc_curve25519_new(HEAP_HINT, devId, &ret);
3510435115 if (ret != 0)
@@ -35115,14 +35126,6 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t curve25519_test(void)
3511535126 wc_curve25519_init_ex(pubKey, HEAP_HINT, devId);
3511635127#endif
3511735128
35118- #ifndef HAVE_FIPS
35119- ret = wc_InitRng_ex(&rng, HEAP_HINT, devId);
35120- #else
35121- ret = wc_InitRng(&rng);
35122- #endif
35123- if (ret != 0)
35124- ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup);
35125-
3512635129 /* make curve25519 keys */
3512735130 ret = wc_curve25519_make_key(&rng, 32, userA);
3512835131 if (ret != 0)
0 commit comments