---

yaml --- r: 34199 b: refs/heads/master c: 2729bb4 h: refs/heads/master i: 34197: 359422c 34195: 45d3d01 34191: e7482e2 v: v3
git-mirror · Sep 21, 2006 · f6c843c · f6c843c
1 parent 320d8cd
commit f6c843c
Show file tree

Hide file tree

Showing 6 changed files with 778 additions and 698 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 799111020c66c41aef621a3b53ad112543754124
+refs/heads/master: 2729bb427f686e47970406d6bde6b11892885f29
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
@@ -131,6 +131,7 @@ config CRYPTO_BLOWFISH
 config CRYPTO_TWOFISH
 	tristate "Twofish cipher algorithm"
 	depends on CRYPTO
+	select CRYPTO_TWOFISH_COMMON
 	help
 	  Twofish cipher algorithm.
 
@@ -142,6 +143,13 @@ config CRYPTO_TWOFISH
 	  See also:
 	  <http://www.schneier.com/twofish.html>
 
+config CRYPTO_TWOFISH_COMMON
+	tristate
+	depends on CRYPTO
+	help
+	  Common parts of the Twofish cipher algorithm shared by the
+	  generic c and the assembler implementations.
+
 config CRYPTO_SERPENT
 	tristate "Serpent cipher algorithm"
 	depends on CRYPTO

diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o
 obj-$(CONFIG_CRYPTO_DES) += des.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
+obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
 obj-$(CONFIG_CRYPTO_AES) += aes.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o