Commit 66123549 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1a06a52e 29059d12

crypto/tcrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/crypto/Kconfig

+2 −2
Original line number Diff line number Diff line 
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)