staging: skein: Collapses threefish module

Collapses threefish module into skein module.

Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
Reviewed-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/skein/Kconfig b/drivers/staging/skein/Kconfig
index b9172bfcdc1b8f7d8476d55bad2f0a1a0844624c..de8bdd768a7fe484b9b4db25e4ec351fdf811988 100644 (file)
--- a/drivers/staging/skein/Kconfig
+++ b/drivers/staging/skein/Kconfig
@@ -1,8 +1,8 @@
 config CRYPTO_SKEIN
        bool "Skein digest algorithm"
        depends on (X86 || UML_X86) && 64BIT && CRYPTO
-       select CRYPTO_THREEFISH
        select CRYPTO_HASH
+       select CRYPTO_ALGAPI
        help
          Skein secure hash algorithm is one of 5 finalists from the NIST SHA3
          competition.
@@ -12,21 +12,5 @@ config CRYPTO_SKEIN
 
          http://www.skein-hash.info/sites/default/files/skein1.3.pdf
 
-         for more information.  This module depends on the threefish block
-         cipher module.
-
-config CRYPTO_THREEFISH
-       bool "Threefish tweakable block cipher"
-       depends on (X86 || UML_X86) && 64BIT && CRYPTO
-       select CRYPTO_ALGAPI
-       help
-         Threefish cipher algorithm is the tweakable block cipher underneath
-         the Skein family of secure hash algorithms.  Skein is one of 5
-         finalists from the NIST SHA3 competition.
-
-         Skein is optimized for modern, 64bit processors and is highly
-         customizable.  See:
-
-         http://www.skein-hash.info/sites/default/files/skein1.3.pdf
-
-         for more information.
+         for more information. This module also contains the threefish block
+         cipher algorithm.

diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile
index a14aaddd829c9553175acfdccd058d80811819e6..4b60171c81ddcad51740d1b7eed86ad0344da76f 100644 (file)
--- a/drivers/staging/skein/Makefile
+++ b/drivers/staging/skein/Makefile
@@ -1,9 +1,8 @@
 #
 # Makefile for the skein secure hash algorithm
 #
-obj-$(CONFIG_CRYPTO_SKEIN) +=   skein.o \
-                               skein_api.o \
-                               skein_block.o
-
-obj-$(CONFIG_CRYPTO_THREEFISH) += threefish_block.o \
-                                 threefish_api.o
+obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
+                             skein_api.o \
+                             skein_block.o \
+                             threefish_block.o \
+                             threefish_api.o