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

Commit cb8d5c83 authored by Tero Kristo's avatar Tero Kristo Committed by Herbert Xu
Browse files

crypto: omap-sham - fix SW fallback HMAC handling for omap2/omap3 



If software fallback is used on older hardware accelerator setup (OMAP2/
OMAP3), the first block of data must be purged from the buffer. The
first block contains the pre-generated ipad value required by the HW,
but the software fallback algorithm generates its own, causing wrong
results.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5a793bca

drivers/crypto/omap-sham.c

+12 −1
Original line number Diff line number Diff line
@@ -1143,9 +1143,20 @@ static int omap_sham_final_shash(struct ahash_request *req) 
{

	struct omap_sham_ctx *tctx = crypto_tfm_ctx(req->base.tfm);

	struct omap_sham_reqctx *ctx = ahash_request_ctx(req);

	int offset = 0;



	/*

	 * If we are running HMAC on limited hardware support, skip

	 * the ipad in the beginning of the buffer if we are going for

	 * software fallback algorithm.

	 */

	if (test_bit(FLAGS_HMAC, &ctx->flags) &&

	    !test_bit(FLAGS_AUTO_XOR, &ctx->dd->flags))

		offset = get_block_size(ctx);



	return omap_sham_shash_digest(tctx->fallback, req->base.flags,

				      ctx->buffer, ctx->bufcnt, req->result);

				      ctx->buffer + offset,

				      ctx->bufcnt - offset, req->result);

}



static int omap_sham_final(struct ahash_request *req)