diff options
| author | Markus Stockhausen | 2015-02-24 20:36:50 +0100 |
|---|---|---|
| committer | Herbert Xu | 2015-03-02 11:22:20 +0100 |
| commit | d9850fc529efc0c1b3b938aab6916698dcf31f01 (patch) | |
| tree | 5671bd601e765c07012eeae59a0c1f424f52b275 | |
| parent | crypto: powerpc/sha1 - glue (diff) | |
| download | kernel-qcow2-linux-d9850fc529efc0c1b3b938aab6916698dcf31f01.tar.gz kernel-qcow2-linux-d9850fc529efc0c1b3b938aab6916698dcf31f01.tar.xz kernel-qcow2-linux-d9850fc529efc0c1b3b938aab6916698dcf31f01.zip | |
crypto: powerpc/sha1 - 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 | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile index 1698fb94b1ae..d400bf9e43c6 100644 --- a/arch/powerpc/crypto/Makefile +++ b/arch/powerpc/crypto/Makefile @@ -6,8 +6,10 @@ obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o +obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes_spe_glue.o sha1-powerpc-y := sha1-powerpc-asm.o sha1.o +sha1-ppc-spe-y := sha1-spe-asm.o sha1_spe_glue.o sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o diff --git a/crypto/Kconfig b/crypto/Kconfig index 14106b267c6f..67275b7f176d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -582,6 +582,13 @@ config CRYPTO_SHA1_PPC This is the powerpc hardware accelerated implementation of the SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). +config CRYPTO_SHA1_PPC_SPE + tristate "SHA1 digest algorithm (PPC SPE)" + depends on PPC && SPE + help + SHA-1 secure hash standard (DFIPS 180-4) implemented + using powerpc SPE SIMD instruction set. + config CRYPTO_SHA1_MB tristate "SHA1 digest algorithm (x86_64 Multi-Buffer, Experimental)" depends on X86 && 64BIT |