diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:35:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:35:16 -0700 |
| commit | 33963b38a729558a86237f0cb3dc1f3497582c77 (patch) | |
| tree | 0460284ed98305c679aaf95ff8ef7c9b79fb27d6 /crypto/algboss.c | |
| parent | 7f111f62221a8721d63a97476abd855464b61d4b (diff) | |
| parent | ee2047159f936940e33ba7c3a81e95484b162c9a (diff) | |
| download | linux-crypto-33963b38a729558a86237f0cb3dc1f3497582c77.tar.gz linux-crypto-33963b38a729558a86237f0cb3dc1f3497582c77.zip | |
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:
Revert "hwrng: n2-drv - remove casts from void*"
crypto: testmgr - Default to no tests
crypto: testmgr - Fix test disabling option
crypto: hash - Fix handling of small unaligned buffers
Diffstat (limited to '')
| -rw-r--r-- | crypto/algboss.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/algboss.c b/crypto/algboss.c index 40bd391f..791d1949 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -206,13 +206,16 @@ err: return NOTIFY_OK; } -#ifdef CONFIG_CRYPTO_MANAGER_TESTS static int cryptomgr_test(void *data) { struct crypto_test_param *param = data; u32 type = param->type; int err = 0; +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS + goto skiptest; +#endif + if (type & CRYPTO_ALG_TESTED) goto skiptest; @@ -267,7 +270,6 @@ err_put_module: err: return NOTIFY_OK; } -#endif /* CONFIG_CRYPTO_MANAGER_TESTS */ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg, void *data) @@ -275,10 +277,8 @@ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg, switch (msg) { case CRYPTO_MSG_ALG_REQUEST: return cryptomgr_schedule_probe(data); -#ifdef CONFIG_CRYPTO_MANAGER_TESTS case CRYPTO_MSG_ALG_REGISTER: return cryptomgr_schedule_test(data); -#endif } return NOTIFY_DONE; |