[CRYPTO] padlock: Driver for SHA1 / SHA256 algorithms

Support for SHA1 / SHA256 algorithms in VIA C7 processors.

Signed-off-by: Michal Ludvig <michal@logix.cz>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d260c86..910c715 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -27,4 +27,18 @@ config CRYPTO_DEV_PADLOCK_AES
          If unsure say M. The compiled module will be
          called padlock-aes.ko
 
+config CRYPTO_DEV_PADLOCK_SHA
+       tristate "PadLock driver for SHA1 and SHA256 algorithms"
+       depends on CRYPTO_DEV_PADLOCK
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       default m
+       help
+         Use VIA PadLock for SHA1/SHA256 algorithms.
+
+         Available in VIA C7 and newer processors.
+
+         If unsure say M. The compiled module will be
+         called padlock-sha.ko
+
 endmenu

diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 5e7d7d5..df498c7 100644 (file)
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
+obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o

diff --cc drivers/crypto/padlock-sha.c
Simple merge