#include "fips_drbg_selftest.h"
typedef struct {
+ int post;
int nid;
unsigned int flags;
} DRBG_SELFTEST_DATA;
-#define make_drbg_test_data(nid, flag, pr) { nid, flag | DRBG_FLAG_TEST, \
+#define make_drbg_test_data(nid, flag, pr, p) {p, nid, flag | DRBG_FLAG_TEST, \
pr##_entropyinput, sizeof(pr##_entropyinput), \
pr##_nonce, sizeof(pr##_nonce), \
pr##_personalizationstring, sizeof(pr##_personalizationstring), \
pr##_pr_returnedbits, sizeof(pr##_pr_returnedbits), \
}
-#define make_drbg_test_data_df(nid, pr) \
- make_drbg_test_data(nid, DRBG_FLAG_CTR_USE_DF, pr)
+#define make_drbg_test_data_df(nid, pr, p) \
+ make_drbg_test_data(nid, DRBG_FLAG_CTR_USE_DF, pr, p)
static DRBG_SELFTEST_DATA drbg_test[] = {
- make_drbg_test_data_df(NID_aes_128_ctr, aes_128_use_df),
- make_drbg_test_data_df(NID_aes_192_ctr, aes_192_use_df),
- make_drbg_test_data_df(NID_aes_256_ctr, aes_256_use_df),
- make_drbg_test_data(NID_aes_128_ctr, 0, aes_128_no_df),
- make_drbg_test_data(NID_aes_192_ctr, 0, aes_192_no_df),
- make_drbg_test_data(NID_aes_256_ctr, 0, aes_256_no_df),
- make_drbg_test_data(NID_sha1, 0, sha1),
- make_drbg_test_data(NID_sha224, 0, sha224),
- make_drbg_test_data(NID_sha256, 0, sha256),
- make_drbg_test_data(NID_sha384, 0, sha384),
- make_drbg_test_data(NID_sha512, 0, sha512),
- make_drbg_test_data(NID_hmacWithSHA1, 0, hmac_sha1),
- make_drbg_test_data(NID_hmacWithSHA224, 0, hmac_sha224),
- make_drbg_test_data(NID_hmacWithSHA256, 0, hmac_sha256),
- make_drbg_test_data(NID_hmacWithSHA384, 0, hmac_sha384),
- make_drbg_test_data(NID_hmacWithSHA512, 0, hmac_sha512),
+ make_drbg_test_data_df(NID_aes_128_ctr, aes_128_use_df, 0),
+ make_drbg_test_data_df(NID_aes_192_ctr, aes_192_use_df, 0),
+ make_drbg_test_data_df(NID_aes_256_ctr, aes_256_use_df, 1),
+ make_drbg_test_data(NID_aes_128_ctr, 0, aes_128_no_df, 0),
+ make_drbg_test_data(NID_aes_192_ctr, 0, aes_192_no_df, 0),
+ make_drbg_test_data(NID_aes_256_ctr, 0, aes_256_no_df, 1),
+ make_drbg_test_data(NID_sha1, 0, sha1, 0),
+ make_drbg_test_data(NID_sha224, 0, sha224, 0),
+ make_drbg_test_data(NID_sha256, 0, sha256, 1),
+ make_drbg_test_data(NID_sha384, 0, sha384, 0),
+ make_drbg_test_data(NID_sha512, 0, sha512, 0),
+ make_drbg_test_data(NID_hmacWithSHA1, 0, hmac_sha1, 0),
+ make_drbg_test_data(NID_hmacWithSHA224, 0, hmac_sha224, 0),
+ make_drbg_test_data(NID_hmacWithSHA256, 0, hmac_sha256, 1),
+ make_drbg_test_data(NID_hmacWithSHA384, 0, hmac_sha384, 0),
+ make_drbg_test_data(NID_hmacWithSHA512, 0, hmac_sha512, 0),
{0,0,0}
};
return t->noncelen;
}
-static int fips_drbg_single_kat(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td)
+static int fips_drbg_single_kat(DRBG_CTX *dctx, DRBG_SELFTEST_DATA *td,
+ int quick)
{
TEST_ENT t;
int rv = 0;
goto err;
if (memcmp(randout, td->kat, td->katlen))
- goto err;
+ {
+ FIPSerr(FIPS_F_FIPS_DRBG_SINGLE_KAT, FIPS_R_NOPR_TEST1_FAILURE);
+ goto err2;
+ }
t.ent = td->entreseed;
t.entlen = td->entreseedlen;
goto err;
if (memcmp(randout, td->kat2, td->kat2len))
- goto err;
+ {
+ FIPSerr(FIPS_F_FIPS_DRBG_SINGLE_KAT, FIPS_R_NOPR_TEST2_FAILURE);
+ goto err2;
+ }
FIPS_drbg_uninstantiate(dctx);
goto err;
if (memcmp(randout, td->kat_pr, td->katlen_pr))
+ {
+ FIPSerr(FIPS_F_FIPS_DRBG_SINGLE_KAT, FIPS_R_PR_TEST1_FAILURE);
+ goto err2;
+ }
+
+ if (quick)
+ {
+ rv = 1;
goto err;
+ }
t.ent = td->entg_pr;
t.entlen = td->entglen_pr;
goto err;
if (memcmp(randout, td->kat2_pr, td->kat2len_pr))
- goto err;
+ {
+ FIPSerr(FIPS_F_FIPS_DRBG_SINGLE_KAT, FIPS_R_PR_TEST2_FAILURE);
+ goto err2;
+ }
rv = 1;
err:
if (rv == 0)
FIPSerr(FIPS_F_FIPS_DRBG_SINGLE_KAT, FIPS_R_SELFTEST_FAILED);
+ err2:
FIPS_drbg_uninstantiate(dctx);
return rv;
unsigned char randout[1024];
TEST_ENT t;
size_t i;
+ unsigned int reseed_counter_tmp;
unsigned char *p = (unsigned char *)dctx;
/* Initialise DRBG */
FIPS_drbg_set_app_data(dctx, &t);
t.entlen = td->entlen;
- /* Test reseeding works */
- dctx->reseed_interval = 2;
+ /* Test reseed counter works */
if (!FIPS_drbg_instantiate(dctx, td->pers, td->perslen))
goto err;
+ /* Save initial reseed counter */
+ reseed_counter_tmp = dctx->reseed_counter;
+ /* Set reseed counter to beyond interval */
+ dctx->reseed_counter = dctx->reseed_interval;
- /* Check generation is now OK */
- if (!FIPS_drbg_generate(dctx, randout, td->katlen, 0, 0,
- td->adin, td->adinlen))
- goto err;
- if (!FIPS_drbg_generate(dctx, randout, td->katlen, 0, 0,
- td->adin, td->adinlen))
- goto err;
-
- /* DRBG should now require a reseed */
- if (dctx->status != DRBG_STATUS_RESEED)
- {
- FIPSerr(FIPS_F_FIPS_DRBG_HEALTH_CHECK, FIPS_R_RESEED_COUNTER_ERROR);
- goto err;
- }
-
-
- /* Generate again and check entropy has been requested for reseed */
+ /* Generate output and check entropy has been requested for reseed */
t.entcnt = 0;
if (!FIPS_drbg_generate(dctx, randout, td->katlen, 0, 0,
td->adin, td->adinlen))
FIPSerr(FIPS_F_FIPS_DRBG_HEALTH_CHECK, FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED);
goto err;
}
+ /* Check reseed counter has been reset */
+ if (dctx->reseed_counter != reseed_counter_tmp + 1)
+ {
+ FIPSerr(FIPS_F_FIPS_DRBG_HEALTH_CHECK, FIPS_R_RESEED_COUNTER_ERROR);
+ goto err;
+ }
FIPS_drbg_uninstantiate(dctx);
p = (unsigned char *)&dctx->d;
{
if (td->nid == nid && td->flags == flags)
{
- rv = fips_drbg_single_kat(dctx, td);
+ rv = fips_drbg_single_kat(dctx, td, 0);
if (rv <= 0)
return rv;
return fips_drbg_health_check(dctx, td);
return 0;
for (td = drbg_test; td->nid != 0; td++)
{
+ if (td->post != 1)
+ continue;
if (!fips_post_started(FIPS_TEST_DRBG, td->nid, &td->flags))
return 1;
- if (!fips_drbg_single_kat(dctx, td))
- {
- fips_post_failed(FIPS_TEST_DRBG, td->nid, &td->flags);
- rv = 0;
- continue;
- }
- if (!fips_drbg_health_check(dctx, td))
+ if (!fips_drbg_single_kat(dctx, td, 1))
{
fips_post_failed(FIPS_TEST_DRBG, td->nid, &td->flags);
rv = 0;
projects / openssl.git / blobdiff