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

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 */