Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 53316
b: refs/heads/master
c: ebc610e
h: refs/heads/master
v: v3
  • Loading branch information
Herbert Xu committed May 2, 2007
1 parent e7ac707 commit 9b82197
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6158efc09016d3186263f6fd3a50667446ec4008
refs/heads/master: ebc610e5bc76df073221e64e86c3f7533a09ea40
42 changes: 36 additions & 6 deletions trunk/crypto/algapi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,15 +425,45 @@ int crypto_unregister_notifier(struct notifier_block *nb)
}
EXPORT_SYMBOL_GPL(crypto_unregister_notifier);

struct crypto_alg *crypto_get_attr_alg(void *param, unsigned int len,
u32 type, u32 mask)
struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb)
{
struct rtattr *rta = param;
struct rtattr *rta = tb[CRYPTOA_TYPE - 1];
struct crypto_attr_type *algt;

if (!rta)
return ERR_PTR(-ENOENT);
if (RTA_PAYLOAD(rta) < sizeof(*algt))
return ERR_PTR(-EINVAL);

algt = RTA_DATA(rta);

return algt;
}
EXPORT_SYMBOL_GPL(crypto_get_attr_type);

int crypto_check_attr_type(struct rtattr **tb, u32 type)
{
struct crypto_attr_type *algt;

algt = crypto_get_attr_type(tb);
if (IS_ERR(algt))
return PTR_ERR(algt);

if ((algt->type ^ type) & algt->mask)
return -EINVAL;

return 0;
}
EXPORT_SYMBOL_GPL(crypto_check_attr_type);

struct crypto_alg *crypto_get_attr_alg(struct rtattr **tb, u32 type, u32 mask)
{
struct rtattr *rta = tb[CRYPTOA_ALG - 1];
struct crypto_attr_alg *alga;

if (!RTA_OK(rta, len))
return ERR_PTR(-EBADR);
if (rta->rta_type != CRYPTOA_ALG || RTA_PAYLOAD(rta) < sizeof(*alga))
if (!rta)
return ERR_PTR(-ENOENT);
if (RTA_PAYLOAD(rta) < sizeof(*alga))
return ERR_PTR(-EINVAL);

alga = RTA_DATA(rta);
Expand Down
11 changes: 8 additions & 3 deletions trunk/crypto/cbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,18 @@ static void crypto_cbc_exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}

static struct crypto_instance *crypto_cbc_alloc(void *param, unsigned int len)
static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
28 changes: 18 additions & 10 deletions trunk/crypto/cryptomgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,19 @@
struct cryptomgr_param {
struct work_struct work;

struct rtattr *tb[CRYPTOA_MAX];

struct {
struct rtattr attr;
struct crypto_attr_type data;
} type;

struct {
struct rtattr attr;
struct crypto_attr_alg data;
} alg;

struct {
u32 type;
u32 mask;
char name[CRYPTO_MAX_ALG_NAME];
} larval;

Expand All @@ -53,7 +58,7 @@ static void cryptomgr_probe(struct work_struct *work)
goto err;

do {
inst = tmpl->alloc(&param->alg, sizeof(param->alg));
inst = tmpl->alloc(param->tb);
if (IS_ERR(inst))
err = PTR_ERR(inst);
else if ((err = crypto_register_instance(tmpl, inst)))
Expand All @@ -70,8 +75,8 @@ static void cryptomgr_probe(struct work_struct *work)
return;

err:
crypto_larval_error(param->larval.name, param->larval.type,
param->larval.mask);
crypto_larval_error(param->larval.name, param->type.data.type,
param->type.data.mask);
goto out;
}

Expand All @@ -82,7 +87,7 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
const char *p;
unsigned int len;

param = kmalloc(sizeof(*param), GFP_KERNEL);
param = kzalloc(sizeof(*param), GFP_KERNEL);
if (!param)
goto err;

Expand All @@ -94,7 +99,6 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
goto err_free_param;

memcpy(param->template, name, len);
param->template[len] = 0;

name = p + 1;
for (p = name; isalnum(*p) || *p == '-' || *p == '_'; p++)
Expand All @@ -104,14 +108,18 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
if (!len || *p != ')' || p[1])
goto err_free_param;

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->tb[CRYPTOA_TYPE - 1] = &param->type.attr;

param->alg.attr.rta_len = sizeof(param->alg);
param->alg.attr.rta_type = CRYPTOA_ALG;
memcpy(param->alg.data.name, name, len);
param->alg.data.name[len] = 0;
param->tb[CRYPTOA_ALG - 1] = &param->alg.attr;

memcpy(param->larval.name, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
param->larval.type = larval->alg.cra_flags;
param->larval.mask = larval->mask;

INIT_WORK(&param->work, cryptomgr_probe);
schedule_work(&param->work);
Expand Down
11 changes: 8 additions & 3 deletions trunk/crypto/ecb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,18 @@ static void crypto_ecb_exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}

static struct crypto_instance *crypto_ecb_alloc(void *param, unsigned int len)
static struct crypto_instance *crypto_ecb_alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
11 changes: 8 additions & 3 deletions trunk/crypto/hmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,18 @@ static void hmac_free(struct crypto_instance *inst)
kfree(inst);
}

static struct crypto_instance *hmac_alloc(void *param, unsigned int len)
static struct crypto_instance *hmac_alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_HASH,
CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC);
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
CRYPTO_ALG_TYPE_HASH_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
11 changes: 8 additions & 3 deletions trunk/crypto/lrw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,18 @@ static void exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}

static struct crypto_instance *alloc(void *param, unsigned int len)
static struct crypto_instance *alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
11 changes: 8 additions & 3 deletions trunk/crypto/pcbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,18 @@ static void crypto_pcbc_exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}

static struct crypto_instance *crypto_pcbc_alloc(void *param, unsigned int len)
static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
12 changes: 9 additions & 3 deletions trunk/crypto/xcbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,18 @@ static void xcbc_exit_tfm(struct crypto_tfm *tfm)
crypto_free_cipher(ctx->child);
}

static struct crypto_instance *xcbc_alloc(void *param, unsigned int len)
static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
{
struct crypto_instance *inst;
struct crypto_alg *alg;
alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC);
int err;

err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
if (err)
return ERR_PTR(err);

alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
CRYPTO_ALG_TYPE_MASK);
if (IS_ERR(alg))
return ERR_PTR(PTR_ERR(alg));

Expand Down
8 changes: 5 additions & 3 deletions trunk/include/crypto/algapi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/crypto.h>

struct module;
struct rtattr;
struct seq_file;

struct crypto_type {
Expand All @@ -38,7 +39,7 @@ struct crypto_template {
struct hlist_head instances;
struct module *module;

struct crypto_instance *(*alloc)(void *param, unsigned int len);
struct crypto_instance *(*alloc)(struct rtattr **tb);
void (*free)(struct crypto_instance *inst);

char name[CRYPTO_MAX_ALG_NAME];
Expand Down Expand Up @@ -96,8 +97,9 @@ void crypto_drop_spawn(struct crypto_spawn *spawn);
struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
u32 mask);

struct crypto_alg *crypto_get_attr_alg(void *param, unsigned int len,
u32 type, u32 mask);
struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);
int crypto_check_attr_type(struct rtattr **tb, u32 type);
struct crypto_alg *crypto_get_attr_alg(struct rtattr **tb, u32 type, u32 mask);
struct crypto_instance *crypto_alloc_instance(const char *name,
struct crypto_alg *alg);

Expand Down
9 changes: 9 additions & 0 deletions trunk/include/linux/crypto.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,21 @@ struct crypto_hash {
enum {
CRYPTOA_UNSPEC,
CRYPTOA_ALG,
CRYPTOA_TYPE,
__CRYPTOA_MAX,
};

#define CRYPTOA_MAX (__CRYPTOA_MAX - 1)

struct crypto_attr_alg {
char name[CRYPTO_MAX_ALG_NAME];
};

struct crypto_attr_type {
u32 type;
u32 mask;
};

/*
* Transform user interface.
*/
Expand Down

0 comments on commit 9b82197

Please sign in to comment.