summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Broz <gmazyland@gmail.com>2017-04-21 13:03:06 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2017-04-24 12:11:04 +0200
commit6175ca2ba7d2c4265d6d5590d699fbd907b24708 (patch)
tree68503065741cd8c22c116331a9cdd0e2400ded6e
parentRevert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT" (diff)
downloadlinux-6175ca2ba7d2c4265d6d5590d699fbd907b24708.tar.xz
linux-6175ca2ba7d2c4265d6d5590d699fbd907b24708.zip
crypto: testmgr - Allow ecb(cipher_null) in FIPS mode
The cipher_null is not a real cipher, FIPS mode should not restrict its use. It is used for several tests (for example in cryptsetup testsuite) and also temporarily for reencryption of not yet encrypted device in cryptsetup-reencrypt tool. Problem is easily reproducible with cryptsetup benchmark -c null Signed-off-by: Milan Broz <gmazyland@gmail.com> Acked-by: Stephan Müller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/testmgr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 8373c727752a..6b8661ee8dc0 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2910,6 +2910,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "ecb(cipher_null)",
.test = alg_test_null,
+ .fips_allowed = 1,
}, {
.alg = "ecb(des)",
.test = alg_test_skcipher,