diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 18:46:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 18:46:29 +0300 |
| commit | ff2bad5f899421850f7e9bc956450e4c61b0b95d (patch) | |
| tree | 739acb3863f185a21a870dda6f50bfdc1c241044 /crypto/ccm.c | |
| parent | 78d70d48132ce4c678a95b771ffa1af4fb5a03ec (diff) | |
| parent | 516280e735b034216de97eb7ba080ec6acbfc58f (diff) | |
| download | linux-ff2bad5f899421850f7e9bc956450e4c61b0b95d.tar.xz | |
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: ccm - Fix handling of null assoc data
crypto: blkcipher - Fix WARN_ON handling in walk_done
crypto: authenc - Fix zero-length IV crash
Diffstat (limited to 'crypto/ccm.c')
| -rw-r--r-- | crypto/ccm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c index 7cf7e5a6b781..c36d654cf56a 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -266,6 +266,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, if (assoclen) { pctx->ilen = format_adata(idata, assoclen); get_data_to_compute(cipher, pctx, req->assoc, req->assoclen); + } else { + pctx->ilen = 0; } /* compute plaintext into mac */ |