summaryrefslogtreecommitdiff
path: root/crypto/ccm.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-08-12 14:36:27 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-08-12 14:36:27 +0200
commitc37dd209adcf9a17dccab32db8a0f9fa068bf81b (patch)
tree1f7d1531e21179d1bc47d322c97286a24a23db3e /crypto/ccm.c
parentdbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c (diff)
parent0a4fa7ef65b9f8d2d8cd0db31769f3a0eb77e76f (diff)
downloadlinux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.tar.gz
linux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.zip
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM.
Diffstat (limited to 'crypto/ccm.c')
-rw-r--r--crypto/ccm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 8c24605c..380eb619 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -1009,3 +1009,4 @@ MODULE_DESCRIPTION("Counter with CBC MAC");
MODULE_ALIAS_CRYPTO("ccm_base");
MODULE_ALIAS_CRYPTO("rfc4309");
MODULE_ALIAS_CRYPTO("ccm");
+MODULE_ALIAS_CRYPTO("cbcmac");