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

Merge pull request #3377 from douzzer/PR3371

Browse Source 
fix pkcs7compressed_test() (test gated on HAVE_LIBZ), broken by PR#3244.
This commit is contained in:
John Safranek
2020-10-09 15:00:15 -07:00
committed by GitHub
parent 3e69318ac7 29d4de6307
commit 724eb96047
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/test/test.c
View File

@@ -27522,8 +27522,14 @@ static int pkcs7compressed_test(void)
int i, testSz; int i, testSz;
int compressedSz, decodedSz; int compressedSz, decodedSz;
PKCS7* pkcs7; PKCS7* pkcs7;
#ifdef WOLFSSL_SMALL_STACK
byte *compressed; byte *compressed;
byte *decoded; byte *decoded;
#else
byte compressed[PKCS7_BUF_SIZE];
byte decoded[PKCS7_BUF_SIZE];
#endif
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
XFILE pkcs7File; XFILE pkcs7File;
#endif #endif
@@ -27541,11 +27547,13 @@ static int pkcs7compressed_test(void)
"pkcs7compressedData_firmwarePkgData_zlib.der"}, "pkcs7compressedData_firmwarePkgData_zlib.der"},
}; };
enveloped = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); #ifdef WOLFSSL_SMALL_STACK
compressed = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! enveloped) || (! decoded)) { if ((! compressed) || (! decoded)) {
ERROR_OUT(MEMORY_E, out); ERROR_OUT(MEMORY_E, out);
} }
#endif
testSz = sizeof(testVectors) / sizeof(pkcs7CompressedVector); testSz = sizeof(testVectors) / sizeof(pkcs7CompressedVector);
@@ -27561,7 +27569,7 @@ static int pkcs7compressed_test(void)
/* encode compressedData */ /* encode compressedData */
compressedSz = wc_PKCS7_EncodeCompressedData(pkcs7, compressed, compressedSz = wc_PKCS7_EncodeCompressedData(pkcs7, compressed,
sizeof(compressed)); PKCS7_BUF_SIZE);
if (compressedSz <= 0) { if (compressedSz <= 0) {
wc_PKCS7_Free(pkcs7); wc_PKCS7_Free(pkcs7);
ERROR_OUT(-12101, out); ERROR_OUT(-12101, out);
@@ -27607,10 +27615,13 @@ static int pkcs7compressed_test(void)
} }
out: out:
if (enveloped)
XFREE(enveloped, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); #ifdef WOLFSSL_SMALL_STACK
if (compressed)
XFREE(compressed, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (decoded) if (decoded)
XFREE(decoded, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(decoded, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
} /* pkcs7compressed_test() */ } /* pkcs7compressed_test() */