headers: remove sched.h from interrupt.h

[safe/jmp/linux-2.6] / crypto / algboss.c

diff --git a/crypto/algboss.c b/crypto/algboss.c
index 2662ac0..412241c 100644 (file)
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <linux/crypto.h>
+#include <crypto/internal/aead.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -45,6 +45,15 @@ struct cryptomgr_param {
 
        char larval[CRYPTO_MAX_ALG_NAME];
        char template[CRYPTO_MAX_ALG_NAME];
+
+       u32 otype;
+       u32 omask;
+};
+
+struct crypto_test_param {
+       char driver[CRYPTO_MAX_ALG_NAME];
+       char alg[CRYPTO_MAX_ALG_NAME];
+       u32 type;
 };
 
 static int cryptomgr_probe(void *data)
@@ -59,6 +68,11 @@ static int cryptomgr_probe(void *data)
                goto err;
 
        do {
+               if (tmpl->create) {
+                       err = tmpl->create(tmpl, param->tb);
+                       continue;
+               }
+
                inst = tmpl->alloc(param->tb);
                if (IS_ERR(inst))
                        err = PTR_ERR(inst);
@@ -76,8 +90,7 @@ out:
        module_put_and_exit(0);
 
 err:
-       crypto_larval_error(param->larval, param->type.data.type,
-                           param->type.data.mask);
+       crypto_larval_error(param->larval, param->otype, param->omask);
        goto out;
 }
 
@@ -169,13 +182,77 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 
        param->type.attr.rta_len = sizeof(param->type);
        param->type.attr.rta_type = CRYPTOA_TYPE;
-       param->type.data.type = larval->alg.cra_flags;
-       param->type.data.mask = larval->mask;
+       param->type.data.type = larval->alg.cra_flags & ~CRYPTO_ALG_TESTED;
+       param->type.data.mask = larval->mask & ~CRYPTO_ALG_TESTED;
        param->tb[0] = &param->type.attr;
 
+       param->otype = larval->alg.cra_flags;
+       param->omask = larval->mask;
+
        memcpy(param->larval, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
 
-       thread = kthread_run(cryptomgr_probe, param, "cryptomgr");
+       thread = kthread_run(cryptomgr_probe, param, "cryptomgr_probe");
+       if (IS_ERR(thread))
+               goto err_free_param;
+
+       return NOTIFY_STOP;
+
+err_free_param:
+       kfree(param);
+err_put_module:
+       module_put(THIS_MODULE);
+err:
+       return NOTIFY_OK;
+}
+
+static int cryptomgr_test(void *data)
+{
+       struct crypto_test_param *param = data;
+       u32 type = param->type;
+       int err = 0;
+
+       if (type & CRYPTO_ALG_TESTED)
+               goto skiptest;
+
+       err = alg_test(param->driver, param->alg, type, CRYPTO_ALG_TESTED);
+
+skiptest:
+       crypto_alg_tested(param->driver, err);
+
+       kfree(param);
+       module_put_and_exit(0);
+}
+
+static int cryptomgr_schedule_test(struct crypto_alg *alg)
+{
+       struct task_struct *thread;
+       struct crypto_test_param *param;
+       u32 type;
+
+       if (!try_module_get(THIS_MODULE))
+               goto err;
+
+       param = kzalloc(sizeof(*param), GFP_KERNEL);
+       if (!param)
+               goto err_put_module;
+
+       memcpy(param->driver, alg->cra_driver_name, sizeof(param->driver));
+       memcpy(param->alg, alg->cra_name, sizeof(param->alg));
+       type = alg->cra_flags;
+
+       /* This piece of crap needs to disappear into per-type test hooks. */
+       if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+              CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+            ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+             CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
+                                         alg->cra_ablkcipher.ivsize)) ||
+           (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+            alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+               type |= CRYPTO_ALG_TESTED;
+
+       param->type = type;
+
+       thread = kthread_run(cryptomgr_test, param, "cryptomgr_test");
        if (IS_ERR(thread))
                goto err_free_param;
 
@@ -195,6 +272,8 @@ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,
        switch (msg) {
        case CRYPTO_MSG_ALG_REQUEST:
                return cryptomgr_schedule_probe(data);
+       case CRYPTO_MSG_ALG_REGISTER:
+               return cryptomgr_schedule_test(data);
        }
 
        return NOTIFY_DONE;
@@ -206,29 +285,13 @@ static struct notifier_block cryptomgr_notifier = {
 
 static int __init cryptomgr_init(void)
 {
-       int err;
-
-       err = testmgr_init();
-       if (err)
-               return err;
-
-       err = crypto_register_notifier(&cryptomgr_notifier);
-       if (err)
-               goto free_testmgr;
-
-       return 0;
-
-free_testmgr:
-       testmgr_exit();
-       return err;
+       return crypto_register_notifier(&cryptomgr_notifier);
 }
 
 static void __exit cryptomgr_exit(void)
 {
        int err = crypto_unregister_notifier(&cryptomgr_notifier);
        BUG_ON(err);
-
-       testmgr_exit();
 }
 
 subsys_initcall(cryptomgr_init);