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

Commit 8a2141fb authored by Tero Kristo's avatar Tero Kristo Committed by Greg Kroah-Hartman
Browse files

crypto: omap-sham - fix digcnt register handling with export/import 



[ Upstream commit 3faf757bad75f3fc1b2736f0431e295a073a7423 ]

Running export/import for hashes in peculiar order (mostly done by
openssl) can mess up the internal book keeping of the OMAP SHA core.
Fix by forcibly writing the correct DIGCNT back to hardware. This issue
was noticed while transitioning to openssl 1.1 support.

Fixes: 0d373d60 ("crypto: omap-sham - Add OMAP4/AM33XX SHAM Support")
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7cfd9b85

drivers/crypto/omap-sham.c

+3 −0
Original line number Diff line number Diff line
@@ -456,6 +456,9 @@ static void omap_sham_write_ctrl_omap4(struct omap_sham_dev *dd, size_t length, 
	struct omap_sham_reqctx *ctx = ahash_request_ctx(dd->req);

	u32 val, mask;



	if (likely(ctx->digcnt))

		omap_sham_write(dd, SHA_REG_DIGCNT(dd), ctx->digcnt);



	/*

	 * Setting ALGO_CONST only for the first iteration and

	 * CLOSE_HASH only for the last one. Note that flags mode bits