crypto: ahash - Convert to new style algorithms

This patch converts crypto_ahash to the new style.  The old ahash
algorithm type is retained until the existing ahash implementations
are also converted.  All ahash users will automatically get the
new crypto_ahash type.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2009-07-14 12:28:26 +08:00
parent 2ca33da1de
commit 88056ec346
5 changed files with 148 additions and 91 deletions

View File

@ -24,6 +24,12 @@
#include "internal.h" #include "internal.h"
static inline struct ahash_alg *crypto_ahash_alg(struct crypto_ahash *hash)
{
return container_of(crypto_hash_alg_common(hash), struct ahash_alg,
halg);
}
static int hash_walk_next(struct crypto_hash_walk *walk) static int hash_walk_next(struct crypto_hash_walk *walk)
{ {
unsigned int alignmask = walk->alignmask; unsigned int alignmask = walk->alignmask;
@ -169,30 +175,11 @@ static int ahash_nosetkey(struct crypto_ahash *tfm, const u8 *key,
return -ENOSYS; return -ENOSYS;
} }
int crypto_ahash_import(struct ahash_request *req, const u8 *in)
{
struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
struct ahash_alg *alg = crypto_ahash_alg(tfm);
memcpy(ahash_request_ctx(req), in, crypto_ahash_reqsize(tfm));
if (alg->reinit)
alg->reinit(req);
return 0;
}
EXPORT_SYMBOL_GPL(crypto_ahash_import);
static unsigned int crypto_ahash_ctxsize(struct crypto_alg *alg, u32 type,
u32 mask)
{
return alg->cra_ctxsize;
}
static int crypto_init_ahash_ops(struct crypto_tfm *tfm, u32 type, u32 mask) static int crypto_init_ahash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
{ {
struct ahash_alg *alg = &tfm->__crt_alg->cra_ahash; struct old_ahash_alg *alg = &tfm->__crt_alg->cra_ahash;
struct ahash_tfm *crt = &tfm->crt_ahash; struct crypto_ahash *crt = __crypto_ahash_cast(tfm);
struct ahash_alg *nalg = crypto_ahash_alg(crt);
if (alg->digestsize > PAGE_SIZE / 8) if (alg->digestsize > PAGE_SIZE / 8)
return -EINVAL; return -EINVAL;
@ -204,9 +191,42 @@ static int crypto_init_ahash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
crt->setkey = alg->setkey ? ahash_setkey : ahash_nosetkey; crt->setkey = alg->setkey ? ahash_setkey : ahash_nosetkey;
crt->digestsize = alg->digestsize; crt->digestsize = alg->digestsize;
nalg->setkey = alg->setkey;
nalg->halg.digestsize = alg->digestsize;
return 0; return 0;
} }
static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
{
struct crypto_ahash *hash = __crypto_ahash_cast(tfm);
struct ahash_alg *alg = crypto_ahash_alg(hash);
struct old_ahash_alg *oalg = crypto_old_ahash_alg(hash);
if (tfm->__crt_alg->cra_type != &crypto_ahash_type)
return crypto_init_shash_ops_async(tfm);
if (oalg->init)
return crypto_init_ahash_ops(tfm, 0, 0);
hash->init = alg->init;
hash->update = alg->update;
hash->final = alg->final;
hash->digest = alg->digest;
hash->setkey = alg->setkey ? ahash_setkey : ahash_nosetkey;
hash->digestsize = alg->halg.digestsize;
return 0;
}
static unsigned int crypto_ahash_extsize(struct crypto_alg *alg)
{
if (alg->cra_type == &crypto_ahash_type)
return alg->cra_ctxsize;
return sizeof(struct crypto_shash *);
}
static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)
__attribute__ ((unused)); __attribute__ ((unused));
static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)
@ -215,17 +235,29 @@ static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)
seq_printf(m, "async : %s\n", alg->cra_flags & CRYPTO_ALG_ASYNC ? seq_printf(m, "async : %s\n", alg->cra_flags & CRYPTO_ALG_ASYNC ?
"yes" : "no"); "yes" : "no");
seq_printf(m, "blocksize : %u\n", alg->cra_blocksize); seq_printf(m, "blocksize : %u\n", alg->cra_blocksize);
seq_printf(m, "digestsize : %u\n", alg->cra_ahash.digestsize); seq_printf(m, "digestsize : %u\n",
__crypto_hash_alg_common(alg)->digestsize);
} }
const struct crypto_type crypto_ahash_type = { const struct crypto_type crypto_ahash_type = {
.ctxsize = crypto_ahash_ctxsize, .extsize = crypto_ahash_extsize,
.init = crypto_init_ahash_ops, .init_tfm = crypto_ahash_init_tfm,
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_ahash_show, .show = crypto_ahash_show,
#endif #endif
.maskclear = ~CRYPTO_ALG_TYPE_MASK,
.maskset = CRYPTO_ALG_TYPE_AHASH_MASK,
.type = CRYPTO_ALG_TYPE_AHASH,
.tfmsize = offsetof(struct crypto_ahash, base),
}; };
EXPORT_SYMBOL_GPL(crypto_ahash_type); EXPORT_SYMBOL_GPL(crypto_ahash_type);
struct crypto_ahash *crypto_alloc_ahash(const char *alg_name, u32 type,
u32 mask)
{
return crypto_alloc_tfm(alg_name, &crypto_ahash_type, type, mask);
}
EXPORT_SYMBOL_GPL(crypto_alloc_ahash);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Asynchronous cryptographic hash type"); MODULE_DESCRIPTION("Asynchronous cryptographic hash type");

View File

@ -267,11 +267,11 @@ static void crypto_exit_shash_ops_async(struct crypto_tfm *tfm)
crypto_free_shash(*ctx); crypto_free_shash(*ctx);
} }
static int crypto_init_shash_ops_async(struct crypto_tfm *tfm) int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
{ {
struct crypto_alg *calg = tfm->__crt_alg; struct crypto_alg *calg = tfm->__crt_alg;
struct shash_alg *alg = __crypto_shash_alg(calg); struct shash_alg *alg = __crypto_shash_alg(calg);
struct ahash_tfm *crt = &tfm->crt_ahash; struct crypto_ahash *crt = __crypto_ahash_cast(tfm);
struct crypto_shash **ctx = crypto_tfm_ctx(tfm); struct crypto_shash **ctx = crypto_tfm_ctx(tfm);
struct crypto_shash *shash; struct crypto_shash *shash;
@ -428,8 +428,6 @@ static int crypto_init_shash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
switch (mask & CRYPTO_ALG_TYPE_MASK) { switch (mask & CRYPTO_ALG_TYPE_MASK) {
case CRYPTO_ALG_TYPE_HASH_MASK: case CRYPTO_ALG_TYPE_HASH_MASK:
return crypto_init_shash_ops_compat(tfm); return crypto_init_shash_ops_compat(tfm);
case CRYPTO_ALG_TYPE_AHASH_MASK:
return crypto_init_shash_ops_async(tfm);
} }
return -EINVAL; return -EINVAL;
@ -441,8 +439,6 @@ static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type,
switch (mask & CRYPTO_ALG_TYPE_MASK) { switch (mask & CRYPTO_ALG_TYPE_MASK) {
case CRYPTO_ALG_TYPE_HASH_MASK: case CRYPTO_ALG_TYPE_HASH_MASK:
return sizeof(struct shash_desc *); return sizeof(struct shash_desc *);
case CRYPTO_ALG_TYPE_AHASH_MASK:
return sizeof(struct crypto_shash *);
} }
return 0; return 0;

View File

@ -15,6 +15,39 @@
#include <linux/crypto.h> #include <linux/crypto.h>
struct crypto_ahash;
struct hash_alg_common {
unsigned int digestsize;
unsigned int statesize;
struct crypto_alg base;
};
struct ahash_request {
struct crypto_async_request base;
unsigned int nbytes;
struct scatterlist *src;
u8 *result;
void *__ctx[] CRYPTO_MINALIGN_ATTR;
};
struct ahash_alg {
int (*init)(struct ahash_request *req);
int (*update)(struct ahash_request *req);
int (*final)(struct ahash_request *req);
int (*finup)(struct ahash_request *req);
int (*digest)(struct ahash_request *req);
int (*export)(struct ahash_request *req, void *out);
int (*import)(struct ahash_request *req, const void *in);
int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen);
struct hash_alg_common halg;
};
struct shash_desc { struct shash_desc {
struct crypto_shash *tfm; struct crypto_shash *tfm;
u32 flags; u32 flags;
@ -37,6 +70,8 @@ struct shash_alg {
unsigned int keylen); unsigned int keylen);
unsigned int descsize; unsigned int descsize;
/* These fields must match hash_alg_common. */
unsigned int digestsize; unsigned int digestsize;
unsigned int statesize; unsigned int statesize;
@ -44,6 +79,18 @@ struct shash_alg {
}; };
struct crypto_ahash { struct crypto_ahash {
int (*init)(struct ahash_request *req);
int (*update)(struct ahash_request *req);
int (*final)(struct ahash_request *req);
int (*finup)(struct ahash_request *req);
int (*digest)(struct ahash_request *req);
int (*export)(struct ahash_request *req, void *out);
int (*import)(struct ahash_request *req, const void *in);
int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen);
unsigned int digestsize;
unsigned int reqsize;
struct crypto_tfm base; struct crypto_tfm base;
}; };
@ -54,19 +101,11 @@ struct crypto_shash {
static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm) static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm)
{ {
return (struct crypto_ahash *)tfm; return container_of(tfm, struct crypto_ahash, base);
} }
static inline struct crypto_ahash *crypto_alloc_ahash(const char *alg_name, struct crypto_ahash *crypto_alloc_ahash(const char *alg_name, u32 type,
u32 type, u32 mask) u32 mask);
{
type &= ~CRYPTO_ALG_TYPE_MASK;
mask &= ~CRYPTO_ALG_TYPE_MASK;
type |= CRYPTO_ALG_TYPE_AHASH;
mask |= CRYPTO_ALG_TYPE_AHASH_MASK;
return __crypto_ahash_cast(crypto_alloc_base(alg_name, type, mask));
}
static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm) static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm)
{ {
@ -75,7 +114,7 @@ static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm)
static inline void crypto_free_ahash(struct crypto_ahash *tfm) static inline void crypto_free_ahash(struct crypto_ahash *tfm)
{ {
crypto_free_tfm(crypto_ahash_tfm(tfm)); crypto_destroy_tfm(tfm, crypto_ahash_tfm(tfm));
} }
static inline unsigned int crypto_ahash_alignmask( static inline unsigned int crypto_ahash_alignmask(
@ -84,14 +123,26 @@ static inline unsigned int crypto_ahash_alignmask(
return crypto_tfm_alg_alignmask(crypto_ahash_tfm(tfm)); return crypto_tfm_alg_alignmask(crypto_ahash_tfm(tfm));
} }
static inline struct ahash_tfm *crypto_ahash_crt(struct crypto_ahash *tfm) static inline struct hash_alg_common *__crypto_hash_alg_common(
struct crypto_alg *alg)
{ {
return &crypto_ahash_tfm(tfm)->crt_ahash; return container_of(alg, struct hash_alg_common, base);
}
static inline struct hash_alg_common *crypto_hash_alg_common(
struct crypto_ahash *tfm)
{
return __crypto_hash_alg_common(crypto_ahash_tfm(tfm)->__crt_alg);
} }
static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm) static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm)
{ {
return crypto_ahash_crt(tfm)->digestsize; return tfm->digestsize;
}
static inline unsigned int crypto_ahash_statesize(struct crypto_ahash *tfm)
{
return crypto_hash_alg_common(tfm)->statesize;
} }
static inline u32 crypto_ahash_get_flags(struct crypto_ahash *tfm) static inline u32 crypto_ahash_get_flags(struct crypto_ahash *tfm)
@ -117,7 +168,7 @@ static inline struct crypto_ahash *crypto_ahash_reqtfm(
static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm) static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm)
{ {
return crypto_ahash_crt(tfm)->reqsize; return tfm->reqsize;
} }
static inline void *ahash_request_ctx(struct ahash_request *req) static inline void *ahash_request_ctx(struct ahash_request *req)
@ -128,41 +179,37 @@ static inline void *ahash_request_ctx(struct ahash_request *req)
static inline int crypto_ahash_setkey(struct crypto_ahash *tfm, static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
struct ahash_tfm *crt = crypto_ahash_crt(tfm); return tfm->setkey(tfm, key, keylen);
return crt->setkey(tfm, key, keylen);
} }
static inline int crypto_ahash_digest(struct ahash_request *req) static inline int crypto_ahash_digest(struct ahash_request *req)
{ {
struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); return crypto_ahash_reqtfm(req)->digest(req);
return crt->digest(req);
} }
static inline void crypto_ahash_export(struct ahash_request *req, u8 *out) static inline int crypto_ahash_export(struct ahash_request *req, void *out)
{ {
memcpy(out, ahash_request_ctx(req), return crypto_ahash_reqtfm(req)->export(req, out);
crypto_ahash_reqsize(crypto_ahash_reqtfm(req)));
} }
int crypto_ahash_import(struct ahash_request *req, const u8 *in); static inline int crypto_ahash_import(struct ahash_request *req, const void *in)
{
return crypto_ahash_reqtfm(req)->import(req, in);
}
static inline int crypto_ahash_init(struct ahash_request *req) static inline int crypto_ahash_init(struct ahash_request *req)
{ {
struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); return crypto_ahash_reqtfm(req)->init(req);
return crt->init(req);
} }
static inline int crypto_ahash_update(struct ahash_request *req) static inline int crypto_ahash_update(struct ahash_request *req)
{ {
struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); return crypto_ahash_reqtfm(req)->update(req);
return crt->update(req);
} }
static inline int crypto_ahash_final(struct ahash_request *req) static inline int crypto_ahash_final(struct ahash_request *req)
{ {
struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); return crypto_ahash_reqtfm(req)->final(req);
return crt->final(req);
} }
static inline void ahash_request_set_tfm(struct ahash_request *req, static inline void ahash_request_set_tfm(struct ahash_request *req,

View File

@ -51,6 +51,9 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc,
struct crypto_hash_walk *walk, struct crypto_hash_walk *walk,
struct scatterlist *sg, unsigned int len); struct scatterlist *sg, unsigned int len);
int crypto_register_ahash(struct ahash_alg *alg);
int crypto_unregister_ahash(struct ahash_alg *alg);
int crypto_register_shash(struct shash_alg *alg); int crypto_register_shash(struct shash_alg *alg);
int crypto_unregister_shash(struct shash_alg *alg); int crypto_unregister_shash(struct shash_alg *alg);
int shash_register_instance(struct crypto_template *tmpl, int shash_register_instance(struct crypto_template *tmpl,
@ -66,12 +69,14 @@ struct shash_alg *shash_attr_alg(struct rtattr *rta, u32 type, u32 mask);
int shash_ahash_update(struct ahash_request *req, struct shash_desc *desc); int shash_ahash_update(struct ahash_request *req, struct shash_desc *desc);
int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc); int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc);
int crypto_init_shash_ops_async(struct crypto_tfm *tfm);
static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm) static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)
{ {
return crypto_tfm_ctx(&tfm->base); return crypto_tfm_ctx(crypto_ahash_tfm(tfm));
} }
static inline struct ahash_alg *crypto_ahash_alg( static inline struct old_ahash_alg *crypto_old_ahash_alg(
struct crypto_ahash *tfm) struct crypto_ahash *tfm)
{ {
return &crypto_ahash_tfm(tfm)->__crt_alg->cra_ahash; return &crypto_ahash_tfm(tfm)->__crt_alg->cra_ahash;
@ -80,7 +85,7 @@ static inline struct ahash_alg *crypto_ahash_alg(
static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm, static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm,
unsigned int reqsize) unsigned int reqsize)
{ {
crypto_ahash_crt(tfm)->reqsize = reqsize; tfm->reqsize = reqsize;
} }
static inline int ahash_enqueue_request(struct crypto_queue *queue, static inline int ahash_enqueue_request(struct crypto_queue *queue,

View File

@ -120,6 +120,7 @@ struct crypto_rng;
struct crypto_tfm; struct crypto_tfm;
struct crypto_type; struct crypto_type;
struct aead_givcrypt_request; struct aead_givcrypt_request;
struct ahash_request;
struct skcipher_givcrypt_request; struct skcipher_givcrypt_request;
typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err); typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err);
@ -146,16 +147,6 @@ struct ablkcipher_request {
void *__ctx[] CRYPTO_MINALIGN_ATTR; void *__ctx[] CRYPTO_MINALIGN_ATTR;
}; };
struct ahash_request {
struct crypto_async_request base;
unsigned int nbytes;
struct scatterlist *src;
u8 *result;
void *__ctx[] CRYPTO_MINALIGN_ATTR;
};
/** /**
* struct aead_request - AEAD request * struct aead_request - AEAD request
* @base: Common attributes for async crypto requests * @base: Common attributes for async crypto requests
@ -220,7 +211,7 @@ struct ablkcipher_alg {
unsigned int ivsize; unsigned int ivsize;
}; };
struct ahash_alg { struct old_ahash_alg {
int (*init)(struct ahash_request *req); int (*init)(struct ahash_request *req);
int (*reinit)(struct ahash_request *req); int (*reinit)(struct ahash_request *req);
int (*update)(struct ahash_request *req); int (*update)(struct ahash_request *req);
@ -346,7 +337,7 @@ struct crypto_alg {
struct cipher_alg cipher; struct cipher_alg cipher;
struct digest_alg digest; struct digest_alg digest;
struct hash_alg hash; struct hash_alg hash;
struct ahash_alg ahash; struct old_ahash_alg ahash;
struct compress_alg compress; struct compress_alg compress;
struct rng_alg rng; struct rng_alg rng;
} cra_u; } cra_u;
@ -433,18 +424,6 @@ struct hash_tfm {
unsigned int digestsize; unsigned int digestsize;
}; };
struct ahash_tfm {
int (*init)(struct ahash_request *req);
int (*update)(struct ahash_request *req);
int (*final)(struct ahash_request *req);
int (*digest)(struct ahash_request *req);
int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen);
unsigned int digestsize;
unsigned int reqsize;
};
struct compress_tfm { struct compress_tfm {
int (*cot_compress)(struct crypto_tfm *tfm, int (*cot_compress)(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
@ -465,7 +444,6 @@ struct rng_tfm {
#define crt_blkcipher crt_u.blkcipher #define crt_blkcipher crt_u.blkcipher
#define crt_cipher crt_u.cipher #define crt_cipher crt_u.cipher
#define crt_hash crt_u.hash #define crt_hash crt_u.hash
#define crt_ahash crt_u.ahash
#define crt_compress crt_u.compress #define crt_compress crt_u.compress
#define crt_rng crt_u.rng #define crt_rng crt_u.rng
@ -479,7 +457,6 @@ struct crypto_tfm {
struct blkcipher_tfm blkcipher; struct blkcipher_tfm blkcipher;
struct cipher_tfm cipher; struct cipher_tfm cipher;
struct hash_tfm hash; struct hash_tfm hash;
struct ahash_tfm ahash;
struct compress_tfm compress; struct compress_tfm compress;
struct rng_tfm rng; struct rng_tfm rng;
} crt_u; } crt_u;