Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4767d6 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm/ghash-ce - add missing async import/export 



Since commit 8996eafd ("crypto: ahash - ensure statesize is non-zero"),
all ahash drivers are required to implement import()/export(), and must have
a non-zero statesize. Fix this for the ARM Crypto Extensions GHASH
implementation.

Fixes: 8996eafd ("crypto: ahash - ensure statesize is non-zero")
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2117eaa6

arch/arm/crypto/ghash-ce-glue.c

+24 −0
Original line number Diff line number Diff line
@@ -220,6 +220,27 @@ static int ghash_async_digest(struct ahash_request *req) 
	}

}



static int ghash_async_import(struct ahash_request *req, const void *in)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct shash_desc *desc = cryptd_shash_desc(cryptd_req);



	desc->tfm = cryptd_ahash_child(ctx->cryptd_tfm);

	desc->flags = req->base.flags;



	return crypto_shash_import(desc, in);

}



static int ghash_async_export(struct ahash_request *req, void *out)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct shash_desc *desc = cryptd_shash_desc(cryptd_req);



	return crypto_shash_export(desc, out);

}



static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key,

			      unsigned int keylen)

{
@@ -268,7 +289,10 @@ static struct ahash_alg ghash_async_alg = { 
	.final			= ghash_async_final,

	.setkey			= ghash_async_setkey,

	.digest			= ghash_async_digest,

	.import			= ghash_async_import,

	.export			= ghash_async_export,

	.halg.digestsize	= GHASH_DIGEST_SIZE,

	.halg.statesize		= sizeof(struct ghash_desc_ctx),

	.halg.base		= {

		.cra_name	= "ghash",

		.cra_driver_name = "ghash-ce",