mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #958 from kaleb-himes/OPENSSL_EVP

Browse Source 
Fix compile time Error with openssl extra and cryptonly
This commit is contained in:
dgarske 2017-06-09 11:12:36 -07:00 committed by GitHub
commit c70fa33094
2 changed files with 10 additions and 6 deletions
Show Stats 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");
#endif
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)
#if !defined(WOLFCRYPT_ONLY) && \
( defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) )
wolfSSL_EVP_init();
#endif

13
wolfcrypt/test/test.c
View File

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