diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-11-04 19:00:22 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-11-04 19:48:37 +0100 |
| commit | 90246e79af062fcbb8c3728a5f29cb19b3468f59 (patch) | |
| tree | 87b258c5535a98754c682b0f0eef8fba0a415438 /crypto/shash.c | |
| parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-90246e79af062fcbb8c3728a5f29cb19b3468f59.tar.xz linux-90246e79af062fcbb8c3728a5f29cb19b3468f59.zip | |
crypto: hash - Fix async import on shash algorithm
The function shash_async_import did not initialise the descriptor
correctly prior to calling the underlying shash import function.
This patch adds the required initialisation.
Reported-by: Miloslav Trmac <mitr@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/shash.c')
| -rw-r--r-- | crypto/shash.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 22fd9433141f..76f74b963151 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -310,7 +310,13 @@ static int shash_async_export(struct ahash_request *req, void *out) static int shash_async_import(struct ahash_request *req, const void *in) { - return crypto_shash_import(ahash_request_ctx(req), in); + struct crypto_shash **ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req)); + struct shash_desc *desc = ahash_request_ctx(req); + + desc->tfm = *ctx; + desc->flags = req->base.flags; + + return crypto_shash_import(desc, in); } static void crypto_exit_shash_ops_async(struct crypto_tfm *tfm) |