diff options
author | Markus Stockhausen <stockhausen@collogia.de> | 2015-03-01 13:30:46 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-03-04 04:13:26 -0500 |
commit | e8e5995372ac3fc63995915dcb351f38a3560018 (patch) | |
tree | 9b1abce40fdbbc944135dab77b1d5a5808240ded | |
parent | e90508d3b0866c29146535576931356aba072a86 (diff) |
crypto: powerpc/md5 - 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 | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile index d400bf9e43c6..c6b25cba3a0c 100644 --- a/arch/powerpc/crypto/Makefile +++ b/arch/powerpc/crypto/Makefile | |||
@@ -5,11 +5,13 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o | 7 | obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o |
8 | obj-$(CONFIG_CRYPTO_MD5_PPC) += md5-ppc.o | ||
8 | obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o | 9 | obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o |
9 | obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o | 10 | obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o |
10 | obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o | 11 | obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o |
11 | 12 | ||
12 | aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes_spe_glue.o | 13 | aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes_spe_glue.o |
14 | md5-ppc-y := md5-asm.o md5_glue.o | ||
13 | sha1-powerpc-y := sha1-powerpc-asm.o sha1.o | 15 | sha1-powerpc-y := sha1-powerpc-asm.o sha1.o |
14 | sha1-ppc-spe-y := sha1-spe-asm.o sha1_spe_glue.o | 16 | sha1-ppc-spe-y := sha1-spe-asm.o sha1_spe_glue.o |
15 | sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o | 17 | sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o |
diff --git a/crypto/Kconfig b/crypto/Kconfig index e74cecadef70..6918aff74f4d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -436,6 +436,14 @@ config CRYPTO_MD5_OCTEON | |||
436 | MD5 message digest algorithm (RFC1321) implemented | 436 | MD5 message digest algorithm (RFC1321) implemented |
437 | using OCTEON crypto instructions, when available. | 437 | using OCTEON crypto instructions, when available. |
438 | 438 | ||
439 | config CRYPTO_MD5_PPC | ||
440 | tristate "MD5 digest algorithm (PPC)" | ||
441 | depends on PPC | ||
442 | select CRYPTO_HASH | ||
443 | help | ||
444 | MD5 message digest algorithm (RFC1321) implemented | ||
445 | in PPC assembler. | ||
446 | |||
439 | config CRYPTO_MD5_SPARC64 | 447 | config CRYPTO_MD5_SPARC64 |
440 | tristate "MD5 digest algorithm (SPARC64)" | 448 | tristate "MD5 digest algorithm (SPARC64)" |
441 | depends on SPARC64 | 449 | depends on SPARC64 |