tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 66123549 1a06a52e

+3 -3
+1 -1
crypto/tcrypt.c
··· 691 691 if (ret) 692 692 goto out; 693 693 } 694 - crypto_hash_final(desc, out); 694 + ret = crypto_hash_final(desc, out); 695 695 if (ret) 696 696 goto out; 697 697 }
+2 -2
drivers/crypto/Kconfig
··· 1 1 menu "Hardware crypto devices" 2 2 3 3 config CRYPTO_DEV_PADLOCK 4 - bool "Support for VIA PadLock ACE" 4 + tristate "Support for VIA PadLock ACE" 5 5 depends on X86_32 6 6 select CRYPTO_ALGAPI 7 - default y 7 + default m 8 8 help 9 9 Some VIA processors come with an integrated crypto engine 10 10 (so called VIA PadLock ACE, Advanced Cryptography Engine)