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

Commit 94c7bb65 authored by Horia Geantă's avatar Horia Geantă Committed by Greg Kroah-Hartman
Browse files

crypto: tcrypt - fix ghash-generic speed test 



commit 331351f89c36bf7d03561a28b6f64fa10a9f6f3a upstream.

ghash is a keyed hash algorithm, thus setkey needs to be called.
Otherwise the following error occurs:
$ modprobe tcrypt mode=318 sec=1
testing speed of async ghash-generic (ghash-generic)
tcrypt: test  0 (   16 byte blocks,   16 bytes per update,   1 updates):
tcrypt: hashing failed ret=-126

Cc: <stable@vger.kernel.org> # 4.6+
Fixes: 0660511c ("crypto: tcrypt - Use ahash")
Tested-by: default avatarFranck Lenormand <franck.lenormand@nxp.com>
Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2ff3949

crypto/tcrypt.c

+3 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,9 @@ static void test_ahash_speed_common(const char *algo, unsigned int secs, 
			break;

		}



		if (speed[i].klen)

			crypto_ahash_setkey(tfm, tvmem[0], speed[i].klen);



		pr_info("test%3u "

			"(%5u byte blocks,%5u bytes per update,%4u updates): ",

			i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);