summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2015-03-10 19:00:36 +0300
committerJiri Slaby <jslaby@suse.cz>2015-06-10 15:05:57 +0300
commit56005f9a961016e2977e12f1c5bd69601234c77c (patch)
treefa2caea233d8d65c5a502a69a06c4e7755523e9e
parentf60b0fa8bbddde66f1d197be07120264b555c84a (diff)
downloadlinux-56005f9a961016e2977e12f1c5bd69601234c77c.tar.xz
crypto: testmgr - fix RNG return code enforcement
commit 19e60e1392d110be03d794e2286dd6cfd779cbe3 upstream. 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> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--crypto/testmgr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 93e508c39e3b..779a12dcb6a8 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1460,11 +1460,11 @@ static int test_cprng(struct crypto_rng *tfm, struct cprng_testvec *template,
for (j = 0; j < template[i].loops; j++) {
err = crypto_rng_get_bytes(tfm, result,
template[i].rlen);
- if (err != template[i].rlen) {
+ if (err < 0) {
printk(KERN_ERR "alg: cprng: Failed to obtain "
"the correct amount of random data for "
- "%s (requested %d, got %d)\n", algo,
- template[i].rlen, err);
+ "%s (requested %d)\n", algo,
+ template[i].rlen);
goto out;
}
}