From: Tero Kristo Date: Thu, 4 Aug 2016 10:28:39 +0000 (+0300) Subject: crypto: omap-sham - fix software fallback handling X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a793bcadbe97df7823598b429c0af052e50df1c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git crypto: omap-sham - fix software fallback handling If we have processed any data with the hardware accelerator (digcnt > 0), we must complete the entire hash by using it. This is because the current hash value can't be imported to the software fallback algorithm. Otherwise we end up with wrong hash results. Signed-off-by: Tero Kristo Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index fd50005fd942..f788319f7ba7 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1163,7 +1163,7 @@ static int omap_sham_final(struct ahash_request *req) * If buffersize is less than 240, we use fallback SW encoding, * as using DMA + HW in this case doesn't provide any benefit. */ - if ((ctx->digcnt + ctx->bufcnt) < 240) + if (!ctx->digcnt && ctx->bufcnt < 240) return omap_sham_final_shash(req); else if (ctx->bufcnt) return omap_sham_enqueue(req, OP_FINAL);