diff options
author | Markus Stockhausen <stockhausen@collogia.de> | 2015-01-30 09:39:34 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-02-27 04:48:47 -0500 |
commit | 2ecc1e95ec70923e642fa481ee7f7ad443798f2a (patch) | |
tree | 6c04c62d5905c9d000f9ad66770634b1f895ee75 | |
parent | c147028ccc249681ef1129fb4b09f71fe6b75715 (diff) |
crypto: ppc/sha256 - kernel config
Integrate the module into the kernel config tree.
Signed-off-by: Markus Stockhausen <stockhausen@collogia.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | arch/powerpc/crypto/Makefile | 2 | ||||
-rw-r--r-- | crypto/Kconfig | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile index 2926fb9c570a..a07e763befb5 100644 --- a/arch/powerpc/crypto/Makefile +++ b/arch/powerpc/crypto/Makefile | |||
@@ -5,5 +5,7 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o | 7 | obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o |
8 | obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o | ||
8 | 9 | ||
9 | sha1-powerpc-y := sha1-powerpc-asm.o sha1.o | 10 | sha1-powerpc-y := sha1-powerpc-asm.o sha1.o |
11 | sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o | ||
diff --git a/crypto/Kconfig b/crypto/Kconfig index 50f4da44a304..2ca8d15e0b6f 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -610,6 +610,15 @@ config CRYPTO_SHA256 | |||
610 | This code also includes SHA-224, a 224 bit hash with 112 bits | 610 | This code also includes SHA-224, a 224 bit hash with 112 bits |
611 | of security against collision attacks. | 611 | of security against collision attacks. |
612 | 612 | ||
613 | config CRYPTO_SHA256_PPC_SPE | ||
614 | tristate "SHA224 and SHA256 digest algorithm (PPC SPE)" | ||
615 | depends on PPC && SPE | ||
616 | select CRYPTO_SHA256 | ||
617 | select CRYPTO_HASH | ||
618 | help | ||
619 | SHA224 and SHA256 secure hash standard (DFIPS 180-2) | ||
620 | implemented using powerpc SPE SIMD instruction set. | ||
621 | |||
613 | config CRYPTO_SHA256_SPARC64 | 622 | config CRYPTO_SHA256_SPARC64 |
614 | tristate "SHA224 and SHA256 digest algorithm (SPARC64)" | 623 | tristate "SHA224 and SHA256 digest algorithm (SPARC64)" |
615 | depends on SPARC64 | 624 | depends on SPARC64 |