wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-08-22 03:23:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfssl/wolfcrypt/random.h, wolfcrypt/src/random.c: add full

Browse Source 
WOLFSSL_DEBUG_TRACE_ERROR_CODES support for internal DRBG errors.

Converts the DRBG internal status #defines (DRBG_SUCCESS/DRBG_FAILURE,
WC_DRBG_*) to enums, that are wrapped in WC_ERR_TRACE() when
WOLFSSL_DEBUG_TRACE_ERROR_CODES.

Deploys well-known error codes and WC_NO_ERR_TRACE() as needed throughout.
This commit is contained in:
Daniel Pouzzner
2026-08-05 13:53:46 -05:00
parent c82cfca8ca
commit c95cbdbf28
2 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/random.c
+46 -29
View File
@@ -315,11 +315,28 @@ int wc_SetSeed_Cb(wc_RngSeed_Cb cb)
/* Internal return codes */
#define DRBG_SUCCESS 0
#define DRBG_FAILURE 1
#define DRBG_NEED_RESEED 2
#define DRBG_CONT_FAILURE 3
#define DRBG_NO_SEED_CB 4
enum {
DRBG_SUCCESS = 0,
DRBG_FAILURE = 1,
DRBG_NEED_RESEED = 2,
DRBG_CONT_FAILURE = 3,
DRBG_NO_SEED_CB = 4
};
#ifdef WOLFSSL_DEBUG_TRACE_ERROR_CODES
enum {
CONST_NUM_ERR_DRBG_FAILURE = DRBG_FAILURE,
CONST_NUM_ERR_DRBG_NEED_RESEED = DRBG_NEED_RESEED,
CONST_NUM_ERR_DRBG_CONT_FAILURE = DRBG_CONT_FAILURE,
CONST_NUM_ERR_DRBG_NO_SEED_CB = DRBG_NO_SEED_CB
};
#define DRBG_FAILURE WC_ERR_TRACE(DRBG_FAILURE)
#define DRBG_NEED_RESEED WC_ERR_TRACE(DRBG_NEED_RESEED)
#define DRBG_CONT_FAILURE WC_ERR_TRACE(DRBG_CONT_FAILURE)
#define DRBG_NO_SEED_CB WC_ERR_TRACE(DRBG_NO_SEED_CB)
#define WC_DRBG_FAILED WC_ERR_TRACE(WC_DRBG_FAILED)
#define WC_DRBG_CONT_FAILED WC_ERR_TRACE(WC_DRBG_CONT_FAILED)
#endif
/* RNG health states */
#define DRBG_NOT_INIT WC_DRBG_NOT_INIT
@@ -469,7 +486,7 @@ static int Hash_df(DRBG_internal* drbg, byte* out, word32 outSz, byte type,
const byte* inB, word32 inBSz,
const byte* inC, word32 inCSz)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
byte ctr;
word32 i;
word32 len;
@@ -704,7 +721,7 @@ static WC_INLINE void array_add_one(byte* data, word32 dataSz)
/* Returns: DRBG_SUCCESS or DRBG_FAILURE */
static int Hash_gen(DRBG_internal* drbg, byte* out, word32 outSz, const byte* V)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
word32 i;
word32 len;
#if defined(WOLFSSL_SMALL_STACK_CACHE)
@@ -1033,7 +1050,7 @@ static int Hash_DRBG_Instantiate(DRBG_internal* drbg, const byte* seed,
word32 nonceSz, const byte* perso,
word32 persoSz, void* heap, int devId)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
XMEMSET(drbg, 0, sizeof(DRBG_internal));
drbg->heap = heap;
@@ -1105,7 +1122,7 @@ static int Hash512_df(DRBG_SHA512_internal* drbg, byte* out, word32 outSz,
const byte* inB, word32 inBSz,
const byte* inC, word32 inCSz)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
byte ctr;
word32 i;
word32 len;
@@ -1279,7 +1296,7 @@ static int Hash512_DRBG_Reseed(DRBG_SHA512_internal* drbg, const byte* seed,
static int Hash512_gen(DRBG_SHA512_internal* drbg, byte* out, word32 outSz,
const byte* V)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
word32 i;
word32 len;
#if defined(WOLFSSL_SMALL_STACK_CACHE)
@@ -1524,7 +1541,7 @@ static int Hash512_DRBG_Instantiate(DRBG_SHA512_internal* drbg,
const byte* perso, word32 persoSz,
void* heap, int devId)
{
int ret = DRBG_FAILURE;
int ret = WC_NO_ERR_TRACE(DRBG_FAILURE);
XMEMSET(drbg, 0, sizeof(DRBG_SHA512_internal));
drbg->heap = heap;
@@ -2237,11 +2254,11 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
rng->status = DRBG_OK;
ret = 0;
}
else if (ret == DRBG_CONT_FAILURE) {
else if (ret == WC_NO_ERR_TRACE(DRBG_CONT_FAILURE)) {
rng->status = DRBG_CONT_FAILED;
ret = DRBG_CONT_FIPS_E;
}
else if (ret == DRBG_FAILURE) {
else if (ret == WC_NO_ERR_TRACE(DRBG_FAILURE)) {
rng->status = DRBG_FAILED;
ret = RNG_FAILURE_E;
}
@@ -2341,7 +2358,7 @@ int wc_InitRngNonce_ex(WC_RNG* rng, byte* nonce, word32 nonceSz,
#if defined(HAVE_HASHDRBG) && !defined(CUSTOM_RAND_GENERATE_BLOCK)
static int PollAndReSeed(WC_RNG* rng)
{
int ret = DRBG_NEED_RESEED;
int ret = WC_NO_ERR_TRACE(DRBG_NEED_RESEED);
int devId = INVALID_DEVID;
#if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB)
devId = rng->devId;
@@ -2518,7 +2535,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
if (rng->drbgType == WC_DRBG_SHA256) {
ret = Hash_DRBG_Generate((DRBG_internal *)rng->drbg, output, sz,
NULL, 0);
if (ret == DRBG_NEED_RESEED) {
if (ret == WC_NO_ERR_TRACE(DRBG_NEED_RESEED)) {
ret = PollAndReSeed(rng);
if (ret == DRBG_SUCCESS)
ret = Hash_DRBG_Generate((DRBG_internal *)rng->drbg, output,
@@ -2531,7 +2548,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
if (rng->drbgType == WC_DRBG_SHA512) {
ret = Hash512_DRBG_Generate((DRBG_SHA512_internal *)rng->drbg512,
output, sz, NULL, 0);
if (ret == DRBG_NEED_RESEED) {
if (ret == WC_NO_ERR_TRACE(DRBG_NEED_RESEED)) {
ret = PollAndReSeed(rng);
if (ret == DRBG_SUCCESS)
ret = Hash512_DRBG_Generate(
@@ -2548,7 +2565,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
if (ret == DRBG_SUCCESS) {
ret = 0;
}
else if (ret == DRBG_CONT_FAILURE) {
else if (ret == WC_NO_ERR_TRACE(DRBG_CONT_FAILURE)) {
ret = DRBG_CONT_FIPS_E;
rng->status = DRBG_CONT_FAILED;
}
@@ -2737,7 +2754,7 @@ static int wc_RNG_HealthTest_ex_internal(DRBG_internal* drbg,
byte* output, word32 outputSz,
void* heap, int devId)
{
int ret = -1;
int ret = WC_NO_ERR_TRACE(WC_FAILURE);
if (seedA == NULL || output == NULL) {
return BAD_FUNC_ARG;
@@ -2793,7 +2810,7 @@ exit_rng_ht:
#ifndef WOLFSSL_SMALL_STACK_CACHE
/* This is safe to call even if Hash_DRBG_Instantiate fails */
if (Hash_DRBG_Uninstantiate(drbg) != 0) {
ret = -1;
ret = WC_FAILURE;
}
#endif
@@ -2806,7 +2823,7 @@ int wc_RNG_HealthTest_ex(int reseed, const byte* nonce, word32 nonceSz,
byte* output, word32 outputSz,
void* heap, int devId)
{
int ret = -1;
int ret = WC_NO_ERR_TRACE(WC_FAILURE);
DRBG_internal* drbg;
#ifndef WOLFSSL_SMALL_STACK
DRBG_internal drbg_var;
@@ -3038,7 +3055,7 @@ static int wc_RNG_HealthTestLocal(WC_RNG* rng, int reseed, void* heap,
if (ret == 0) {
if (ConstantCompare(check512, sha512_outputA_data,
RNG_HEALTH_TEST_CHECK_SIZE_SHA512) != 0)
ret = -1;
ret = WC_FAILURE;
}
}
else {
@@ -3053,7 +3070,7 @@ static int wc_RNG_HealthTestLocal(WC_RNG* rng, int reseed, void* heap,
if (ret == 0) {
if (ConstantCompare(check512, sha512_outputB_data,
RNG_HEALTH_TEST_CHECK_SIZE_SHA512) != 0)
ret = -1;
ret = WC_FAILURE;
}
}
@@ -3121,7 +3138,7 @@ static int wc_RNG_HealthTestLocal(WC_RNG* rng, int reseed, void* heap,
if (ret == 0) {
if (ConstantCompare(check, outputA,
RNG_HEALTH_TEST_CHECK_SIZE) != 0)
ret = -1;
ret = WC_FAILURE;
}
#ifdef WOLFSSL_USE_FLASHMEM
@@ -3173,7 +3190,7 @@ static int wc_RNG_HealthTestLocal(WC_RNG* rng, int reseed, void* heap,
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG_EX("Random ConstantCompare failed: err = %d", ret);
#endif
ret = -1;
ret = WC_FAILURE;
}
}
@@ -3190,7 +3207,7 @@ static int wc_RNG_HealthTestLocal(WC_RNG* rng, int reseed, void* heap,
heap, devId);
if (ret == 0) {
if (ConstantCompare(check, outputB, sizeof(outputB_data)) != 0)
ret = -1;
ret = WC_FAILURE;
}
}
@@ -3226,7 +3243,7 @@ static int wc_RNG_HealthTest_SHA512_ex_internal(DRBG_SHA512_internal* drbg,
byte* output, word32 outputSz,
void* heap, int devId)
{
int ret = -1;
int ret = WC_NO_ERR_TRACE(WC_FAILURE);
if (seedA == NULL || output == NULL) {
return BAD_FUNC_ARG;
@@ -3279,7 +3296,7 @@ exit_rng_ht512:
#ifndef WOLFSSL_SMALL_STACK_CACHE
if (Hash512_DRBG_Uninstantiate(drbg) != 0) {
ret = -1;
ret = WC_FAILURE;
}
#endif
@@ -3299,7 +3316,7 @@ int wc_RNG_HealthTest_SHA512_ex(int reseed,
byte* output, word32 outputSz,
void* heap, int devId)
{
int ret = -1;
int ret = WC_NO_ERR_TRACE(WC_FAILURE);
DRBG_SHA512_internal* drbg;
#ifndef WOLFSSL_SMALL_STACK
DRBG_SHA512_internal drbg_var;
@@ -3364,7 +3381,7 @@ int wc_RNG_HealthTest_SHA512(int reseed,
const byte* seedB, word32 seedBSz,
byte* output, word32 outputSz)
{
int ret = -1;
int ret = WC_NO_ERR_TRACE(WC_FAILURE);
DRBG_SHA512_internal* drbg;
#ifndef WOLFSSL_SMALL_STACK
DRBG_SHA512_internal drbg_var;
wolfssl/wolfcrypt/random.h
+11 -7
View File
@@ -343,15 +343,19 @@ enum wc_DrbgType {
#endif
/* RNG health states */
#define WC_DRBG_NOT_INIT 0
#define WC_DRBG_OK 1
#define WC_DRBG_FAILED 2
#define WC_DRBG_CONT_FAILED 3
enum wc_RngHealthState {
WC_DRBG_NOT_INIT = 0,
WC_DRBG_OK = 1,
WC_DRBG_FAILED = 2,
WC_DRBG_CONT_FAILED = 3,
#ifdef WC_RNG_BANK_SUPPORT
#define WC_DRBG_BANKREF 4 /* Marks the WC_RNG as a ref to a wc_rng_bank,
* with no usable DRBG of its own.
*/
WC_DRBG_BANKREF = 4, /* Marks the WC_RNG as a ref to a wc_rng_bank,
* with no usable DRBG of its own.
*/
#define WC_HAVE_RNG_BANKREF
#endif
WOLF_ENUM_DUMMY_LAST_ELEMENT(wc_RngHealthState)
};
/* RNG context */
struct WC_RNG {