Commit 2ce3f2b3 authored by Linus Torvalds's avatar Linus Torvalds

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
parents ae942ae7 f8f54e19
...@@ -714,6 +714,7 @@ static int mv_hash_final(struct ahash_request *req) ...@@ -714,6 +714,7 @@ static int mv_hash_final(struct ahash_request *req)
{ {
struct mv_req_hash_ctx *ctx = ahash_request_ctx(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); mv_update_hash_req_ctx(ctx, 1, 0);
return mv_handle_req(&req->base); return mv_handle_req(&req->base);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment