summaryrefslogtreecommitdiffstats
path: root/crypto/testmgr.c
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2015-08-19 02:42:07 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-19 10:59:48 -0400
commit8f183751a8604be5aaf0ad6dedac4890bb6fa0d5 (patch)
treed2cf8d562d11aeed80bd64469a9a170079594bfe /crypto/testmgr.c
parent66c9a04e33947191a03a1cf5103b8bf9051774df (diff)
crypto: cmac - allow usage in FIPS mode
CMAC is an approved cipher in FIPS 140-2. The patch allows the use of CMAC with TDES and AES in FIPS mode. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r--crypto/testmgr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index d0a42bd3aae9..a865ea99a057 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2476,6 +2476,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2476 } 2476 }
2477 }, { 2477 }, {
2478 .alg = "cmac(aes)", 2478 .alg = "cmac(aes)",
2479 .fips_allowed = 1,
2479 .test = alg_test_hash, 2480 .test = alg_test_hash,
2480 .suite = { 2481 .suite = {
2481 .hash = { 2482 .hash = {
@@ -2485,6 +2486,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2485 } 2486 }
2486 }, { 2487 }, {
2487 .alg = "cmac(des3_ede)", 2488 .alg = "cmac(des3_ede)",
2489 .fips_allowed = 1,
2488 .test = alg_test_hash, 2490 .test = alg_test_hash,
2489 .suite = { 2491 .suite = {
2490 .hash = { 2492 .hash = {