mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-27 12:21:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

crypto: hash - Add export_core and import_core hooks

Browse Source 
Add export_core and import_core hooks.  These are intended to be
used by algorithms which are wrappers around block-only algorithms,
but are not themselves block-only, e.g., hmac.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2025-05-15 13:54:35 +08:00
parent cd5a4d5306
commit c6a12f394c
4 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/ahash.c
View File

@@ -704,7 +704,7 @@ int crypto_ahash_export_core(struct ahash_request *req, void *out)
if (likely(tfm->using_shash))
return crypto_shash_export_core(ahash_request_ctx(req), out);
return crypto_ahash_alg(tfm)->export(req, out);
return crypto_ahash_alg(tfm)->export_core(req, out);
}
EXPORT_SYMBOL_GPL(crypto_ahash_export_core);
@@ -727,7 +727,7 @@ int crypto_ahash_import_core(struct ahash_request *req, const void *in)
in);
if (crypto_ahash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
return -ENOKEY;
return crypto_ahash_alg(tfm)->import(req, in);
return crypto_ahash_alg(tfm)->import_core(req, in);
}
EXPORT_SYMBOL_GPL(crypto_ahash_import_core);
@@ -739,7 +739,7 @@ int crypto_ahash_import(struct ahash_request *req, const void *in)
return crypto_shash_import(prepare_shash_desc(req, tfm), in);
if (crypto_ahash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
return -ENOKEY;
return crypto_ahash_import_core(req, in);
return crypto_ahash_alg(tfm)->import(req, in);
}
EXPORT_SYMBOL_GPL(crypto_ahash_import);
@@ -971,6 +971,16 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash)
}
EXPORT_SYMBOL_GPL(crypto_clone_ahash);
static int ahash_default_export_core(struct ahash_request *req, void *out)
{
return -ENOSYS;
}
static int ahash_default_import_core(struct ahash_request *req, const void *in)
{
return -ENOSYS;
}
static int ahash_prepare_alg(struct ahash_alg *alg)
{
struct crypto_alg *base = &alg->halg.base;
@@ -996,6 +1006,12 @@ static int ahash_prepare_alg(struct ahash_alg *alg)
if (!alg->setkey)
alg->setkey = ahash_nosetkey;
if (!alg->export_core || !alg->import_core) {
alg->export_core = ahash_default_export_core;
alg->import_core = ahash_default_import_core;
base->cra_flags |= CRYPTO_AHASH_ALG_NO_EXPORT_CORE;
}
return 0;
}

44
crypto/shash.c
View File

@@ -203,9 +203,10 @@ int crypto_shash_tfm_digest(struct crypto_shash *tfm, const u8 *data,
}
EXPORT_SYMBOL_GPL(crypto_shash_tfm_digest);
int crypto_shash_export_core(struct shash_desc *desc, void *out)
static int __crypto_shash_export(struct shash_desc *desc, void *out,
int (*export)(struct shash_desc *desc,
void *out))
{
int (*export)(struct shash_desc *desc, void *out);
struct crypto_shash *tfm = desc->tfm;
u8 *buf = shash_desc_ctx(desc);
unsigned int plen, ss;
@@ -214,7 +215,6 @@ int crypto_shash_export_core(struct shash_desc *desc, void *out)
ss = crypto_shash_statesize(tfm);
if (crypto_shash_block_only(tfm))
ss -= plen;
export = crypto_shash_alg(tfm)->export;
if (!export) {
memcpy(out, buf, ss);
return 0;
@@ -222,6 +222,12 @@ int crypto_shash_export_core(struct shash_desc *desc, void *out)
return export(desc, out);
}
int crypto_shash_export_core(struct shash_desc *desc, void *out)
{
return __crypto_shash_export(desc, out,
crypto_shash_alg(desc->tfm)->export_core);
}
EXPORT_SYMBOL_GPL(crypto_shash_export_core);
int crypto_shash_export(struct shash_desc *desc, void *out)
@@ -236,13 +242,14 @@ int crypto_shash_export(struct shash_desc *desc, void *out)
memcpy(out + ss - plen, buf + descsize - plen, plen);
}
return crypto_shash_export_core(desc, out);
return __crypto_shash_export(desc, out, crypto_shash_alg(tfm)->export);
}
EXPORT_SYMBOL_GPL(crypto_shash_export);
int crypto_shash_import_core(struct shash_desc *desc, const void *in)
static int __crypto_shash_import(struct shash_desc *desc, const void *in,
int (*import)(struct shash_desc *desc,
const void *in))
{
int (*import)(struct shash_desc *desc, const void *in);
struct crypto_shash *tfm = desc->tfm;
unsigned int descsize, plen, ss;
u8 *buf = shash_desc_ctx(desc);
@@ -256,7 +263,6 @@ int crypto_shash_import_core(struct shash_desc *desc, const void *in)
buf[descsize - 1] = 0;
if (crypto_shash_block_only(tfm))
ss -= plen;
import = crypto_shash_alg(tfm)->import;
if (!import) {
memcpy(buf, in, ss);
return 0;
@@ -264,6 +270,12 @@ int crypto_shash_import_core(struct shash_desc *desc, const void *in)
return import(desc, in);
}
int crypto_shash_import_core(struct shash_desc *desc, const void *in)
{
return __crypto_shash_import(desc, in,
crypto_shash_alg(desc->tfm)->import_core);
}
EXPORT_SYMBOL_GPL(crypto_shash_import_core);
int crypto_shash_import(struct shash_desc *desc, const void *in)
@@ -271,7 +283,7 @@ int crypto_shash_import(struct shash_desc *desc, const void *in)
struct crypto_shash *tfm = desc->tfm;
int err;
err = crypto_shash_import_core(desc, in);
err = __crypto_shash_import(desc, in, crypto_shash_alg(tfm)->import);
if (crypto_shash_block_only(tfm)) {
unsigned int plen = crypto_shash_blocksize(tfm) + 1;
unsigned int descsize = crypto_shash_descsize(tfm);
@@ -436,6 +448,16 @@ int hash_prepare_alg(struct hash_alg_common *alg)
return 0;
}
static int shash_default_export_core(struct shash_desc *desc, void *out)
{
return -ENOSYS;
}
static int shash_default_import_core(struct shash_desc *desc, const void *in)
{
return -ENOSYS;
}
static int shash_prepare_alg(struct shash_alg *alg)
{
struct crypto_alg *base = &alg->halg.base;
@@ -476,6 +498,12 @@ static int shash_prepare_alg(struct shash_alg *alg)
BUILD_BUG_ON(MAX_ALGAPI_BLOCKSIZE >= 256);
alg->descsize += base->cra_blocksize + 1;
alg->statesize += base->cra_blocksize + 1;
alg->export_core = alg->export;
alg->import_core = alg->import;
} else if (!alg->export_core || !alg->import_core) {
alg->export_core = shash_default_export_core;
alg->import_core = shash_default_import_core;
base->cra_flags |= CRYPTO_AHASH_ALG_NO_EXPORT_CORE;
}
if (alg->descsize > HASH_MAX_DESCSIZE)

10
include/crypto/hash.h
View File

@@ -129,6 +129,10 @@ struct ahash_request {
* data so the transformation can continue from this point onward. No
* data processing happens at this point. Driver must not use
* req->result.
* @export_core: Export partial state without partial block. Only defined
* for algorithms that are not block-only.
* @import_core: Import partial state without partial block. Only defined
* for algorithms that are not block-only.
* @init_tfm: Initialize the cryptographic transformation object.
* This function is called only once at the instantiation
* time, right after the transformation context was
@@ -151,6 +155,8 @@ struct ahash_alg {
int (*digest)(struct ahash_request *req);
int (*export)(struct ahash_request *req, void *out);
int (*import)(struct ahash_request *req, const void *in);
int (*export_core)(struct ahash_request *req, void *out);
int (*import_core)(struct ahash_request *req, const void *in);
int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen);
int (*init_tfm)(struct crypto_ahash *tfm);
@@ -200,6 +206,8 @@ struct shash_desc {
* @digest: see struct ahash_alg
* @export: see struct ahash_alg
* @import: see struct ahash_alg
* @export_core: see struct ahash_alg
* @import_core: see struct ahash_alg
* @setkey: see struct ahash_alg
* @init_tfm: Initialize the cryptographic transformation object.
* This function is called only once at the instantiation
@@ -230,6 +238,8 @@ struct shash_alg {
unsigned int len, u8 *out);
int (*export)(struct shash_desc *desc, void *out);
int (*import)(struct shash_desc *desc, const void *in);
int (*export_core)(struct shash_desc *desc, void *out);
int (*import_core)(struct shash_desc *desc, const void *in);
int (*setkey)(struct crypto_shash *tfm, const u8 *key,
unsigned int keylen);
int (*init_tfm)(struct crypto_shash *tfm);

3
include/crypto/internal/hash.h
View File

@@ -20,6 +20,9 @@
/* Set this bit if finup can deal with multiple blocks. */
#define CRYPTO_AHASH_ALG_FINUP_MAX 0x04000000
/* This bit is set by the Crypto API if export_core is not supported. */
#define CRYPTO_AHASH_ALG_NO_EXPORT_CORE 0x08000000
#define HASH_FBREQ_ON_STACK(name, req) \
char __##name##_req[sizeof(struct ahash_request) + \
MAX_SYNC_HASH_REQSIZE] CRYPTO_MINALIGN_ATTR; \