feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2014-05-19 21:52:00 -07:00
parent 74712b4e71 842ff6f24d
commit b889191992
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ctaocrypt/benchmark/benchmark.c
View File

@@ -128,6 +128,9 @@ static int OpenNitroxDevice(int dma_mode,int dev_id)
#endif #endif
#if defined(DEBUG_CYASSL) && !defined(HAVE_VALGRIND)
CYASSL_API int CyaSSL_Debugging_ON();
#endif
/* so embedded projects can pull in tests on their own */ /* so embedded projects can pull in tests on their own */
#if !defined(NO_MAIN_DRIVER) #if !defined(NO_MAIN_DRIVER)
@@ -142,6 +145,10 @@ int benchmark_test(void *args)
{ {
#endif #endif
#if defined(DEBUG_CYASSL) && !defined(HAVE_VALGRIND)
CyaSSL_Debugging_ON();
#endif
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
int ret = OpenNitroxDevice(CAVIUM_DIRECT, CAVIUM_DEV_ID); int ret = OpenNitroxDevice(CAVIUM_DIRECT, CAVIUM_DEV_ID);
if (ret != 0) { if (ret != 0) {

1
ctaocrypt/src/aes.c
View File

@@ -2241,6 +2241,7 @@ int AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
if ((word)in % 16) { if ((word)in % 16) {
#ifndef NO_CYASSL_ALLOC_ALIGN #ifndef NO_CYASSL_ALLOC_ALIGN
byte* tmp = (byte*)XMALLOC(sz, NULL, DYNAMIC_TYPE_TMP_BUFFER); byte* tmp = (byte*)XMALLOC(sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
CYASSL_MSG("AES-CBC encrypt with bad alignment");
if (tmp == NULL) return MEMORY_E; if (tmp == NULL) return MEMORY_E;
XMEMCPY(tmp, in, sz); XMEMCPY(tmp, in, sz);