diff --git a/[refs] b/[refs]
index c606d66102a8..4683307d7a47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bac1b5c4696f217afeac5b29874a337bc39da717
+refs/heads/master: 516280e735b034216de97eb7ba080ec6acbfc58f
diff --git a/trunk/crypto/ccm.c b/trunk/crypto/ccm.c
index 7cf7e5a6b781..c36d654cf56a 100644
--- a/trunk/crypto/ccm.c
+++ b/trunk/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 */