Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3bef3a3 authored by Jarod Wilson's avatar Jarod Wilson Committed by Herbert Xu
Browse files

crypto: testmgr - Skip algs not flagged fips_allowed in fips mode 



Because all fips-allowed algorithms must be self-tested before they
can be used, they will all have entries in testmgr.c's alg_test_descs[].
Skip self-tests for any algs not flagged as fips_approved and return
-EINVAL when in fips mode.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a1915d51

crypto/testmgr.c

+8 −0
Original line number Diff line number Diff line
@@ -2308,6 +2308,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) 
		if (i < 0)

			goto notest;



		if (fips_enabled && !alg_test_descs[i].fips_allowed)

			goto non_fips_alg;



		rc = alg_test_cipher(alg_test_descs + i, driver, type, mask);

		goto test_done;

	}
@@ -2316,6 +2319,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) 
	if (i < 0)

		goto notest;



	if (fips_enabled && !alg_test_descs[i].fips_allowed)

		goto non_fips_alg;



	rc = alg_test_descs[i].test(alg_test_descs + i, driver,

				      type, mask);

test_done:
@@ -2331,5 +2337,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) 
notest:

	printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);

	return 0;

non_fips_alg:

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(alg_test);