---

yaml --- r: 75988 b: refs/heads/master c: 4a49b49 h: refs/heads/master v: v3
git-mirror · Jan 10, 2008 · 3be6cde · 3be6cde
1 parent c2397fb
commit 3be6cde
Show file tree

Hide file tree

Showing 4 changed files with 898 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d29ce988aeb459203c74f14747f4f77e1829ef78
+refs/heads/master: 4a49b499dfa0c9e42be6d6fdd771f3434c776278
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
@@ -220,6 +220,13 @@ config CRYPTO_GCM
 	  Support for Galois/Counter Mode (GCM) and Galois Message
 	  Authentication Code (GMAC). Required for IPSec.
 
+config CRYPTO_CCM
+	tristate "CCM support"
+	select CRYPTO_CTR
+	select CRYPTO_AEAD
+	help
+	  Support for Counter with CBC MAC. Required for IPsec.
+
 config CRYPTO_CRYPTD
 	tristate "Software async crypto daemon"
 	select CRYPTO_BLKCIPHER

diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_CRYPTO_LRW) += lrw.o
 obj-$(CONFIG_CRYPTO_XTS) += xts.o
 obj-$(CONFIG_CRYPTO_CTR) += ctr.o
 obj-$(CONFIG_CRYPTO_GCM) += gcm.o
+obj-$(CONFIG_CRYPTO_CCM) += ccm.o
 obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
 obj-$(CONFIG_CRYPTO_DES) += des_generic.o
 obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o