aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Stockhausen <stockhausen@collogia.de>2015-02-22 04:00:10 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2015-03-01 05:02:29 -0500
commit504c6143c53dfd140d42fe76d0faed1309c6d1b6 (patch)
treede1bda11d28c81f7df6b3235ebe8f8bc2233f545
parent8a28a1a89409289d9552757b95f85b50ffc26ac7 (diff)
crypto: powerpc/aes - kernel config
Integrate the module into the kernel configuration Signed-off-by: Markus Stockhausen <stockhausen@collogia.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--arch/powerpc/crypto/Makefile2
-rw-r--r--crypto/Kconfig13
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile
index a07e763befb5..1698fb94b1ae 100644
--- a/arch/powerpc/crypto/Makefile
+++ b/arch/powerpc/crypto/Makefile
@@ -4,8 +4,10 @@
4# Arch-specific CryptoAPI modules. 4# Arch-specific CryptoAPI modules.
5# 5#
6 6
7obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o
7obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o 8obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o
8obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o 9obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o
9 10
11aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes_spe_glue.o
10sha1-powerpc-y := sha1-powerpc-asm.o sha1.o 12sha1-powerpc-y := sha1-powerpc-asm.o sha1.o
11sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o 13sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 2ca8d15e0b6f..14106b267c6f 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -866,6 +866,19 @@ config CRYPTO_AES_ARM_BS
866 This implementation does not rely on any lookup tables so it is 866 This implementation does not rely on any lookup tables so it is
867 believed to be invulnerable to cache timing attacks. 867 believed to be invulnerable to cache timing attacks.
868 868
869config CRYPTO_AES_PPC_SPE
870 tristate "AES cipher algorithms (PPC SPE)"
871 depends on PPC && SPE
872 help
873 AES cipher algorithms (FIPS-197). Additionally the acceleration
874 for popular block cipher modes ECB, CBC, CTR and XTS is supported.
875 This module should only be used for low power (router) devices
876 without hardware AES acceleration (e.g. caam crypto). It reduces the
877 size of the AES tables from 16KB to 8KB + 256 bytes and mitigates
878 timining attacks. Nevertheless it might be not as secure as other
879 architecture specific assembler implementations that work on 1KB
880 tables or 256 bytes S-boxes.
881
869config CRYPTO_ANUBIS 882config CRYPTO_ANUBIS
870 tristate "Anubis cipher algorithm" 883 tristate "Anubis cipher algorithm"
871 select CRYPTO_ALGAPI 884 select CRYPTO_ALGAPI