diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 15:48:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 15:48:05 -0700 |
| commit | f796bc40cc381dfc082ae3ff70023aa70a06621f (patch) | |
| tree | 63fbab20f5408a4fca5ba667116918fc84df48e4 /crypto/eseqiv.c | |
| parent | fc376116404063553682927e3a11edc63cfd2f7e (diff) | |
| parent | ab67bc48d613b44497f614f63b283de10d43a7ed (diff) | |
| download | linux-crypto-f796bc40cc381dfc082ae3ff70023aa70a06621f.tar.gz linux-crypto-f796bc40cc381dfc082ae3ff70023aa70a06621f.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: padlock - Revert aes-all alias to aes
crypto: api - Fix algorithm module auto-loading
crypto: eseqiv - Fix IV generation for sync algorithms
crypto: ixp4xx - check firmware for crypto support
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 2a342c8e..3ca3b669 100644 --- a/crypto/eseqiv.c +++ b/crypto/eseqiv.c @@ -153,7 +153,8 @@ static int eseqiv_givencrypt(struct skcipher_givcrypt_request *req) if (err) goto out; - eseqiv_complete2(req); + if (giv != req->giv) + eseqiv_complete2(req); out: return err; |