diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 23:46:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 23:46:45 -0400 |
commit | 66123549dbd75c67509c73b9d94bf7a9d2f4b286 (patch) | |
tree | 98588139d6cf56d524e5ce09d736f882f8e1bd4f | |
parent | 1a06a52ee1b0cdb65222474ba6186f3991df68b0 (diff) | |
parent | 29059d12e0c7f349aca6993acac20c5efbe13b81 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] tcrypt: Add missing error check
[CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again
-rw-r--r-- | crypto/tcrypt.c | 2 | ||||
-rw-r--r-- | drivers/crypto/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index f0aed0106adb..11f935953816 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, | |||
691 | if (ret) | 691 | if (ret) |
692 | goto out; | 692 | goto out; |
693 | } | 693 | } |
694 | crypto_hash_final(desc, out); | 694 | ret = crypto_hash_final(desc, out); |
695 | if (ret) | 695 | if (ret) |
696 | goto out; | 696 | goto out; |
697 | } | 697 | } |
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e678a33ea672..bb90cbd7ca51 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
@@ -1,10 +1,10 @@ | |||
1 | menu "Hardware crypto devices" | 1 | menu "Hardware crypto devices" |
2 | 2 | ||
3 | config CRYPTO_DEV_PADLOCK | 3 | config CRYPTO_DEV_PADLOCK |
4 | bool "Support for VIA PadLock ACE" | 4 | tristate "Support for VIA PadLock ACE" |
5 | depends on X86_32 | 5 | depends on X86_32 |
6 | select CRYPTO_ALGAPI | 6 | select CRYPTO_ALGAPI |
7 | default y | 7 | default m |
8 | help | 8 | help |
9 | Some VIA processors come with an integrated crypto engine | 9 | Some VIA processors come with an integrated crypto engine |
10 | (so called VIA PadLock ACE, Advanced Cryptography Engine) | 10 | (so called VIA PadLock ACE, Advanced Cryptography Engine) |