Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: blake2b - rename tfm context and _setkey callback

Browse Source 
The TFM context can be renamed to a more appropriate name and the local
varaibles as well, using 'tctx' which seems to be more common than
'mctx'.

The _setkey callback was the last one without the blake2b_ prefix,
rename that too.

Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
David Sterba 2019-11-12 11:20:30 +01:00 committed by Herbert Xu
parent 0b4b5f10ac
commit c433a1a857
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crypto/blake2b_generic.c
View File

@ -137,30 +137,30 @@ static void blake2b_compress(struct blake2b_state *S,
#undef G #undef G
#undef ROUND #undef ROUND
struct digest_tfm_ctx { struct blake2b_tfm_ctx {
u8 key[BLAKE2B_KEYBYTES]; u8 key[BLAKE2B_KEYBYTES];
unsigned int keylen; unsigned int keylen;
}; };
static int digest_setkey(struct crypto_shash *tfm, const u8 *key, static int blake2b_setkey(struct crypto_shash *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct digest_tfm_ctx *mctx = crypto_shash_ctx(tfm); struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(tfm);
if (keylen == 0 || keylen > BLAKE2B_KEYBYTES) { if (keylen == 0 || keylen > BLAKE2B_KEYBYTES) {
crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
return -EINVAL; return -EINVAL;
} }
memcpy(mctx->key, key, keylen); memcpy(tctx->key, key, keylen);
mctx->keylen = keylen; tctx->keylen = keylen;
return 0; return 0;
} }
static int blake2b_init(struct shash_desc *desc) static int blake2b_init(struct shash_desc *desc)
{ {
struct digest_tfm_ctx *mctx = crypto_shash_ctx(desc->tfm); struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
struct blake2b_state *state = shash_desc_ctx(desc); struct blake2b_state *state = shash_desc_ctx(desc);
const int digestsize = crypto_shash_digestsize(desc->tfm); const int digestsize = crypto_shash_digestsize(desc->tfm);
@ -168,14 +168,14 @@ static int blake2b_init(struct shash_desc *desc)
memcpy(state->h, blake2b_IV, sizeof(state->h)); memcpy(state->h, blake2b_IV, sizeof(state->h));
/* Parameter block is all zeros except index 0, no xor for 1..7 */ /* Parameter block is all zeros except index 0, no xor for 1..7 */
state->h[0] ^= 0x01010000 | mctx->keylen << 8 | digestsize; state->h[0] ^= 0x01010000 | tctx->keylen << 8 | digestsize;
if (mctx->keylen) { if (tctx->keylen) {
/* /*
* Prefill the buffer with the key, next call to _update or * Prefill the buffer with the key, next call to _update or
* _final will process it * _final will process it
*/ */
memcpy(state->buf, mctx->key, mctx->keylen); memcpy(state->buf, tctx->key, tctx->keylen);
state->buflen = BLAKE2B_BLOCKBYTES; state->buflen = BLAKE2B_BLOCKBYTES;
} }
return 0; return 0;
@ -241,10 +241,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = BLAKE2B_BLOCKBYTES, .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
.base.cra_ctxsize = sizeof(struct digest_tfm_ctx), .base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.digestsize = BLAKE2B_160_DIGEST_SIZE, .digestsize = BLAKE2B_160_DIGEST_SIZE,
.setkey = digest_setkey, .setkey = blake2b_setkey,
.init = blake2b_init, .init = blake2b_init,
.update = blake2b_update, .update = blake2b_update,
.final = blake2b_final, .final = blake2b_final,
@ -255,10 +255,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = BLAKE2B_BLOCKBYTES, .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
.base.cra_ctxsize = sizeof(struct digest_tfm_ctx), .base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.digestsize = BLAKE2B_256_DIGEST_SIZE, .digestsize = BLAKE2B_256_DIGEST_SIZE,
.setkey = digest_setkey, .setkey = blake2b_setkey,
.init = blake2b_init, .init = blake2b_init,
.update = blake2b_update, .update = blake2b_update,
.final = blake2b_final, .final = blake2b_final,
@ -269,10 +269,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = BLAKE2B_BLOCKBYTES, .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
.base.cra_ctxsize = sizeof(struct digest_tfm_ctx), .base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.digestsize = BLAKE2B_384_DIGEST_SIZE, .digestsize = BLAKE2B_384_DIGEST_SIZE,
.setkey = digest_setkey, .setkey = blake2b_setkey,
.init = blake2b_init, .init = blake2b_init,
.update = blake2b_update, .update = blake2b_update,
.final = blake2b_final, .final = blake2b_final,
@ -283,10 +283,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = BLAKE2B_BLOCKBYTES, .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
.base.cra_ctxsize = sizeof(struct digest_tfm_ctx), .base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.digestsize = BLAKE2B_512_DIGEST_SIZE, .digestsize = BLAKE2B_512_DIGEST_SIZE,
.setkey = digest_setkey, .setkey = blake2b_setkey,
.init = blake2b_init, .init = blake2b_init,
.update = blake2b_update, .update = blake2b_update,
.final = blake2b_final, .final = blake2b_final,