int rv;
memset(dctx, 0, sizeof(DRBG_CTX));
dctx->status = DRBG_STATUS_UNINITIALISED;
- dctx->flags = flags;
+ dctx->xflags = flags;
dctx->type = type;
+ dctx->iflags = 0;
dctx->entropy_blocklen = 0;
dctx->health_check_cnt = 0;
dctx->health_check_interval = DRBG_HEALTH_INTERVAL;
/* If not in test mode run selftests on DRBG of the same type */
- if (!(dctx->flags & DRBG_FLAG_TEST))
+ if (!(dctx->xflags & DRBG_FLAG_TEST))
{
DRBG_CTX tctx;
if (!fips_drbg_kat(&tctx, type, flags | DRBG_FLAG_TEST))
{
unsigned char *tout, *p;
size_t bl = dctx->entropy_blocklen, rv;
- if (dctx->flags & DRBG_FLAG_TEST || !bl)
+ if (dctx->xflags & DRBG_FLAG_TEST || !bl)
return dctx->get_entropy(dctx, pout, entropy, min_len, max_len);
rv = dctx->get_entropy(dctx, &tout, entropy + bl,
min_len + bl, max_len + bl);
unsigned char *out, size_t olen)
{
size_t bl;
- if (dctx->flags & DRBG_FLAG_TEST)
+ if (dctx->xflags & DRBG_FLAG_TEST)
bl = 0;
else
bl = dctx->entropy_blocklen;
dctx->status = DRBG_STATUS_READY;
- if (!(dctx->flags & DRBG_CUSTOM_RESEED))
+ if (!(dctx->iflags & DRBG_CUSTOM_RESEED))
dctx->reseed_counter = 1;
end:
if (dctx->status == DRBG_STATUS_READY)
return 1;
- if (r && !(dctx->flags & DRBG_FLAG_NOERR))
+ if (r && !(dctx->iflags & DRBG_FLAG_NOERR))
FIPSerr(FIPS_F_FIPS_DRBG_INSTANTIATE, r);
return 0;
goto end;
dctx->status = DRBG_STATUS_READY;
- if (!(dctx->flags & DRBG_CUSTOM_RESEED))
+ if (!(dctx->iflags & DRBG_CUSTOM_RESEED))
dctx->reseed_counter = 1;
end:
if (dctx->status == DRBG_STATUS_READY)
return 1;
- if (r && !(dctx->flags & DRBG_FLAG_NOERR))
+ if (r && !(dctx->iflags & DRBG_FLAG_NOERR))
FIPSerr(FIPS_F_FIPS_DRBG_RESEED, r);
return 0;
static int fips_drbg_check(DRBG_CTX *dctx)
{
- if (dctx->flags & DRBG_FLAG_TEST)
+ if (dctx->xflags & DRBG_FLAG_TEST)
return 1;
dctx->health_check_cnt++;
if (dctx->health_check_cnt >= dctx->health_check_interval)
{
- DRBG_CTX tctx;
- if (!fips_drbg_kat(&tctx, dctx->type,
- dctx->flags | DRBG_FLAG_TEST))
+ if (FIPS_drbg_test(dctx) <= 0)
{
FIPSerr(FIPS_F_FIPS_DRBG_CHECK, FIPS_R_SELFTEST_FAILURE);
dctx->status = DRBG_STATUS_ERROR;
goto end;
}
- if (dctx->flags & DRBG_CUSTOM_RESEED)
+ if (dctx->iflags & DRBG_CUSTOM_RESEED)
dctx->generate(dctx, NULL, outlen, NULL, 0);
else if (dctx->reseed_counter >= dctx->reseed_interval)
dctx->status = DRBG_STATUS_RESEED;
dctx->status = DRBG_STATUS_ERROR;
goto end;
}
- if (!(dctx->flags & DRBG_CUSTOM_RESEED))
+ if (!(dctx->iflags & DRBG_CUSTOM_RESEED))
{
if (dctx->reseed_counter >= dctx->reseed_interval)
dctx->status = DRBG_STATUS_RESEED;
end:
if (r)
{
- if (!(dctx->flags & DRBG_FLAG_NOERR))
+ if (!(dctx->iflags & DRBG_FLAG_NOERR))
FIPSerr(FIPS_F_FIPS_DRBG_GENERATE, r);
return 0;
}
int fips_drbg_cprng_test(DRBG_CTX *dctx, const unsigned char *out)
{
/* No CPRNG in test mode */
- if (dctx->flags & DRBG_FLAG_TEST)
+ if (dctx->xflags & DRBG_FLAG_TEST)
return 1;
/* Check block is valid: should never happen */
if (dctx->lb_valid == 0)