wolfcrypt/test/test.c: fix an error-path leak in dh_test(), and deal with possible -Wdeclaration-after-statement for XFILE file.

This commit is contained in:
Daniel Pouzzner
2020-08-26 22:17:22 -05:00
parent a7381f8a48
commit ca1a991de5

View File

@@ -14577,15 +14577,17 @@ static int dh_test(void)
#elif defined(NO_ASN) #elif defined(NO_ASN)
/* don't use file, no DER parsing */ /* don't use file, no DER parsing */
#elif !defined(NO_FILESYSTEM) #elif !defined(NO_FILESYSTEM)
{
XFILE file = XFOPEN(dhParamsFile, "rb"); XFILE file = XFOPEN(dhParamsFile, "rb");
if (! file) if (! file)
ERROR_OUT(-7900, done); ERROR_OUT(-7900, done);
bytes = (word32) XFREAD(tmp, 1, DH_TEST_TMP_SIZE, file); bytes = (word32) XFREAD(tmp, 1, DH_TEST_TMP_SIZE, file);
XFCLOSE(file); XFCLOSE(file);
}
#else #else
/* No DH key to use. */ /* No DH key to use. */
return -7901; ERROR_OUT(-7901, done);
#endif /* USE_CERT_BUFFERS */ #endif /* USE_CERT_BUFFERS */
(void)idx; (void)idx;