summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-03 09:31:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-03 09:31:49 -0800
commit2ce3f2b3b1a646d82b86991c424b5121e0322cb8 (patch)
tree44f30924b3154e50ae709974d48ef0be5ef027da /drivers/crypto
parentae942ae71934fddd0639160c24f6efa703d5784e (diff)
parentf8f54e190ddb4ed697036b60f5e2ae6dd45b801c (diff)
downloadlinux-stable-2ce3f2b3b1a646d82b86991c424b5121e0322cb8.tar.gz
linux-stable-2ce3f2b3b1a646d82b86991c424b5121e0322cb8.tar.bz2
linux-stable-2ce3f2b3b1a646d82b86991c424b5121e0322cb8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull from Herbert Xu: "This push fixes a bug in mv_cesa that causes all hash operations that supply data on a final operation to fail." * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: mv_cesa - fix final callback not ignoring input data
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/mv_cesa.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 597235a2f8f9..0d40cf66b3cc 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -714,6 +714,7 @@ static int mv_hash_final(struct ahash_request *req)
{
struct mv_req_hash_ctx *ctx = ahash_request_ctx(req);
+ ahash_request_set_crypt(req, NULL, req->result, 0);
mv_update_hash_req_ctx(ctx, 1, 0);
return mv_handle_req(&req->base);
}