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

Merge pull request #1464 from jrblixt/unitTest_api_addPkcs7-nightlyBuildFix2

Browse Source 
Nightly build fix for PKCS#7 errors.
This commit is contained in:
Chris Conlon
2018-03-29 15:26:11 -06:00
committed by GitHub
parent 86a5330b31 1cd6075b9d
commit 87c1658ab8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/api.c
View File

@@ -14217,8 +14217,8 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
const char input[] = "Test data to encode.";
int i;
int testSz = 0;
#if !defined(NO_RSA) && !defined(NO_AES) && (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512))
#if !defined(NO_RSA) && (!defined(NO_AES) || (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512)))
byte* rsaCert = NULL;
byte* rsaPrivKey = NULL;
@@ -14232,8 +14232,8 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
rsaPrivKeySz = (word32)sizeof(rsaClientKey);
#endif
#endif
#if defined(HAVE_ECC) && !defined(NO_AES) && (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512))
#if defined(HAVE_ECC) && (!defined(NO_AES) || (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512)))
byte* eccCert = NULL;
byte* eccPrivKey = NULL;
@@ -14253,7 +14253,8 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
FILE* keyFile;
#endif
#ifndef NO_RSA
#if !defined(NO_RSA) && (!defined(NO_AES) || (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512)))
/* RSA certs and keys. */
#if defined(USE_CERT_BUFFERS_1024)
/* Allocate buffer space. */
@@ -14296,7 +14297,9 @@ static void test_wc_PKCS7_EncodeDecodeEnvelopedData (void)
#endif /* NO_RSA */
/* ECC */
#if defined(HAVE_ECC)
#if defined(HAVE_ECC) && (!defined(NO_AES) || (!defined(NO_SHA) ||\
!defined(NO_SHA256) || !defined(NO_SHA512)))
#ifdef USE_CERT_BUFFERS_256
eccCert = (byte*)XMALLOC(TWOK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
/* Init buffer. */