mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nightly build fix.

This commit is contained in:
jrblixt 2018-03-27 16:33:06 -06:00
parent 9f231e0020
commit 1cd6075b9d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/api.c
View File

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