summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2015-08-19 09:42:07 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-19 17:59:48 +0300
commit8f183751a8604be5aaf0ad6dedac4890bb6fa0d5 (patch)
treed2cf8d562d11aeed80bd64469a9a170079594bfe /crypto
parent66c9a04e33947191a03a1cf5103b8bf9051774df (diff)
downloadlinux-8f183751a8604be5aaf0ad6dedac4890bb6fa0d5.tar.xz
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')
-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[] = {
}
}, {
.alg = "cmac(aes)",
+ .fips_allowed = 1,
.test = alg_test_hash,
.suite = {
.hash = {
@@ -2485,6 +2486,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}, {
.alg = "cmac(des3_ede)",
+ .fips_allowed = 1,
.test = alg_test_hash,
.suite = {
.hash = {