diff options
| author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2021-09-23 19:20:26 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-24 21:29:22 +0000 |
| commit | cbb9463b26e3637b592e27e18eb93d73a5ceb6aa (patch) | |
| tree | fa533b741477fa9ec6db791552cae1c07044d984 /board/cr50/dcrypto/fips.c | |
| parent | 5235525f86bf5b28009afbfc37b459add0723762 (diff) | |
| download | chrome-ec-cbb9463b26e3637b592e27e18eb93d73a5ceb6aa.tar.gz | |
cr50: switch HMAC_DRBG to use enum dcrypto_result
Make HMAC_DRBG return codes consistent with other functions.
BUG=b:197893750
TEST=make BOARD=cr50 CRYPTO_TEST=1; test/tpm_test/tpmtest.py
in ccd: u2f_test, dcrypto_ecdsa, rma_auth
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
Change-Id: I9c673a45a250bef32c096f8d8be3152756a64cb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3180482
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'board/cr50/dcrypto/fips.c')
| -rw-r--r-- | board/cr50/dcrypto/fips.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/board/cr50/dcrypto/fips.c b/board/cr50/dcrypto/fips.c index 391fee5657..d6c1912029 100644 --- a/board/cr50/dcrypto/fips.c +++ b/board/cr50/dcrypto/fips.c @@ -332,14 +332,13 @@ static bool fips_hmac_drbg_generate_kat(struct drbg_ctx *ctx) 0xf1, 0x32, 0xf6, 0x86, 0xb7, 0x60, 0xf0, 0x12 }; uint8_t buf[128]; - int passed; + enum dcrypto_result passed; - passed = hmac_drbg_generate(ctx, buf, sizeof(buf), NULL, 0) - - HMAC_DRBG_SUCCESS; + passed = hmac_drbg_generate(ctx, buf, sizeof(buf), NULL, 0); /* Verify internal drbg state */ - passed |= DCRYPTO_equals(ctx->v, V2, sizeof(V2)) - DCRYPTO_OK; - passed |= DCRYPTO_equals(ctx->k, K2, sizeof(K2)) - DCRYPTO_OK; + passed |= DCRYPTO_equals(ctx->v, V2, sizeof(V2)); + passed |= DCRYPTO_equals(ctx->k, K2, sizeof(K2)); memcpy(buf, drbg_entropy2, sizeof(drbg_entropy2)); if (fips_break_cmd == FIPS_BREAK_HMAC_DRBG) @@ -348,10 +347,9 @@ static bool fips_hmac_drbg_generate_kat(struct drbg_ctx *ctx) hmac_drbg_reseed(ctx, buf, sizeof(drbg_entropy2), drbg_addtl_input2, sizeof(drbg_addtl_input2), NULL, 0); - passed |= hmac_drbg_generate(ctx, buf, sizeof(buf), NULL, 0) - - HMAC_DRBG_SUCCESS; - passed |= DCRYPTO_equals(buf, KA, sizeof(KA)) - DCRYPTO_OK; - return passed == 0; + passed |= hmac_drbg_generate(ctx, buf, sizeof(buf), NULL, 0); + passed |= DCRYPTO_equals(buf, KA, sizeof(KA)); + return passed == DCRYPTO_OK; } /* Known-answer test for HMAC_DRBG SHA256. */ |