Commit 24443a24 authored by Eric Rost's avatar Eric Rost Committed by Greg Kroah-Hartman
Browse files

staging: skein: Collapses threefish module



Collapses threefish module into skein module.

Signed-off-by: default avatarEric Rost <eric.rost@mybabylon.net>
Reviewed-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 828ebb8f
Loading
Loading
Loading
Loading
+3 −19
Original line number Diff line number Diff line
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.
+5 −6
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
#
obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
			      skein_api.o \
				skein_block.o

obj-$(CONFIG_CRYPTO_THREEFISH) += threefish_block.o \
			      skein_block.o \
			      threefish_block.o \
			      threefish_api.o