---

yaml --- r: 46994 b: refs/heads/master c: 9083163 h: refs/heads/master v: v3
git-mirror · Feb 6, 2007 · 1678539 · 1678539
1 parent e0a3cb2
commit 1678539
Show file tree

Hide file tree

Showing 6 changed files with 575 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91652be5d1b901673a8e926455f0ed146cfaa588
+refs/heads/master: 90831639a65592d6d3dc888dc3341f54ebf932e6
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
@@ -204,6 +204,13 @@ config CRYPTO_DES_S390
 	help
 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
+config CRYPTO_FCRYPT
+	tristate "FCrypt cipher algorithm"
+	select CRYPTO_ALGAPI
+	select CRYPTO_BLKCIPHER
+	help
+	  FCrypt algorithm used by RxRPC.
+
 config CRYPTO_BLOWFISH
 	tristate "Blowfish cipher algorithm"
 	select CRYPTO_ALGAPI

diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_CRYPTO_CBC) += cbc.o
 obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o
 obj-$(CONFIG_CRYPTO_LRW) += lrw.o
 obj-$(CONFIG_CRYPTO_DES) += des.o
+obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o