mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>
Cc: smueller@chronox.de, linux-crypto@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/4] crypto: drbg - ensure most preferred type is FIPS health checked
Date: Mon, 30 Oct 2023 14:05:13 +0200	[thread overview]
Message-ID: <20231030120517.39424-2-dimitri.ledkov@canonical.com> (raw)
In-Reply-To: <20231030120517.39424-1-dimitri.ledkov@canonical.com>

drbg supports multiple types of drbg, and multiple parameters of
each. Health check sanity only checks one drbg of a single type. One
can enable all three types of drbg. And instead of checking the most
preferred algorithm (last one wins), it is currently checking first
one instead.

Update ifdef to ensure that healthcheck prefers HMAC, over HASH, over
CTR, last one wins, like all other code and functions.

This patch updates code from 541af946fe ("crypto: drbg - SP800-90A
Deterministic Random Bit Generator"), but is not interesting to
cherry-pick for stable updates, because it doesn't affect regular
builds, nor has any tangible effect on FIPS certifcation.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Reviewed-by: Stephan Mueller <smueller@chronox.de>
---
 crypto/drbg.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/drbg.c b/crypto/drbg.c
index ff4ebbc68e..2cce18dcfc 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -2018,9 +2018,11 @@ static inline int __init drbg_healthcheck_sanity(void)
 
 #ifdef CONFIG_CRYPTO_DRBG_CTR
 	drbg_convert_tfm_core("drbg_nopr_ctr_aes128", &coreref, &pr);
-#elif defined CONFIG_CRYPTO_DRBG_HASH
+#endif
+#ifdef CONFIG_CRYPTO_DRBG_HASH
 	drbg_convert_tfm_core("drbg_nopr_sha256", &coreref, &pr);
-#else
+#endif
+#ifdef CONFIG_CRYPTO_DRBG_HMAC
 	drbg_convert_tfm_core("drbg_nopr_hmac_sha256", &coreref, &pr);
 #endif
 
-- 
2.34.1


  reply	other threads:[~2023-10-30 12:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-29 20:48 [PATCH " Dimitri John Ledkov
2023-10-29 20:48 ` [PATCH 2/4] crypto: drbg - update FIPS CTR self-checks to aes256 Dimitri John Ledkov
2023-10-30 10:23   ` Stephan Mueller
2023-10-30 10:30     ` Dimitri John Ledkov
2023-10-30 10:35       ` Stephan Mueller
2023-10-29 20:48 ` [PATCH 3/4] crypto: drbg - ensure drbg hmac sha512 is used in FIPS selftests Dimitri John Ledkov
2023-10-30 10:25   ` Stephan Mueller
2023-10-29 20:48 ` [PATCH 4/4] crypto: drbg - Remove SHA1 from drbg Dimitri John Ledkov
2023-10-30 11:20   ` Stephan Mueller
2023-10-30 10:19 ` [PATCH 1/4] crypto: drbg - ensure most preferred type is FIPS health checked Stephan Mueller
2023-10-30 12:05 ` [PATCH v2 0/4] drbg small fixes Dimitri John Ledkov
2023-10-30 12:05   ` Dimitri John Ledkov [this message]
2023-10-30 12:05   ` [PATCH v2 2/4] crypto: drbg - update FIPS CTR self-checks to aes256 Dimitri John Ledkov
2023-10-30 12:05   ` [PATCH v2 3/4] crypto: drbg - ensure drbg hmac sha512 is used in FIPS selftests Dimitri John Ledkov
2023-10-30 12:05   ` [PATCH v2 4/4] crypto: drbg - Remove SHA1 from drbg Dimitri John Ledkov
2023-11-17 11:23   ` [PATCH v2 0/4] drbg small fixes Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231030120517.39424-2-dimitri.ledkov@canonical.com \
    --to=dimitri.ledkov@canonical.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=smueller@chronox.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®