git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/pcxhr' into for-linus
[pandora-kernel.git]
/
crypto
/
ccm.c
diff --git
a/crypto/ccm.c
b/crypto/ccm.c
index
7cf7e5a
..
c36d654
100644
(file)
--- 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 */