wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retain existing HAVE_HASHDRBG functionality and only disable if ./configure --disable-hashdrbg or WC_NO_HASHDRBG defined. Fix use of warning with VS. Fix to only use rng seed as source if no DRBG.

Browse Source
This commit is contained in:
David Garske
2017-03-17 13:44:53 -07:00
parent 5e3d8e705e
commit 1251607b04
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -1690,11 +1690,13 @@ if test "x$ENABLED_HASHDRBG" = "xyes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_HASHDRBG" AM_CFLAGS="$AM_CFLAGS -DHAVE_HASHDRBG"
else else
# turn on Hash DRBG if FIPS is on or ARC4 is off # turn on Hash DRBG if FIPS is on
if test "x$ENABLED_FIPS" = "xyes" if test "x$ENABLED_FIPS" = "xyes"
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_HASHDRBG" AM_CFLAGS="$AM_CFLAGS -DHAVE_HASHDRBG"
ENABLED_HASHDRBG=yes ENABLED_HASHDRBG=yes
else
AM_CFLAGS="$AM_CFLAGS -DWC_NO_HASHDRBG"
fi fi
fi fi

10
wolfcrypt/src/random.c
View File

@@ -634,8 +634,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
ret = RNG_FAILURE_E; ret = RNG_FAILURE_E;
rng->status = DRBG_FAILED; rng->status = DRBG_FAILED;
} }
return ret; #else
#endif /* HAVE_HASHDRBG */
/* try using the generate seed direectly */ /* try using the generate seed direectly */
ret = wc_GenerateSeed(&rng->seed, output, sz); ret = wc_GenerateSeed(&rng->seed, output, sz);
@@ -643,9 +642,10 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
return 0; return 0;
/* if we get here then there is an RNG configuration error */ /* if we get here then there is an RNG configuration error */
(void)ret; ret = RNG_FAILURE_E;
(void)sz; #endif /* HAVE_HASHDRBG */
return RNG_FAILURE_E;
return ret;
} }

13
wolfssl/wolfcrypt/random.h
View File

@@ -45,10 +45,15 @@
#define CUSTOM_RAND_TYPE byte #define CUSTOM_RAND_TYPE byte
#endif #endif
/* make sure Hash DRBG is enabled, unless WC_NO_HASHDRBG is defined */
#ifndef WC_NO_HASHDRBG
#undef HAVE_HASHDRBG
#define HAVE_HASHDRBG
#endif
#ifndef HAVE_FIPS /* avoid redefining structs and macros */ #ifndef HAVE_FIPS /* avoid redefining structs and macros */
/* RNG supports the following sources (in order): /* RNG supports the following sources (in order):
* 1. CUSTOM_RAND_GENERATE_BLOCK: Defines name of function as RNG source and * 1. CUSTOM_RAND_GENERATE_BLOCK: Defines name of function as RNG source and
* bypasses the options below. * bypasses the options below.
@@ -77,7 +82,11 @@
#elif defined(HAVE_INTEL_RDRAND) #elif defined(HAVE_INTEL_RDRAND)
#elif defined(HAVE_WNR) #elif defined(HAVE_WNR)
#else #else
#warning No RNG source defined. Using wc_GenerateSeed directly #ifndef _MSC_VER
#warning "No RNG source defined. Using wc_GenerateSeed directly"
#else
#pragma message("Warning: No RNG source defined. Using wc_GenerateSeed directly")
#endif
#endif #endif
#ifdef HAVE_WNR #ifdef HAVE_WNR