wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile time warning with openssl extra and cryptonly

Browse Source
This commit is contained in:
kaleb-himes
2017-06-08 20:14:15 -06:00
parent 1be0b2aa30
commit 86809cca74
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/wc_port.c
View File

@@ -131,7 +131,8 @@ int wolfCrypt_Init(void)
WOLFSSL_MSG("Using ARM hardware acceleration"); WOLFSSL_MSG("Using ARM hardware acceleration");
#endif #endif
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) #if !defined(WOLFCRYPT_ONLY) && \
( defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) )
wolfSSL_EVP_init(); wolfSSL_EVP_init();
#endif #endif

11
wolfcrypt/test/test.c
View File

@@ -128,7 +128,9 @@
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#ifndef WOLFCRYPT_ONLY
#include <wolfssl/openssl/evp.h> #include <wolfssl/openssl/evp.h>
#endif
#include <wolfssl/openssl/rand.h> #include <wolfssl/openssl/rand.h>
#include <wolfssl/openssl/hmac.h> #include <wolfssl/openssl/hmac.h>
#include <wolfssl/openssl/aes.h> #include <wolfssl/openssl/aes.h>
@@ -249,7 +251,9 @@ int random_test(void);
#endif /* WC_NO_RNG */ #endif /* WC_NO_RNG */
int pwdbased_test(void); int pwdbased_test(void);
int ripemd_test(void); int ripemd_test(void);
#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
int openssl_test(void); /* test mini api */ int openssl_test(void); /* test mini api */
#endif
int pbkdf1_test(void); int pbkdf1_test(void);
int pkcs12_test(void); int pkcs12_test(void);
int pbkdf2_test(void); int pbkdf2_test(void);
@@ -751,7 +755,7 @@ int wolfcrypt_test(void* args)
printf( "PWDBASED test passed!\n"); printf( "PWDBASED test passed!\n");
#endif #endif
#ifdef OPENSSL_EXTRA #if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
if ( (ret = openssl_test()) != 0) if ( (ret = openssl_test()) != 0)
return err_sys("OPENSSL test failed!\n", ret); return err_sys("OPENSSL test failed!\n", ret);
else else
@@ -8430,7 +8434,7 @@ int srp_test(void)
#endif /* WOLFCRYPT_HAVE_SRP */ #endif /* WOLFCRYPT_HAVE_SRP */
#ifdef OPENSSL_EXTRA #if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
int openssl_test(void) int openssl_test(void)
{ {
@@ -9121,12 +9125,11 @@ int openssl_test(void)
} }
#endif /* ifndef NO_AES */ #endif /* ifndef NO_AES */
return 0; return 0;
} }
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA && !WOLFCRYPT_ONLY */
#ifndef NO_PWDBASED #ifndef NO_PWDBASED