From: "Stephan Müller" <smueller@chronox.de>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org, Niolai Stange <nstange@suse.com>,
Simo Sorce <simo@redhat.com>
Subject: [PATCH v2 1/2] crypto: HMAC - add fips_skip support
Date: Tue, 01 Feb 2022 09:40:58 +0100 [thread overview]
Message-ID: <2682841.vuYhMxLoTh@positron.chronox.de> (raw)
In-Reply-To: <4609802.vXUDI8C0e8@positron.chronox.de>
By adding the support for the flag fips_skip, hash / HMAC test vectors
may be marked to be not applicable in FIPS mode. Such vectors are
silently skipped in FIPS mode.
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
crypto/testmgr.c | 3 +++
crypto/testmgr.h | 2 ++
2 files changed, 5 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 5831d4bbc64f..26674570ea72 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1854,6 +1854,9 @@ static int __alg_test_hash(const struct hash_testvec *vecs,
}
for (i = 0; i < num_vecs; i++) {
+ if (fips_enabled && vecs[i].fips_skip)
+ continue;
+
err = test_hash_vec(&vecs[i], i, req, desc, tsgl, hashstate);
if (err)
goto out;
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index a253d66ba1c1..17b37525f289 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -33,6 +33,7 @@
* @ksize: Length of @key in bytes (0 if no key)
* @setkey_error: Expected error from setkey()
* @digest_error: Expected error from digest()
+ * @fips_skip: Skip the test vector in FIPS mode
*/
struct hash_testvec {
const char *key;
@@ -42,6 +43,7 @@ struct hash_testvec {
unsigned short ksize;
int setkey_error;
int digest_error;
+ bool fips_skip;
};
/*
--
2.33.1
next prev parent reply other threads:[~2022-02-01 8:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 19:25 [PATCH] crypto: HMAC - disallow keys < 112 bits in FIPS mode Stephan Müller
2022-01-07 23:28 ` Eric Biggers
2022-01-08 6:39 ` Stephan Müller
2022-01-11 7:17 ` Stephan Mueller
2022-01-28 4:46 ` Herbert Xu
2022-01-28 6:05 ` Stephan Mueller
2022-02-01 8:40 ` [PATCH v2 0/2] " Stephan Müller
2022-02-01 8:40 ` Stephan Müller [this message]
2022-02-01 8:41 ` [PATCH v2 2/2] " Stephan Müller
2022-02-11 9:34 ` [PATCH v2 0/2] " 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=2682841.vuYhMxLoTh@positron.chronox.de \
--to=smueller@chronox.de \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=nstange@suse.com \
--cc=simo@redhat.com \
/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