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

FIPS Revalidation

Browse Source 
1. Update the GenerateSeed() function for RDSEED on Windows to use the intrinsic function instead of inline assembly.
This commit is contained in:
John Safranek
2018-04-10 11:47:46 -07:00
parent 4f1dd3b9a7
commit b120a27c3e
1 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
wolfcrypt/src/random.c
View File

@@ -163,6 +163,10 @@ int wc_RNG_GenerateByte(WC_RNG* rng, byte* b)
#ifdef HAVE_INTEL_RDRAND #ifdef HAVE_INTEL_RDRAND
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
#ifdef USE_WINDOWS_API
#include <immintrin.h>
#endif /* USE_WINDOWS_API */
#endif #endif
/* Start NIST DRBG code */ /* Start NIST DRBG code */
@@ -1019,14 +1023,31 @@ int wc_FreeNetRandom(void)
#ifdef HAVE_INTEL_RDSEED #ifdef HAVE_INTEL_RDSEED
/* return 0 on success */ #ifndef USE_WINDOWS_API
static INLINE int IntelRDseed64(word64* seed)
{
unsigned char ok;
__asm__ volatile("rdseed %0; setc %1":"=r"(*seed), "=qm"(ok)); /* return 0 on success */
return (ok) ? 0 : -1; static INLINE int IntelRDseed64(word64* seed)
} {
unsigned char ok;
__asm__ volatile("rdseed %0; setc %1":"=r"(*seed), "=qm"(ok));
return (ok) ? 0 : -1;
}
#else /* USE_WINDOWS_API */
/* The compiler Visual Studio uses does not allow inline assembly.
* It does allow for Intel intrinsic functions. */
/* return 0 on success */
static INLINE int IntelRDseed64(word64* seed)
{
int ok;
ok = _rdseed64_step(seed);
return (ok) ? 0 : -1;
}
#endif /* USE_WINDOWS_API */
/* return 0 on success */ /* return 0 on success */
static INLINE int IntelRDseed64_r(word64* rnd) static INLINE int IntelRDseed64_r(word64* rnd)
@@ -1073,6 +1094,8 @@ static int wc_GenerateSeed_IntelRD(OS_Seed* os, byte* output, word32 sz)
#ifdef HAVE_INTEL_RDRAND #ifdef HAVE_INTEL_RDRAND
#ifndef USE_WINDOWS_API
/* return 0 on success */ /* return 0 on success */
static INLINE int IntelRDrand64(word64 *rnd) static INLINE int IntelRDrand64(word64 *rnd)
{ {
@@ -1083,6 +1106,22 @@ static INLINE int IntelRDrand64(word64 *rnd)
return (ok) ? 0 : -1; return (ok) ? 0 : -1;
} }
#else /* USE_WINDOWS_API */
/* The compiler Visual Studio uses does not allow inline assembly.
* It does allow for Intel intrinsic functions. */
/* return 0 on success */
static INLINE int IntelRDrand64(word64 *rnd)
{
int ok;
ok = _rdrand64_step(rnd);
return (ok) ? 0 : -1;
}
#endif /* USE_WINDOWS_API */
/* return 0 on success */ /* return 0 on success */
static INLINE int IntelRDrand64_r(word64 *rnd) static INLINE int IntelRDrand64_r(word64 *rnd)
{ {