mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

staging: skein: Collapses threefish module

Browse source 
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>
This commit is contained in:
Eric Rost 2014-10-24 17:29:34 -05:00 committed by Greg Kroah-Hartman
parent 828ebb8f82
commit 24443a244b
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/skein/Kconfig
View file

@ -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.

11
drivers/staging/skein/Makefile
View file

@ -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