From 980a880ee5a85b94caac3049c7d3be0b765d97d3 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Fri, 31 Jan 2020 07:53:04 +1000 Subject: [PATCH] Add DRBG self tests Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/11010) --- providers/fips/self_test_data.inc | 233 ++++++++++++++++++++++++++++- providers/fips/self_test_kats.c | 162 +++++++++++++++++--- test/recipes/03-test_fipsinstall.t | 9 +- 3 files changed, 385 insertions(+), 19 deletions(-) diff --git a/providers/fips/self_test_data.inc b/providers/fips/self_test_data.inc index 1ee83e0d1c..c91e7d83c1 100644 --- a/providers/fips/self_test_data.inc +++ b/providers/fips/self_test_data.inc @@ -1,5 +1,5 @@ /* - * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -42,6 +42,28 @@ typedef struct st_kat_kdf_st { size_t expected_len; } ST_KAT_KDF; +typedef struct st_kat_drbg_st { + const char *desc; + const char *algorithm; + int nid; + const unsigned char *entropyin; + size_t entropyinlen; + const unsigned char *nonce; + size_t noncelen; + const unsigned char *persstr; + size_t persstrlen; + const unsigned char *entropyinpr1; + size_t entropyinpr1len; + const unsigned char *entropyinpr2; + size_t entropyinpr2len; + const unsigned char *entropyaddin1; + size_t entropyaddin1len; + const unsigned char *entropyaddin2; + size_t entropyaddin2len; + const unsigned char *expected; + size_t expectedlen; +} ST_KAT_DRBG; + /* Macros to build Self test data */ #define ITM(x) x, sizeof(x) #define ITM_STR(x) x, sizeof(x) - 1 @@ -191,3 +213,212 @@ static const ST_KAT_KDF st_kat_kdf_tests[] = } }; +/*- +* DRBG test vectors are a small subset of +* https://csrc.nist.rip/groups/STM/cavp/documents/drbg/drbgtestvectors.zip +* Using the folder drbgvectors_pr_true +* Generated for CAVS 14.3. +*/ + +/* + * Hash_DRBG.rsp + * + * [SHA-256] + * [PredictionResistance = True] + * [EntropyInputLen = 256] + * [NonceLen = 128] + * [PersonalizationStringLen = 256] + * [AdditionalInputLen = 256] + * [ReturnedBitsLen = 1024] + * + * COUNT = 14 + */ +static const unsigned char drbg_hash_sha256_pr_entropyin[] = { + 0x06, 0x6d, 0xc8, 0xce, 0x75, 0xb2, 0x89, 0x66, 0xa6, 0x85, 0x16, 0x3f, + 0xe2, 0xa4, 0xd4, 0x27, 0xfb, 0xdb, 0x61, 0x66, 0x50, 0x61, 0x6b, 0xa2, + 0x82, 0xfc, 0x33, 0x2b, 0x4e, 0x6f, 0x12, 0x20 +}; +static const unsigned char drbg_hash_sha256_pr_nonce[] = { + 0x55, 0x9f, 0x7c, 0x64, 0x89, 0x70, 0x83, 0xec, 0x2d, 0x73, 0x70, 0xd9, + 0xf0, 0xe5, 0x07, 0x1f +}; +static const unsigned char drbg_hash_sha256_pr_persstr[] = { + 0x88, 0x6f, 0x54, 0x9a, 0xad, 0x1a, 0xc6, 0x3d, 0x18, 0xcb, 0xcc, 0x66, + 0x85, 0xda, 0xa2, 0xc2, 0xf7, 0x9e, 0xb0, 0x89, 0x4c, 0xb4, 0xae, 0xf1, + 0xac, 0x54, 0x4f, 0xce, 0x57, 0xf1, 0x5e, 0x11 +}; +static const unsigned char drbg_hash_sha256_pr_entropyinpr0[] = { + 0xff, 0x80, 0xb7, 0xd2, 0x6a, 0x05, 0xbc, 0x8a, 0x7a, 0xbe, 0x53, 0x28, + 0x6b, 0x0e, 0xeb, 0x73, 0x3b, 0x71, 0x5a, 0x20, 0x5b, 0xfa, 0x4f, 0xf6, + 0x37, 0x03, 0xde, 0xad, 0xb6, 0xea, 0x0e, 0xf4 +}; +static const unsigned char drbg_hash_sha256_pr_entropyinpr1[] = { + 0xc7, 0x38, 0x32, 0x53, 0x46, 0x81, 0xed, 0xe3, 0x7e, 0x03, 0x84, 0x6d, + 0x3c, 0x84, 0x17, 0x67, 0x29, 0x7d, 0x24, 0x6c, 0x68, 0x92, 0x41, 0xd2, + 0xe7, 0x75, 0xbe, 0x7e, 0xc9, 0x96, 0x29, 0x3d +}; +static const unsigned char drbg_hash_sha256_pr_addin0[] = { + 0xb7, 0x21, 0x5f, 0x14, 0xac, 0x7b, 0xaf, 0xd0, 0xa9, 0x17, 0x72, 0xba, + 0x22, 0xf7, 0x19, 0xaf, 0xbd, 0x20, 0xb3, 0x11, 0x63, 0x6c, 0x2b, 0x1e, + 0x83, 0xe4, 0xa8, 0x23, 0x35, 0x3f, 0xc6, 0xea +}; +static const unsigned char drbg_hash_sha256_pr_addin1[] = { + 0xce, 0xd3, 0x1f, 0x7e, 0x0d, 0xae, 0x5b, 0xb5, 0xc0, 0x43, 0xe2, 0x46, + 0xb2, 0x94, 0x73, 0xe2, 0xfd, 0x39, 0x51, 0x2e, 0xad, 0x45, 0x69, 0xee, + 0xe3, 0xe3, 0x80, 0x33, 0x14, 0xab, 0xa7, 0xa3 +}; +static const unsigned char drbg_hash_sha256_pr_expected[] = { + 0x60, 0xc2, 0x34, 0xcf, 0xaf, 0xb4, 0x68, 0x03, 0x3b, 0xf1, 0x95, 0xe5, + 0x78, 0xce, 0x26, 0x6e, 0x14, 0x65, 0x32, 0x6a, 0x96, 0xa9, 0xe0, 0x3f, + 0x8b, 0x89, 0x36, 0x70, 0xef, 0x62, 0x75, 0x4d, 0x5e, 0x80, 0xd5, 0x53, + 0xa1, 0xf8, 0x49, 0x50, 0x20, 0x8b, 0x93, 0x43, 0x07, 0x9f, 0x2e, 0xf8, + 0x56, 0xe9, 0xc5, 0x70, 0x61, 0x85, 0x97, 0xb5, 0xdc, 0x82, 0xa2, 0xda, + 0xea, 0xa3, 0xfd, 0x9b, 0x2f, 0xd2, 0xa0, 0xd7, 0x1b, 0xc6, 0x29, 0x35, + 0xcc, 0xb8, 0x3d, 0xa0, 0x67, 0x98, 0x05, 0xa0, 0xe3, 0x1e, 0xfe, 0xe4, + 0xf0, 0xe5, 0x13, 0xb0, 0x83, 0x17, 0xfa, 0xca, 0x93, 0x5e, 0x38, 0x29, + 0x48, 0xd2, 0x72, 0xdb, 0x76, 0x3e, 0x6d, 0xf3, 0x25, 0x10, 0xff, 0x1b, + 0x99, 0xff, 0xf8, 0xc6, 0x0e, 0xb0, 0xdd, 0x29, 0x2e, 0xbc, 0xbb, 0xc8, + 0x0a, 0x01, 0x6e, 0xd3, 0xb0, 0x0e, 0x4e, 0xab +}; + +/* + * CTR_DRBG.rsp + * + * [AES-128 use df] + * [PredictionResistance = True] + * [EntropyInputLen = 128] + * [NonceLen = 64] + * [PersonalizationStringLen = 128] + * [AdditionalInputLen = 128] + * [ReturnedBitsLen = 512] + * + * COUNT = 0 + */ +static const unsigned char drbg_ctr_aes128_pr_df_entropyin[] = { + 0x92, 0x89, 0x8f, 0x31, 0xfa, 0x1c, 0xff, 0x6d, 0x18, 0x2f, 0x26, 0x06, + 0x43, 0xdf, 0xf8, 0x18 +}; +static const unsigned char drbg_ctr_aes128_pr_df_nonce[] = { + 0xc2, 0xa4, 0xd9, 0x72, 0xc3, 0xb9, 0xb6, 0x97 +}; +static const unsigned char drbg_ctr_aes128_pr_df_persstr[] = { + 0xea, 0x65, 0xee, 0x60, 0x26, 0x4e, 0x7e, 0xb6, 0x0e, 0x82, 0x68, 0xc4, + 0x37, 0x3c, 0x5c, 0x0b +}; +static const unsigned char drbg_ctr_aes128_pr_df_entropyinpr0[] = { + 0x20, 0x72, 0x8a, 0x06, 0xf8, 0x6f, 0x8d, 0xd4, 0x41, 0xe2, 0x72, 0xb7, + 0xc4, 0x2c, 0xe8, 0x10 +}; +static const unsigned char drbg_ctr_aes128_pr_df_entropyinpr1[] = { + 0x3d, 0xb0, 0xf0, 0x94, 0xf3, 0x05, 0x50, 0x33, 0x17, 0x86, 0x3e, 0x22, + 0x08, 0xf7, 0xa5, 0x01 +}; +static const unsigned char drbg_ctr_aes128_pr_df_addin0[] = { + 0x1a, 0x40, 0xfa, 0xe3, 0xcc, 0x6c, 0x7c, 0xa0, 0xf8, 0xda, 0xba, 0x59, + 0x23, 0x6d, 0xad, 0x1d +}; +static const unsigned char drbg_ctr_aes128_pr_df_addin1[] = { + 0x9f, 0x72, 0x76, 0x6c, 0xc7, 0x46, 0xe5, 0xed, 0x2e, 0x53, 0x20, 0x12, + 0xbc, 0x59, 0x31, 0x8c +}; +static const unsigned char drbg_ctr_aes128_pr_df_expected[] = { + 0x5a, 0x35, 0x39, 0x87, 0x0f, 0x4d, 0x22, 0xa4, 0x09, 0x24, 0xee, 0x71, + 0xc9, 0x6f, 0xac, 0x72, 0x0a, 0xd6, 0xf0, 0x88, 0x82, 0xd0, 0x83, 0x28, + 0x73, 0xec, 0x3f, 0x93, 0xd8, 0xab, 0x45, 0x23, 0xf0, 0x7e, 0xac, 0x45, + 0x14, 0x5e, 0x93, 0x9f, 0xb1, 0xd6, 0x76, 0x43, 0x3d, 0xb6, 0xe8, 0x08, + 0x88, 0xf6, 0xda, 0x89, 0x08, 0x77, 0x42, 0xfe, 0x1a, 0xf4, 0x3f, 0xc4, + 0x23, 0xc5, 0x1f, 0x68 +}; + +/* + * HMAC_DRBG.rsp + * + * [SHA-1] + * [PredictionResistance = True] + * [EntropyInputLen = 128] + * [NonceLen = 64] + * [PersonalizationStringLen = 128] + * [AdditionalInputLen = 128] + * [ReturnedBitsLen = 640] + * + * COUNT = 0 + */ +static const unsigned char drbg_hmac_sha1_pr_entropyin[] = { + 0x68, 0x0f, 0xac, 0xe9, 0x0d, 0x7b, 0xca, 0x21, 0xd4, 0xa0, 0xed, 0xb7, + 0x79, 0x9e, 0xe5, 0xd8 +}; +static const unsigned char drbg_hmac_sha1_pr_nonce[] = { + 0xb7, 0xbe, 0x9e, 0xed, 0xdd, 0x0e, 0x3b, 0x4b +}; +static const unsigned char drbg_hmac_sha1_pr_persstr[] = { + 0xf5, 0x8c, 0x40, 0xae, 0x70, 0xf7, 0xa5, 0x56, 0x48, 0xa9, 0x31, 0xa0, + 0xa9, 0x31, 0x3d, 0xd7 +}; +static const unsigned char drbg_hmac_sha1_pr_entropyinpr0[] = { + 0x7c, 0xaf, 0xe2, 0x31, 0x63, 0x0a, 0xa9, 0x5a, 0x74, 0x2c, 0x4e, 0x5f, + 0x5f, 0x22, 0xc6, 0xa4 +}; +static const unsigned char drbg_hmac_sha1_pr_entropyinpr1[] = { + 0x1c, 0x0d, 0x77, 0x92, 0x89, 0x88, 0x27, 0x94, 0x8a, 0x58, 0x9f, 0x82, + 0x2d, 0x1a, 0xf7, 0xa6 +}; +static const unsigned char drbg_hmac_sha1_pr_addin0[] = { + 0xdc, 0x36, 0x63, 0xf0, 0x62, 0x78, 0x9c, 0xd1, 0x5c, 0xbb, 0x20, 0xc3, + 0xc1, 0x8c, 0xd9, 0xd7 +}; +static const unsigned char drbg_hmac_sha1_pr_addin1[] = { + 0xfe, 0x85, 0xb0, 0xab, 0x14, 0xc6, 0x96, 0xe6, 0x9c, 0x24, 0xe7, 0xb5, + 0xa1, 0x37, 0x12, 0x0c +}; +static const unsigned char drbg_hmac_sha1_pr_expected[] = { + 0x68, 0x00, 0x4b, 0x3a, 0x28, 0xf7, 0xf0, 0x1c, 0xf9, 0xe9, 0xb5, 0x71, + 0x20, 0x79, 0xef, 0x80, 0x87, 0x1b, 0x08, 0xb9, 0xa9, 0x1b, 0xcd, 0x2b, + 0x9f, 0x09, 0x4d, 0xa4, 0x84, 0x80, 0xb3, 0x4c, 0xaf, 0xd5, 0x59, 0x6b, + 0x0c, 0x0a, 0x48, 0xe1, 0x48, 0xda, 0xbc, 0x6f, 0x77, 0xb8, 0xff, 0xaf, + 0x18, 0x70, 0x28, 0xe1, 0x04, 0x13, 0x7a, 0x4f, 0xeb, 0x1c, 0x72, 0xb0, + 0xc4, 0x4f, 0xe8, 0xb1, 0xaf, 0xab, 0xa5, 0xbc, 0xfd, 0x86, 0x67, 0xf2, + 0xf5, 0x5b, 0x46, 0x06, 0x63, 0x2e, 0x3c, 0xbc +}; + +static const ST_KAT_DRBG st_kat_drbg_tests[] = +{ + { + OSSL_SELF_TEST_DESC_DRBG_HASH, + "SHA256", + NID_sha256, + ITM(drbg_hash_sha256_pr_entropyin), + ITM(drbg_hash_sha256_pr_nonce), + ITM(drbg_hash_sha256_pr_persstr), + ITM(drbg_hash_sha256_pr_entropyinpr0), + ITM(drbg_hash_sha256_pr_entropyinpr1), + ITM(drbg_hash_sha256_pr_addin0), + ITM(drbg_hash_sha256_pr_addin1), + ITM(drbg_hash_sha256_pr_expected) + }, + { + OSSL_SELF_TEST_DESC_DRBG_CTR, + "AES-128", + NID_aes_128_ctr, + ITM(drbg_ctr_aes128_pr_df_entropyin), + ITM(drbg_ctr_aes128_pr_df_nonce), + ITM(drbg_ctr_aes128_pr_df_persstr), + ITM(drbg_ctr_aes128_pr_df_entropyinpr0), + ITM(drbg_ctr_aes128_pr_df_entropyinpr1), + ITM(drbg_ctr_aes128_pr_df_addin0), + ITM(drbg_ctr_aes128_pr_df_addin1), + ITM(drbg_ctr_aes128_pr_df_expected) + }, + { + OSSL_SELF_TEST_DESC_DRBG_HMAC, + "SHA1", + NID_sha1, + ITM(drbg_hmac_sha1_pr_entropyin), + ITM(drbg_hmac_sha1_pr_nonce), + ITM(drbg_hmac_sha1_pr_persstr), + ITM(drbg_hmac_sha1_pr_entropyinpr0), + ITM(drbg_hmac_sha1_pr_entropyinpr1), + ITM(drbg_hmac_sha1_pr_addin0), + ITM(drbg_hmac_sha1_pr_addin1), + ITM(drbg_hmac_sha1_pr_expected) + } +}; diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c index a383c0c36d..128e2aa118 100644 --- a/providers/fips/self_test_kats.c +++ b/providers/fips/self_test_kats.c @@ -10,10 +10,15 @@ #include #include #include +#include #include "internal/cryptlib.h" #include "internal/nelem.h" #include "self_test.h" #include "self_test_data.inc" +#include "../../crypto/rand/rand_local.h" + +#define DRBG_PARAM_ENTROPY "DRBG-ENTROPY" +#define DRBG_PARAM_NONCE "DRBG-NONCE" static int self_test_digest(const ST_KAT_DIGEST *t, OSSL_ST_EVENT *event, OPENSSL_CTX *libctx) @@ -94,43 +99,43 @@ static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_ST_EVENT *event, ctx = EVP_CIPHER_CTX_new(); if (ctx == NULL) - goto end; + goto err; cipher = EVP_CIPHER_fetch(libctx, t->base.algorithm, ""); if (cipher == NULL) - goto end; + goto err; /* Encrypt plain text message */ if (!cipher_init(ctx, cipher, t, encrypt) || !EVP_CipherUpdate(ctx, ct_buf, &len, t->base.pt, t->base.pt_len) || !EVP_CipherFinal_ex(ctx, ct_buf + len, &ct_len)) - goto end; + goto err; SELF_TEST_EVENT_oncorrupt_byte(event, ct_buf); ct_len += len; if (ct_len != (int)t->base.expected_len || memcmp(t->base.expected, ct_buf, ct_len) != 0) - goto end; + goto err; if (t->tag != NULL) { unsigned char tag[16] = { 0 }; if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, t->tag_len, tag) || memcmp(tag, t->tag, t->tag_len) != 0) - goto end; + goto err; } if (!(cipher_init(ctx, cipher, t, !encrypt) && EVP_CipherUpdate(ctx, pt_buf, &len, ct_buf, ct_len) && EVP_CipherFinal_ex(ctx, pt_buf + len, &pt_len))) - goto end; + goto err; pt_len += len; if (pt_len != (int)t->base.pt_len || memcmp(pt_buf, t->base.pt, pt_len) != 0) - goto end; + goto err; ret = 1; -end: +err: EVP_CIPHER_free(cipher); EVP_CIPHER_CTX_free(ctx); SELF_TEST_EVENT_onend(event, ret); @@ -158,33 +163,33 @@ static int self_test_kdf(const ST_KAT_KDF *t, OSSL_ST_EVENT *event, kdf = EVP_KDF_fetch(libctx, t->algorithm, ""); ctx = EVP_KDF_CTX_new(kdf); if (ctx == NULL) - goto end; + goto err; settables = EVP_KDF_settable_ctx_params(kdf); for (i = 0; t->ctrls[i].name != NULL; ++i) { if (!ossl_assert(i < (numparams - 1))) - goto end; + goto err; if (!OSSL_PARAM_allocate_from_text(¶ms[i], settables, t->ctrls[i].name, t->ctrls[i].value, strlen(t->ctrls[i].value), NULL)) - goto end; + goto err; } if (!EVP_KDF_CTX_set_params(ctx, params)) - goto end; + goto err; if (t->expected_len > sizeof(out)) - goto end; + goto err; if (EVP_KDF_derive(ctx, out, t->expected_len) <= 0) - goto end; + goto err; SELF_TEST_EVENT_oncorrupt_byte(event, out); if (memcmp(out, t->expected, t->expected_len) != 0) - goto end; + goto err; ret = 1; -end: +err: for (i = 0; params[i].key != NULL; ++i) OPENSSL_free(params[i].data); EVP_KDF_free(kdf); @@ -193,6 +198,116 @@ end: return ret; } +static size_t drbg_kat_entropy_cb(RAND_DRBG *drbg, unsigned char **pout, + int entropy, size_t min_len, size_t max_len, + int prediction_resistance) +{ + OSSL_PARAM *drbg_params = RAND_DRBG_get_callback_data(drbg); + OSSL_PARAM *p = OSSL_PARAM_locate(drbg_params, DRBG_PARAM_ENTROPY); + + if (p == NULL || p->data_type != OSSL_PARAM_OCTET_STRING) + return 0; + *pout = (unsigned char *)p->data; + return p->data_size; +} + +static size_t drbg_kat_nonce_cb(RAND_DRBG *drbg, unsigned char **pout, + int entropy, size_t min_len, size_t max_len) +{ + OSSL_PARAM *drbg_params = RAND_DRBG_get_callback_data(drbg); + OSSL_PARAM *p = OSSL_PARAM_locate(drbg_params, DRBG_PARAM_NONCE); + + if (p == NULL || p->data_type != OSSL_PARAM_OCTET_STRING) + return 0; + *pout = (unsigned char *)p->data; + return p->data_size; +} + +static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_ST_EVENT *event, + OPENSSL_CTX *libctx) +{ + int ret = 0; + unsigned char out[256]; + RAND_DRBG *drbg = NULL; + unsigned int flags = 0; + int prediction_resistance = 1; /* Causes a reseed */ + OSSL_PARAM drbg_params[3] = { + OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END + }; + + SELF_TEST_EVENT_onbegin(event, OSSL_SELF_TEST_TYPE_DRBG, t->desc); + + if (strcmp(t->desc, OSSL_SELF_TEST_DESC_DRBG_HMAC) == 0) + flags |= RAND_DRBG_FLAG_HMAC; + + drbg = RAND_DRBG_new_ex(libctx, t->nid, flags, NULL); + if (drbg == NULL) + goto err; + + if (!RAND_DRBG_set_callback_data(drbg, drbg_params)) + goto err; + + if (!RAND_DRBG_set_callbacks(drbg, drbg_kat_entropy_cb, NULL, + drbg_kat_nonce_cb, NULL)) + goto err; + + drbg_params[0] = + OSSL_PARAM_construct_octet_string(DRBG_PARAM_ENTROPY, + (void *)t->entropyin, t->entropyinlen); + drbg_params[1] = + OSSL_PARAM_construct_octet_string(DRBG_PARAM_NONCE, + (void *)t->nonce, t->noncelen); + + if (!RAND_DRBG_instantiate(drbg, t->persstr, t->persstrlen)) + goto err; + + drbg_params[0] = + OSSL_PARAM_construct_octet_string(DRBG_PARAM_ENTROPY, + (void *)t->entropyinpr1, + t->entropyinpr1len); + + if (!RAND_DRBG_generate(drbg, out, t->expectedlen, prediction_resistance, + t->entropyaddin1, t->entropyaddin1len)) + goto err; + + drbg_params[0] = + OSSL_PARAM_construct_octet_string(DRBG_PARAM_ENTROPY, + (void *)t->entropyinpr2, + t->entropyinpr2len); + /* This calls RAND_DRBG_reseed() internally when prediction_resistance = 1 */ + if (!RAND_DRBG_generate(drbg, out, t->expectedlen, prediction_resistance, + t->entropyaddin2, t->entropyaddin2len)) + goto err; + + SELF_TEST_EVENT_oncorrupt_byte(event, out); + + if (memcmp(out, t->expected, t->expectedlen) != 0) + goto err; + + if (!RAND_DRBG_uninstantiate(drbg)) + goto err; + /* + * TODO(3.0) : Check that the DRBG data has been zeroed after + * RAND_DRBG_uninstantiate. Its a bit hard currently to do this when + * the drbg->data is reinitialized by this call.. + */ +#if 0 + { + size_t i, sz = sizeof(drbg->data); + unsigned char *p = (unsigned char *)&drbg->data; + + for (i = 0; i < sz; ++i) + if (*p++ != 0) + goto err; + } +#endif + ret = 1; +err: + RAND_DRBG_free(drbg); + SELF_TEST_EVENT_onend(event, ret); + return ret; +} + /* * Test a data driven list of KAT's for digest algorithms. * All tests are run regardless of if they fail or not. @@ -231,12 +346,23 @@ static int self_test_kdfs(OSSL_ST_EVENT *event, OPENSSL_CTX *libctx) return ret; } +static int self_test_drbgs(OSSL_ST_EVENT *event, OPENSSL_CTX *libctx) +{ + int i, ret = 1; + + for (i = 0; i < (int)OSSL_NELEM(st_kat_drbg_tests); ++i) { + if (!self_test_drbg(&st_kat_drbg_tests[i], event, libctx)) + ret = 0; + } + return ret; +} + /* * Run the algorithm KAT's. * Return 1 is successful, otherwise return 0. * This runs all the tests regardless of if any fail. * - * TODO(3.0) Add self tests for KA, DRBG, Sign/Verify when they become available + * TODO(3.0) Add self tests for KA, Sign/Verify when they become available */ int SELF_TEST_kats(OSSL_ST_EVENT *event, OPENSSL_CTX *libctx) { @@ -248,6 +374,8 @@ int SELF_TEST_kats(OSSL_ST_EVENT *event, OPENSSL_CTX *libctx) ret = 0; if (!self_test_kdfs(event, libctx)) ret = 0; + if (!self_test_drbgs(event, libctx)) + ret = 0; return ret; } diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t index e77e09d550..71e8db10e4 100644 --- a/test/recipes/03-test_fipsinstall.t +++ b/test/recipes/03-test_fipsinstall.t @@ -24,7 +24,7 @@ use platform; plan skip_all => "Test only supported in a fips build" if disabled("fips"); -plan tests => 9; +plan tests => 10; my $infile = bldtop_file('providers', platform->dso('fips')); $ENV{OPENSSL_MODULES} = bldtop_dir("providers"); @@ -92,3 +92,10 @@ ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile, '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00', '-section_name', 'fips_install', '-corrupt_desc', 'SHA3'])), "fipsinstall fails when the digest result is corrupted"); + +# corrupt DRBG +ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile, + '-provider_name', 'fips', '-mac_name', 'HMAC', + '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00', + '-section_name', 'fips_install', '-corrupt_desc', 'CTR'])), + "fipsinstall fails when the DRBG CTR result is corrupted"); -- GitLab