aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/algboss.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:35:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:35:16 -0700
commit61f953cbaae26f930b8d937366270547e08c1290 (patch)
tree44cefef0fdd172ce4fe2083ed7695d86b76ed257 /crypto/algboss.c
parenta44a553f827f28d46130c9818dbcb95f4262b96c (diff)
parent50b6e71ae83714be509b80727dbf90fa8b1c0717 (diff)
downloadmrst-s0i3-test-61f953cbaae26f930b8d937366270547e08c1290.tar.gz
mrst-s0i3-test-61f953cbaae26f930b8d937366270547e08c1290.tar.xz
mrst-s0i3-test-61f953cbaae26f930b8d937366270547e08c1290.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 'crypto/algboss.c')
-rw-r--r--crypto/algboss.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/algboss.c b/crypto/algboss.c
index 40bd391f34d..791d194958f 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;