summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-08-09 09:17:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-08-09 09:17:05 -0700
commite577dc152e232c78e5774e4c9b5486a04561920b (patch)
tree800bdb8d7a539b7ccf5af67a4d36b54754094e92 /include/linux
parentb678c568c561cf7e4ed40f4bcc3e85d2b50310a2 (diff)
parente2664ecbb2f26225ac6646876f2899558ffb2604 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "Fix a number of bugs in the ccp driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ccp - Ignore tag length when decrypting GCM ciphertext crypto: ccp - Add support for valid authsize values less than 16 crypto: ccp - Fix oops by properly managing allocated structures
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ccp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h
index 55cb455cfcb0..a5dfbaf2470d 100644
--- a/include/linux/ccp.h
+++ b/include/linux/ccp.h
@@ -170,6 +170,8 @@ struct ccp_aes_engine {
enum ccp_aes_mode mode;
enum ccp_aes_action action;
+ u32 authsize;
+
struct scatterlist *key;
u32 key_len; /* In bytes */