dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Linus Torvalds 2007-05-18 20:46:45 -07:00
parent 1a06a52ee1 29059d12e0
commit 66123549db
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/tcrypt.c
View File

@ -691,7 +691,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
if (ret) if (ret)
goto out; goto out;
} }
crypto_hash_final(desc, out); ret = crypto_hash_final(desc, out);
if (ret) if (ret)
goto out; goto out;
} }

4
drivers/crypto/Kconfig
View File

@ -1,10 +1,10 @@
menu "Hardware crypto devices" menu "Hardware crypto devices"
config CRYPTO_DEV_PADLOCK config CRYPTO_DEV_PADLOCK
bool "Support for VIA PadLock ACE" tristate "Support for VIA PadLock ACE"
depends on X86_32 depends on X86_32
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
default y default m
help help
Some VIA processors come with an integrated crypto engine Some VIA processors come with an integrated crypto engine
(so called VIA PadLock ACE, Advanced Cryptography Engine) (so called VIA PadLock ACE, Advanced Cryptography Engine)