summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-06-28 13:09:07 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2017-06-28 16:18:58 +0200
commitbcf741cb779283081db47853264cc94854e7ad83 (patch)
tree6ceabd58e1bcf609aca38bcd54f45e4e2fc964aa /crypto
parentcrypto: ccp - Release locks before returning (diff)
downloadlinux-bcf741cb779283081db47853264cc94854e7ad83.tar.xz
linux-bcf741cb779283081db47853264cc94854e7ad83.zip
crypto: testmgr - Reenable sha1/aes in FIPS mode
The combination of sha1 and aes was disabled in FIPS Mode accidentally. This patch reenables it. Fixes: 284a0f6e87b0 ("crypto: testmgr - Disable fips-allowed for...") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Stephan Müller <smueller@chronox.de>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/testmgr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 32087a7acbfb..7125ba3880af 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2366,6 +2366,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha1),cbc(aes))",
.test = alg_test_aead,
+ .fips_allowed = 1,
.suite = {
.aead = {
.enc = __VECS(hmac_sha1_aes_cbc_enc_tv_temp)