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

Commit 19e60e13 authored by Stephan Mueller's avatar Stephan Mueller Committed by Herbert Xu
Browse files

crypto: testmgr - fix RNG return code enforcement 



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: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarAlexander Bergmann <abergmann@suse.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f42613c6

crypto/testmgr.c

+5 −5
Original line number Diff line number Diff line
@@ -1474,11 +1474,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;

			}

		}
@@ -1759,7 +1759,7 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr, 
		ret = crypto_drbg_get_bytes_addtl(drng,

			buf, test->expectedlen, &addtl);

	}

	if (ret <= 0) {

	if (ret < 0) {

		printk(KERN_ERR "alg: drbg: could not obtain random data for "

		       "driver %s\n", driver);

		goto outbuf;
@@ -1774,7 +1774,7 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr, 
		ret = crypto_drbg_get_bytes_addtl(drng,

			buf, test->expectedlen, &addtl);

	}

	if (ret <= 0) {

	if (ret < 0) {

		printk(KERN_ERR "alg: drbg: could not obtain random data for "

		       "driver %s\n", driver);

		goto outbuf;