diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 18:31:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 18:31:49 +0100 |
| commit | 2ce3f2b3b1a646d82b86991c424b5121e0322cb8 (patch) | |
| tree | 44f30924b3154e50ae709974d48ef0be5ef027da /drivers/crypto | |
| parent | vfs: export full_name_hash() function to modules (diff) | |
| parent | crypto: mv_cesa - fix final callback not ignoring input data (diff) | |
| download | linux-2ce3f2b3b1a646d82b86991c424b5121e0322cb8.tar.xz linux-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.c | 1 |
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); } |