Fixes for building with no filesystem and --enable-testcert or WOLFSSL_TEST_CERT. Fixes nightly expected configurations test.

This commit is contained in:
David Garske
2019-02-26 09:36:31 -08:00
parent efc1ab8c42
commit 9a129e89c1

View File

@ -349,10 +349,12 @@ int scrypt_test(void);
int pkcs7authenveloped_test(void); int pkcs7authenveloped_test(void);
#endif #endif
#endif #endif
#if !defined(NO_ASN_TIME) && !defined(NO_RSA) && defined(WOLFSSL_TEST_CERT) #if !defined(NO_ASN_TIME) && !defined(NO_RSA) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
int cert_test(void); int cert_test(void);
#endif #endif
#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) #if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
int certext_test(void); int certext_test(void);
#endif #endif
#ifdef HAVE_IDEA #ifdef HAVE_IDEA
@ -928,14 +930,16 @@ initDefaultName();
#endif #endif
#endif #endif
#if !defined(NO_ASN_TIME) && !defined(NO_RSA) && defined(WOLFSSL_TEST_CERT) #if !defined(NO_ASN_TIME) && !defined(NO_RSA) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
if ( (ret = cert_test()) != 0) if ( (ret = cert_test()) != 0)
return err_sys("CERT test failed!\n", ret); return err_sys("CERT test failed!\n", ret);
else else
printf( "CERT test passed!\n"); printf( "CERT test passed!\n");
#endif #endif
#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) #if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
if ( (ret = certext_test()) != 0) if ( (ret = certext_test()) != 0)
return err_sys("CERT EXT test failed!\n", ret); return err_sys("CERT EXT test failed!\n", ret);
else else
@ -8830,7 +8834,7 @@ static const CertName certDefaultName = {
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_TEST_CERT #if defined(WOLFSSL_TEST_CERT) && !defined(NO_FILESYSTEM)
int cert_test(void) int cert_test(void)
{ {
DecodedCert cert; DecodedCert cert;
@ -8884,9 +8888,10 @@ done:
return ret; return ret;
} }
#endif /* WOLFSSL_TEST_CERT */ #endif /* WOLFSSL_TEST_CERT && !NO_FILESYSTEM */
#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) #if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) && \
!defined(NO_FILESYSTEM)
int certext_test(void) int certext_test(void)
{ {
DecodedCert cert; DecodedCert cert;