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: Jarod Wilson <jarod@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
a1915d51e8
commit
a3bef3a31a
@ -2308,6 +2308,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
|
|||||||
if (i < 0)
|
if (i < 0)
|
||||||
goto notest;
|
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);
|
rc = alg_test_cipher(alg_test_descs + i, driver, type, mask);
|
||||||
goto test_done;
|
goto test_done;
|
||||||
}
|
}
|
||||||
@ -2316,6 +2319,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
|
|||||||
if (i < 0)
|
if (i < 0)
|
||||||
goto notest;
|
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,
|
rc = alg_test_descs[i].test(alg_test_descs + i, driver,
|
||||||
type, mask);
|
type, mask);
|
||||||
test_done:
|
test_done:
|
||||||
@ -2331,5 +2337,7 @@ test_done:
|
|||||||
notest:
|
notest:
|
||||||
printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);
|
printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);
|
||||||
return 0;
|
return 0;
|
||||||
|
non_fips_alg:
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(alg_test);
|
EXPORT_SYMBOL_GPL(alg_test);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user