Merge branch 'master' of https://github.com/wolfSSL/wolfssl into IntelAVX

This commit is contained in:
Takashi Kojo
2015-03-23 18:43:01 +09:00
92 changed files with 10905 additions and 838 deletions

14
wolfcrypt/src/random.c Executable file → Normal file
View File

@@ -648,6 +648,13 @@ int wc_RNG_GenerateByte(RNG* rng, byte* b)
return wc_GenerateSeed(NULL, b, 1) ;
}
int wc_FreeRng(RNG* rng)
{
(void)rng;
return 0;
}
#else /* HAVE_HASHDRBG || NO_RC4 */
/* Get seed and key cipher */
@@ -719,6 +726,13 @@ int wc_RNG_GenerateByte(RNG* rng, byte* b)
}
int wc_FreeRng(RNG* rng)
{
(void)rng;
return 0;
}
#ifdef HAVE_CAVIUM
#include <wolfssl/ctaocrypt/logging.h>