diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 17:15:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 17:15:36 +0200 |
| commit | a0be7522b25f17ac2c3964a24b88b5fe7c9404b8 (patch) | |
| tree | aba2be9ce572e19d6dc65c56adaa3398a03578c4 /crypto/eseqiv.c | |
| parent | m68knommu: fix FEC driver locking (diff) | |
| parent | [CRYPTO] cryptd: Correct kzalloc error test (diff) | |
| download | linux-a0be7522b25f17ac2c3964a24b88b5fe7c9404b8.tar.xz linux-a0be7522b25f17ac2c3964a24b88b5fe7c9404b8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] cryptd: Correct kzalloc error test
[CRYPTO] eseqiv: Fix off-by-one encryption
[CRYPTO] api: Fix scatterwalk_sg_chain
[CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
Diffstat (limited to 'crypto/eseqiv.c')
| -rw-r--r-- | crypto/eseqiv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c index b14f14e314b6..881d30910434 100644 --- a/crypto/eseqiv.c +++ b/crypto/eseqiv.c @@ -136,7 +136,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req) } ablkcipher_request_set_crypt(subreq, reqctx->src, dst, - req->creq.nbytes, req->creq.info); + req->creq.nbytes + ivsize, + req->creq.info); memcpy(req->creq.info, ctx->salt, ivsize); |