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

Merge pull request #4749 from ejohnstown/vpath-fix

Browse Source
This commit is contained in:
elms
2022-01-12 17:06:37 -08:00
committed by GitHub
parent 0acf8d0e75 15c5ac880e
commit ba579753ba
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wolfcrypt/test/test.c
View File

@ -12223,6 +12223,16 @@ WOLFSSL_TEST_SUBROUTINE int memory_test(void)
#endif #endif
#endif /* !USE_CERT_BUFFER_* */ #endif /* !USE_CERT_BUFFER_* */
#if !defined(NO_ASN_TIME) && !defined(NO_RSA) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
static const char* certExtNc =
CERT_ROOT "test" CERT_PATH_SEP "cert-ext-nc.der";
static const char* certExtIa =
CERT_ROOT "test" CERT_PATH_SEP "cert-ext-ia.der";
static const char* certExtNct =
CERT_ROOT "test" CERT_PATH_SEP "cert-ext-nct.der";
#endif
#ifndef NO_WRITE_TEMP_FILES #ifndef NO_WRITE_TEMP_FILES
#ifdef HAVE_ECC #ifdef HAVE_ECC
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
@ -12480,11 +12490,7 @@ WOLFSSL_TEST_SUBROUTINE int cert_test(void)
return -7400; return -7400;
/* Certificate with Name Constraints extension. */ /* Certificate with Name Constraints extension. */
#ifdef FREESCALE_MQX file = XFOPEN(certExtNc, "rb");
file = XFOPEN(".\\certs\\test\\cert-ext-nc.der", "rb");
#else
file = XFOPEN("./certs/test/cert-ext-nc.der", "rb");
#endif
if (!file) { if (!file) {
ERROR_OUT(-7401, done); ERROR_OUT(-7401, done);
} }
@ -12498,11 +12504,7 @@ WOLFSSL_TEST_SUBROUTINE int cert_test(void)
FreeDecodedCert(&cert); FreeDecodedCert(&cert);
/* Certificate with Inhibit Any Policy extension. */ /* Certificate with Inhibit Any Policy extension. */
#ifdef FREESCALE_MQX file = XFOPEN(certExtIa, "rb");
file = XFOPEN(".\\certs\\test\\cert-ext-ia.der", "rb");
#else
file = XFOPEN("./certs/test/cert-ext-ia.der", "rb");
#endif
if (!file) { if (!file) {
ERROR_OUT(-7403, done); ERROR_OUT(-7403, done);
} }
@ -12516,11 +12518,7 @@ WOLFSSL_TEST_SUBROUTINE int cert_test(void)
FreeDecodedCert(&cert); FreeDecodedCert(&cert);
/* Certificate with Netscape Certificate Type extension. */ /* Certificate with Netscape Certificate Type extension. */
#ifdef FREESCALE_MQX file = XFOPEN(certExtNct, "rb");
file = XFOPEN(".\\certs\\test\\cert-ext-nct.der", "rb");
#else
file = XFOPEN("./certs/test/cert-ext-nct.der", "rb");
#endif
if (!file) { if (!file) {
ERROR_OUT(-7405, done); ERROR_OUT(-7405, done);
} }
@ -23047,7 +23045,7 @@ static int ecc_def_curve_test(WC_RNG *rng)
sizeof_ecc_key_der_256); sizeof_ecc_key_der_256);
#else #else
{ {
XFILE file = XFOPEN("./certs/ecc-key.der", "rb"); XFILE file = XFOPEN(eccKeyDerFile, "rb");
byte der[128]; byte der[128];
word32 derSz; word32 derSz;
if (!file) { if (!file) {
@ -33704,6 +33702,7 @@ static int pkcs7signed_run_vectors(
file = XFOPEN(testVectors[i].outFileName, "wb"); file = XFOPEN(testVectors[i].outFileName, "wb");
if (!file) { if (!file) {
ERROR_OUT(-12523, out); ERROR_OUT(-12523, out);
}
ret = (int)XFWRITE(out, 1, encodedSz, file); ret = (int)XFWRITE(out, 1, encodedSz, file);
XFCLOSE(file); XFCLOSE(file);
if (ret != (int)encodedSz) if (ret != (int)encodedSz)
@ -34204,7 +34203,7 @@ static int pkcs7signed_run_SingleShotVectors(
XFCLOSE(file); XFCLOSE(file);
file = NULL; file = NULL;
if (ret != (int)encodedSz) if (ret != (int)encodedSz)
ERROR_OUT(-12553); ERROR_OUT(-12553, out);
#endif /* PKCS7_OUTPUT_TEST_BUNDLES */ #endif /* PKCS7_OUTPUT_TEST_BUNDLES */
wc_PKCS7_Free(pkcs7); wc_PKCS7_Free(pkcs7);