Commit 3e03e792 authored May 15, 2019 by Christophe Leroy Committed by Herbert Xu May 23, 2019

crypto: talitos - fix skcipher failure due to wrong output IV



Selftests report the following:

[    2.984845] alg: skcipher: cbc-aes-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
[    2.995377] 00000000: 3d af ba 42 9d 9e b4 30 b4 22 da 80 2c 9f ac 41
[    3.032673] alg: skcipher: cbc-des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
[    3.043185] 00000000: fe dc ba 98 76 54 32 10
[    3.063238] alg: skcipher: cbc-3des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
[    3.073818] 00000000: 7d 33 88 93 0f 93 b2 42

This above dumps show that the actual output IV is indeed the input IV.
This is due to the IV not being copied back into the request.

This patch fixes that.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 89646fdd

drivers/crypto/talitos.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1637,11 +1637,15 @@ static void ablkcipher_done(struct device *dev,
		int err)
		{
		struct ablkcipher_request *areq = context;
		struct crypto_ablkcipher *cipher = crypto_ablkcipher_reqtfm(areq);
		struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);
		unsigned int ivsize = crypto_ablkcipher_ivsize(cipher);
		struct talitos_edesc *edesc;

		edesc = container_of(desc, struct talitos_edesc, desc);

		common_nonsnoop_unmap(dev, edesc, areq);
		memcpy(areq->info, ctx->iv, ivsize);

		kfree(edesc);

Admin message