From 0ecd6435e9b3708f4b1d70355e207416ce2d181f Mon Sep 17 00:00:00 2001 From: Ludovic FLAMENT Date: Mon, 14 Sep 2015 18:45:14 +0200 Subject: [PATCH] remove CERT_EXT from enable-bump cortex test are only done if openssl extra is set --- configure.ac | 2 +- wolfcrypt/test/test.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 9a597f989..37f1657be 100644 --- a/configure.ac +++ b/configure.ac @@ -226,7 +226,7 @@ AC_ARG_ENABLE([bump], if test "$ENABLED_BUMP" = "yes" then - AM_CFLAGS="$AM_CFLAGS -DLARGE_STATIC_BUFFERS -DWOLFSSL_CERT_GEN -DWOLFSSL_KEY_GEN -DHUGE_SESSION_CACHE -DOPENSSL_EXTRA -DFP_MAX_BITS=8192 -DWOLFSSL_DER_LOAD -DWOLFSSL_ALT_NAMES -DWOLFSSL_TEST_CERT -DWOLFSSL_CERT_EXT" + AM_CFLAGS="$AM_CFLAGS -DLARGE_STATIC_BUFFERS -DWOLFSSL_CERT_GEN -DWOLFSSL_KEY_GEN -DHUGE_SESSION_CACHE -DOPENSSL_EXTRA -DFP_MAX_BITS=8192 -DWOLFSSL_DER_LOAD -DWOLFSSL_ALT_NAMES -DWOLFSSL_TEST_CERT" fi ENABLED_SLOWMATH="yes" diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 3245c6428..2317ecdd9 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -208,7 +208,8 @@ int pbkdf2_test(void); int pkcs7enveloped_test(void); int pkcs7signed_test(void); #endif -#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) +#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) \ + && defined(OPENSSL_EXTRA) int certext_test(void); #endif @@ -487,7 +488,8 @@ int wolfcrypt_test(void* args) printf( "RSA test passed!\n"); #endif -#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) +#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) \ + && defined(OPENSSL_EXTRA) if ( (ret = certext_test()) != 0) return err_sys("CERT EXT test failed!\n", ret); else @@ -3382,7 +3384,8 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out) #endif -#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) +#if defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT)\ + && defined(OPENSSL_EXTRA) int certext_test(void) { DecodedCert cert; @@ -3567,7 +3570,7 @@ int certext_test(void) return 0; } -#endif /* defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_TEST_CERT) */ +#endif /* WOLFSSL_CERT_EXT && WOLFSSL_TEST_CERT && OPENSSL_EXTRA */ int rsa_test(void)