Skip to content

L
linux-davinci
Commit faccc4bb authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

crypto: crc32c - Switch to shash 

This patch changes crc32c to the new shash interface.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5f7082ed
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 132 deletions
crypto/crc32c.c
View file @ faccc4bb
...@@ -25,20 +25,26 @@ ...@@ -25,20 +25,26 @@
#define CHKSUM_DIGEST_SIZE 4 #define CHKSUM_DIGEST_SIZE 4
struct chksum_ctx { struct chksum_ctx {
u32 crc;
u32 key; u32 key;
}; };
struct chksum_desc_ctx {
u32 crc;
};
/* /*
* Steps through buffer one byte at at time, calculates reflected * Steps through buffer one byte at at time, calculates reflected
* crc using table. * crc using table.
*/ */
static void chksum_init(struct crypto_tfm *tfm) static int chksum_init(struct shash_desc *desc)
{ {
struct chksum_ctx *mctx = crypto_tfm_ctx(tfm); struct chksum_ctx *mctx = crypto_shash_ctx(desc->tfm);
struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
ctx->crc = mctx->key;
mctx->crc = mctx->key; return 0;
} }
/* /*
...@@ -46,180 +52,95 @@ static void chksum_init(struct crypto_tfm *tfm) ...@@ -46,180 +52,95 @@ static void chksum_init(struct crypto_tfm *tfm)
* If your algorithm starts with ~0, then XOR with ~0 before you set * If your algorithm starts with ~0, then XOR with ~0 before you set
* the seed. * the seed.
*/ */
static int chksum_setkey(struct crypto_tfm *tfm, const u8 *key, static int chksum_setkey(struct crypto_shash *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct chksum_ctx *mctx = crypto_tfm_ctx(tfm); struct chksum_ctx *mctx = crypto_shash_ctx(tfm);
if (keylen != sizeof(mctx->crc)) { if (keylen != sizeof(mctx->key)) {
tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
return -EINVAL; return -EINVAL;
} }
mctx->key = le32_to_cpu(*(__le32 *)key); mctx->key = le32_to_cpu(*(__le32 *)key);
return 0; return 0;
} }
static void chksum_update(struct crypto_tfm *tfm, const u8 *data, static int chksum_update(struct shash_desc *desc, const u8 *data,
unsigned int length) unsigned int length)
{ {
struct chksum_ctx *mctx = crypto_tfm_ctx(tfm); struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
mctx->crc = crc32c(mctx->crc, data, length); ctx->crc = crc32c(ctx->crc, data, length);
}
static void chksum_final(struct crypto_tfm *tfm, u8 *out)
{
struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
*(__le32 *)out = ~cpu_to_le32(mctx->crc);
}
static int crc32c_cra_init_old(struct crypto_tfm *tfm)
{
struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
mctx->key = ~0;
return 0; return 0;
} }
static struct crypto_alg old_alg = { static int chksum_final(struct shash_desc *desc, u8 *out)
.cra_name = "crc32c",
.cra_flags = CRYPTO_ALG_TYPE_DIGEST,
.cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct chksum_ctx),
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(old_alg.cra_list),
.cra_init = crc32c_cra_init_old,
.cra_u = {
.digest = {
.dia_digestsize= CHKSUM_DIGEST_SIZE,
.dia_setkey = chksum_setkey,
.dia_init = chksum_init,
.dia_update = chksum_update,
.dia_final = chksum_final
}
}
};
/*
* Setting the seed allows arbitrary accumulators and flexible XOR policy
* If your algorithm starts with ~0, then XOR with ~0 before you set
* the seed.
*/
static int crc32c_setkey(struct crypto_ahash *hash, const u8 *key,
unsigned int keylen)
{ {
u32 *mctx = crypto_ahash_ctx(hash); struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
if (keylen != sizeof(u32)) { *(__le32 *)out = ~cpu_to_le32p(&ctx->crc);
crypto_ahash_set_flags(hash, CRYPTO_TFM_RES_BAD_KEY_LEN);
return -EINVAL;
}
*mctx = le32_to_cpup((__le32 *)key);
return 0; return 0;
} }
static int crc32c_init(struct ahash_request *req) static int __chksum_finup(u32 *crcp, const u8 *data, unsigned int len, u8 *out)
{ {
u32 *mctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req)); *(__le32 *)out = ~cpu_to_le32(crc32c(*crcp, data, len));
u32 *crcp = ahash_request_ctx(req);
*crcp = *mctx;
return 0; return 0;
} }
static int crc32c_update(struct ahash_request *req) static int chksum_finup(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out)
{ {
struct crypto_hash_walk walk; struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
u32 *crcp = ahash_request_ctx(req);
u32 crc = *crcp;
int nbytes;
for (nbytes = crypto_hash_walk_first(req, &walk); nbytes;
nbytes = crypto_hash_walk_done(&walk, 0))
crc = crc32c(crc, walk.data, nbytes);
*crcp = crc; return __chksum_finup(&ctx->crc, data, len, out);
return 0;
} }
static int crc32c_final(struct ahash_request *req) static int chksum_digest(struct shash_desc *desc, const u8 *data,
unsigned int length, u8 *out)
{ {
u32 *crcp = ahash_request_ctx(req); struct chksum_ctx *mctx = crypto_shash_ctx(desc->tfm);
*(__le32 *)req->result = ~cpu_to_le32p(crcp);
return 0;
}
static int crc32c_digest(struct ahash_request *req) return __chksum_finup(&mctx->key, data, length, out);
{
struct crypto_hash_walk walk;
u32 *mctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));
u32 crc = *mctx;
int nbytes;
for (nbytes = crypto_hash_walk_first(req, &walk); nbytes;
nbytes = crypto_hash_walk_done(&walk, 0))
crc = crc32c(crc, walk.data, nbytes);
*(__le32 *)req->result = ~cpu_to_le32(crc);
return 0;
} }
static int crc32c_cra_init(struct crypto_tfm *tfm) static int crc32c_cra_init(struct crypto_tfm *tfm)
{ {
u32 *key = crypto_tfm_ctx(tfm); struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
*key = ~0;
tfm->crt_ahash.reqsize = sizeof(u32);
mctx->key = ~0;
return 0; return 0;
} }
static struct crypto_alg alg = { static struct shash_alg alg = {
.cra_name = "crc32c", .digestsize = CHKSUM_DIGEST_SIZE,
.cra_driver_name = "crc32c-generic", .setkey = chksum_setkey,
.cra_priority = 100, .init = chksum_init,
.cra_flags = CRYPTO_ALG_TYPE_AHASH, .update = chksum_update,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .final = chksum_final,
.cra_alignmask = 3, .finup = chksum_finup,
.cra_ctxsize = sizeof(u32), .digest = chksum_digest,
.cra_module = THIS_MODULE, .descsize = sizeof(struct chksum_desc_ctx),
.cra_list = LIST_HEAD_INIT(alg.cra_list), .base = {
.cra_init = crc32c_cra_init, .cra_name = "crc32c",
.cra_type = &crypto_ahash_type, .cra_driver_name = "crc32c-generic",
.cra_u = { .cra_priority = 100,
.ahash = { .cra_blocksize = CHKSUM_BLOCK_SIZE,
.digestsize = CHKSUM_DIGEST_SIZE, .cra_alignmask = 3,
.setkey = crc32c_setkey, .cra_ctxsize = sizeof(struct chksum_ctx),
.init = crc32c_init, .cra_module = THIS_MODULE,
.update = crc32c_update, .cra_init = crc32c_cra_init,
.final = crc32c_final,
.digest = crc32c_digest,
}
} }
}; };
static int __init crc32c_mod_init(void) static int __init crc32c_mod_init(void)
{ {
int err; return crypto_register_shash(&alg);
err = crypto_register_alg(&old_alg);
if (err)
return err;
err = crypto_register_alg(&alg);
if (err)
crypto_unregister_alg(&old_alg);
return err;
} }
static void __exit crc32c_mod_fini(void) static void __exit crc32c_mod_fini(void)
{ {
crypto_unregister_alg(&alg); crypto_unregister_shash(&alg);
crypto_unregister_alg(&old_alg);
} }
module_init(crc32c_mod_init); module_init(crc32c_mod_init);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment