diff options
| author | Stephan Müller <smueller@chronox.de> | 2022-02-01 09:40:58 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2022-02-11 20:22:01 +1100 |
| commit | d4d399d13e6618a8a6512692d83803272a8cf606 (patch) | |
| tree | 659c4063802138e52efb643574c19c89367e942d | |
| parent | c948a7b020647c2f25e4ac75059f4ca75a644597 (diff) | |
| download | linux-crypto-d4d399d13e6618a8a6512692d83803272a8cf606.tar.gz linux-crypto-d4d399d13e6618a8a6512692d83803272a8cf606.zip | |
crypto: hmac - add fips_skip support
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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/testmgr.c | 3 | ||||
| -rw-r--r-- | crypto/testmgr.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 3a5a3e5c..0c2efde2 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1851,6 +1851,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 a253d66b..17b37525 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; }; /* |