From 513b43baaeb619131b86ffde67a3fbd4f56432c3 Mon Sep 17 00:00:00 2001 From: toddouska Date: Mon, 11 May 2015 12:03:53 -0700 Subject: [PATCH] update CUSTOM_RAND_GENERATE to not include dev random files --- wolfcrypt/src/random.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index 85f96d3c4..22b49cbf8 100755 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -100,8 +100,8 @@ int wc_RNG_GenerateByte(RNG* rng, byte* b) #include #include #else - #if !defined(NO_DEV_RANDOM) && !defined(WOLFSSL_MDK_ARM) \ - && !defined(WOLFSSL_IAR_ARM) + #if !defined(NO_DEV_RANDOM) && !defined(CUSTOM_RAND_GENERATE) && \ + !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_IAR_ARM) #include #ifndef EBSNET #include @@ -1164,15 +1164,17 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) * word32 rand_gen(void); * #define CUSTOM_RAND_GENERATE rand_gen */ - int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) - { - int i; + int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) + { + word32 i; - for (i = 0; i < sz; i++ ) - output[i] = CUSTOM_RAND_GENERATE(); + (void)os; - return 0; - } + for (i = 0; i < sz; i++ ) + output[i] = CUSTOM_RAND_GENERATE(); + + return 0; + } #elif defined(NO_DEV_RANDOM)