public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: testmgr - fix RNG return code enforcement

Browse source 
Due to the change to RNGs to always return zero in success case, the
invocation of the RNGs in the test manager must be updated as otherwise
the RNG self tests are not properly executed any more.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Alexander Bergmann <abergmann@suse.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Stephan Mueller 2015-03-10 17:00:36 +01:00 • committed by Herbert Xu
parent f42613c665
commit 19e60e1392
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crypto/testmgr.c
View file

@ -1474,11 +1474,11 @@ static int test_cprng(struct crypto_rng *tfm, struct cprng_testvec *template,
for (j = 0; j < template[i].loops; j++) { for (j = 0; j < template[i].loops; j++) {
err = crypto_rng_get_bytes(tfm, result, err = crypto_rng_get_bytes(tfm, result,
template[i].rlen); template[i].rlen);
if (err != template[i].rlen) { if (err < 0) {
printk(KERN_ERR "alg: cprng: Failed to obtain " printk(KERN_ERR "alg: cprng: Failed to obtain "
"the correct amount of random data for " "the correct amount of random data for "
"%s (requested %d, got %d)\n", algo, "%s (requested %d)\n", algo,
template[i].rlen, err); template[i].rlen);
goto out; goto out;
} }
} }
@ -1759,7 +1759,7 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr,
ret = crypto_drbg_get_bytes_addtl(drng, ret = crypto_drbg_get_bytes_addtl(drng,
buf, test->expectedlen, &addtl); buf, test->expectedlen, &addtl);
} }
if (ret <= 0) { if (ret < 0) {
printk(KERN_ERR "alg: drbg: could not obtain random data for " printk(KERN_ERR "alg: drbg: could not obtain random data for "
"driver %s\n", driver); "driver %s\n", driver);
goto outbuf; goto outbuf;
@ -1774,7 +1774,7 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr,
ret = crypto_drbg_get_bytes_addtl(drng, ret = crypto_drbg_get_bytes_addtl(drng,
buf, test->expectedlen, &addtl); buf, test->expectedlen, &addtl);
} }
if (ret <= 0) { if (ret < 0) {
printk(KERN_ERR "alg: drbg: could not obtain random data for " printk(KERN_ERR "alg: drbg: could not obtain random data for "
"driver %s\n", driver); "driver %s\n", driver);
goto outbuf; goto outbuf;