Fixes for build with Cavium.

This commit is contained in:
David Garske
2017-04-24 16:07:21 -07:00
parent 4363cf8a5c
commit 774ce1a47c

View File

@@ -533,7 +533,8 @@ int wc_InitRng_ex(WC_RNG* rng, void* heap, int devId)
/* configure async RNG source if available */ /* configure async RNG source if available */
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM)
ret = wolfAsync_DevCtxInit(&rng->asyncDev, WOLFSSL_ASYNC_MARKER_RNG, devId); ret = wolfAsync_DevCtxInit(&rng->asyncDev, WOLFSSL_ASYNC_MARKER_RNG,
rng->heap, rng->devId);
if (ret != 0) if (ret != 0)
return ret; return ret;
#endif #endif
@@ -612,7 +613,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
#endif #endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM)
if (aes->asyncDev.marker == WOLFSSL_ASYNC_MARKER_RNG) { if (rng->asyncDev.marker == WOLFSSL_ASYNC_MARKER_RNG) {
return NitroxRngGenerateBlock(rng, output, sz); return NitroxRngGenerateBlock(rng, output, sz);
} }
#endif #endif
@@ -687,7 +688,7 @@ int wc_FreeRng(WC_RNG* rng)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_CAVIUM)
wolfAsync_DevCtxFree(&rng->asyncDev); wolfAsync_DevCtxFree(&rng->asyncDev, WOLFSSL_ASYNC_MARKER_RNG);
#endif #endif
#ifdef HAVE_HASHDRBG #ifdef HAVE_HASHDRBG