From 40dda7e80faa483f02ed30c9c976d2bf38728e2c Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 21 Jun 2022 17:24:14 -0600 Subject: [PATCH] fix XMALLOC in test and add filesystem macro guard --- tests/api.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/api.c b/tests/api.c index 9a560eb06..77ee95c5f 100644 --- a/tests/api.c +++ b/tests/api.c @@ -2262,7 +2262,7 @@ static void test_wolfSSL_CertManagerNameConstraint5(void) static void test_wolfSSL_FPKI(void) { -#if defined(WOLFSSL_FPKI) +#if defined(WOLFSSL_FPKI) && !defined(NO_FILESYSTEM) XFILE f; const char* fpkiCert = "./certs/fpki-cert.der"; DecodedCert cert; @@ -2282,16 +2282,16 @@ static void test_wolfSSL_FPKI(void) wc_InitDecodedCert(&cert, buf, bytes, NULL); AssertIntEQ(wc_ParseCert(&cert, CERT_TYPE, 0, NULL), 0); AssertIntEQ(wc_GetFASCNFromCert(&cert, NULL, &fascnSz), LENGTH_ONLY_E) ; - fascn = (byte*)XMALLOC(fascnSz, DYNAMIC_TYPE_TMP_BUFFER, NULL); + fascn = (byte*)XMALLOC(fascnSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); AssertNotNull(fascn); AssertIntEQ(wc_GetFASCNFromCert(&cert, fascn, &fascnSz), 0); - XFREE(fascn, DYNAMIC_TYPE_TMP_BUFFER, NULL); + XFREE(fascn, NULL, DYNAMIC_TYPE_TMP_BUFFER); AssertIntEQ(wc_GetUUIDFromCert(&cert, NULL, &uuidSz), LENGTH_ONLY_E); - uuid = (byte*)XMALLOC(uuidSz, DYNAMIC_TYPE_TMP_BUFFER, NULL); + uuid = (byte*)XMALLOC(uuidSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); AssertNotNull(uuid); AssertIntEQ(wc_GetUUIDFromCert(&cert, uuid, &uuidSz), 0); - XFREE(uuid, DYNAMIC_TYPE_TMP_BUFFER, NULL); + XFREE(uuid, NULL, DYNAMIC_TYPE_TMP_BUFFER); wc_FreeDecodedCert(&cert); printf(resultFmt, passed);