wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added compile-time check for DRBG size. Added support for all build variations DRBG size.

Browse Source
This commit is contained in:
David Garske
2019-05-30 15:59:12 -07:00
parent f26a9589ff
commit a5fabda5c6
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/random.c
View File

@ -274,7 +274,7 @@ enum {
drbgInitV drbgInitV
}; };
/* NOTE: if DRBG struct is changed please update random.h drbg_data size */
typedef struct DRBG { typedef struct DRBG {
word32 reseedCtr; word32 reseedCtr;
word32 lastBlock; word32 lastBlock;
@ -758,6 +758,10 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
(struct DRBG*)XMALLOC(sizeof(DRBG), rng->heap, (struct DRBG*)XMALLOC(sizeof(DRBG), rng->heap,
DYNAMIC_TYPE_RNG); DYNAMIC_TYPE_RNG);
#else #else
/* compile-time validation of drbg_data size */
typedef char drbg_data_test[sizeof(rng->drbg_data) >=
sizeof(struct DRBG) ? 1 : -1];
(void)sizeof(drbg_data_test);
rng->drbg = (struct DRBG*)rng->drbg_data; rng->drbg = (struct DRBG*)rng->drbg_data;
#endif #endif

14
wolfssl/wolfcrypt/random.h
View File

@ -157,8 +157,18 @@ struct WC_RNG {
/* Hash-based Deterministic Random Bit Generator */ /* Hash-based Deterministic Random Bit Generator */
struct DRBG* drbg; struct DRBG* drbg;
#if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY) #if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY)
#define DRBG_STRUCT_SZ ((sizeof(word32)*2) + (DRBG_SEED_LEN*2) + sizeof(byte)) #define DRBG_STRUCT_SZ ((sizeof(word32)*3) + (DRBG_SEED_LEN*2))
byte drbg_data[DRBG_STRUCT_SZ]; #ifdef WOLFSSL_SMALL_STACK_CACHE
#define DRBG_STRUCT_SZ_SHA256 (sizeof(wc_Sha256))
#else
#define DRBG_STRUCT_SZ_SHA256 0
#endif
#if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB)
#define DRBG_STRUCT_SZ_ASYNC (sizeof(void*) + sizeof(int))
#else
#define DRBG_STRUCT_SZ_ASYNC 0
#endif
byte drbg_data[DRBG_STRUCT_SZ + DRBG_STRUCT_SZ_SHA256 + DRBG_STRUCT_SZ_ASYNC];
#endif #endif
byte status; byte status;
#endif #endif