From d158325e407864793c5b0fbc85c74702753333b9 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 18 May 2007 13:17:22 +1000 Subject: [PATCH 1/2] [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again Turning it into a boolean was unnecessary and caused ALGAPI to be pinned down as a boolean to. This patch makes it a tristate again. Signed-off-by: Herbert Xu --- drivers/crypto/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e678a33ea67..bb90cbd7ca5 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -1,10 +1,10 @@ menu "Hardware crypto devices" config CRYPTO_DEV_PADLOCK - bool "Support for VIA PadLock ACE" + tristate "Support for VIA PadLock ACE" depends on X86_32 select CRYPTO_ALGAPI - default y + default m help Some VIA processors come with an integrated crypto engine (so called VIA PadLock ACE, Advanced Cryptography Engine) From 29059d12e0c7f349aca6993acac20c5efbe13b81 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 18 May 2007 16:25:19 +1000 Subject: [PATCH 2/2] [CRYPTO] tcrypt: Add missing error check The return value of crypto_hash_final isn't checked in test_hash_cycles. This patch corrects this. Thanks to Eric Sesterhenn for reporting this. Signed-off-by: Herbert Xu --- crypto/tcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index f0aed0106ad..11f93595381 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -691,7 +691,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, if (ret) goto out; } - crypto_hash_final(desc, out); + ret = crypto_hash_final(desc, out); if (ret) goto out; }