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

Merge pull request #279 from dgarske/CustRandGenSeed_OSArg

Browse Source 
Added new CUSTOM_RAND_GENERATE_SEED_OS macro
This commit is contained in:
JacobBarthelmeh
2016-02-05 11:18:18 -07:00
parent ee4b8b2f10 bc059e12c2
commit 25959bfb62
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wolfcrypt/src/random.c
View File

@@ -122,7 +122,7 @@ int wc_RNG_GenerateByte(WC_RNG* rng, byte* b)
#ifdef HAVE_INTEL_RDGEN #ifdef HAVE_INTEL_RDGEN
static int wc_InitRng_IntelRD(void) ; static int wc_InitRng_IntelRD(void) ;
#if defined(HAVE_HASHDRBG) || defined(NO_RC4) #if defined(HAVE_HASHDRBG) || defined(NO_RC4)
static int wc_GenerateSeed_IntelRD(OS_Seed* os, byte* output, word32 sz) ; static int wc_GenerateSeed_IntelRD(OS_Seed* os, byte* output, word32 sz) ;
#else #else
static int wc_GenerateRand_IntelRD(OS_Seed* os, byte* output, word32 sz) ; static int wc_GenerateRand_IntelRD(OS_Seed* os, byte* output, word32 sz) ;
#endif #endif
@@ -985,10 +985,23 @@ static int wc_GenerateRand_IntelRD(OS_Seed* os, byte* output, word32 sz)
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{ {
(void)os; (void)os; /* Suppress unused arg warning */
return CUSTOM_RAND_GENERATE_SEED(output, sz); return CUSTOM_RAND_GENERATE_SEED(output, sz);
} }
#elif defined(CUSTOM_RAND_GENERATE_SEED_OS)
/* Implement your own random generation function,
* which includes OS_Seed.
* Return 0 to indicate success
* int rand_gen_seed(OS_Seed* os, byte* output, word32 sz);
* #define CUSTOM_RAND_GENERATE_SEED_OS rand_gen_seed */
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{
return CUSTOM_RAND_GENERATE_SEED_OS(os, output, sz);
}
#elif defined(USE_WINDOWS_API) #elif defined(USE_WINDOWS_API)