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

Adjusted the RNG benchmark to split into smaller requests of max allowed RNG size.

Browse Source
This commit is contained in:
David Garske
2016-03-25 06:59:35 -07:00
parent 27e041246f
commit f539a60a40
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wolfcrypt/benchmark/benchmark.c
View File

@ -434,6 +434,7 @@ void bench_rng(void)
{ {
int ret, i; int ret, i;
double start, total, persec; double start, total, persec;
int pos, len, remain;
#ifndef HAVE_LOCAL_RNG #ifndef HAVE_LOCAL_RNG
WC_RNG rng; WC_RNG rng;
#endif #endif
@ -450,10 +451,20 @@ void bench_rng(void)
BEGIN_INTEL_CYCLES BEGIN_INTEL_CYCLES
for(i = 0; i < numBlocks; i++) { for(i = 0; i < numBlocks; i++) {
ret = wc_RNG_GenerateBlock(&rng, plain, sizeof(plain)); /* Split request to handle large RNG request */
if (ret < 0) { pos = 0;
printf("wc_RNG_GenerateBlock failed %d\n", ret); remain = (int)sizeof(plain);
break; while (remain > 0) {
len = remain;
if (len > RNG_MAX_BLOCK_LEN)
len = RNG_MAX_BLOCK_LEN;
ret = wc_RNG_GenerateBlock(&rng, &plain[pos], len);
if (ret < 0) {
printf("wc_RNG_GenerateBlock failed %d\n", ret);
break;
}
remain -= len;
pos += len;
} }
} }

7
wolfcrypt/src/random.c
View File

@ -194,6 +194,11 @@ int wc_FreeRng(WC_RNG* rng)
#define DRBG_FAILED 2 #define DRBG_FAILED 2
#define DRBG_CONT_FAILED 3 #define DRBG_CONT_FAILED 3
/* Verify max gen block len */
#if RNG_MAX_BLOCK_LEN > MAX_REQUEST_LEN
#error RNG_MAX_BLOCK_LEN is larger than NIST DBRG max request length
#endif
enum { enum {
drbgInitC = 0, drbgInitC = 0,
@ -533,7 +538,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
{ {
int ret; int ret;
if (rng == NULL || output == NULL || sz > MAX_REQUEST_LEN) if (rng == NULL || output == NULL || sz > RNG_MAX_BLOCK_LEN)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (rng->status != DRBG_OK) if (rng->status != DRBG_OK)

2
wolfssl/wolfcrypt/random.h
View File

@ -68,6 +68,8 @@ typedef struct OS_Seed {
#endif #endif
} OS_Seed; } OS_Seed;
/* Maximum generate block length */
#define RNG_MAX_BLOCK_LEN (0x10000)
#if (defined(HAVE_HASHDRBG) || defined(NO_RC4)) && !defined(CUSTOM_RAND_GENERATE_BLOCK) #if (defined(HAVE_HASHDRBG) || defined(NO_RC4)) && !defined(CUSTOM_RAND_GENERATE_BLOCK)