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

Commit edbd1ecb authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: mcryptd - remove pointless wrapper functions 



There is no need for ahash_mcryptd_{update,final,finup,digest}(); we
should just call crypto_ahash_*() directly.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarTim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 40b776ae

crypto/mcryptd.c

+4 −30
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void mcryptd_hash_update(struct crypto_async_request *req_async, int err) 
		goto out;



	rctx->out = req->result;

	err = ahash_mcryptd_update(&rctx->areq);

	err = crypto_ahash_update(&rctx->areq);

	if (err) {

		req->base.complete = rctx->complete;

		goto out;
@@ -394,7 +394,7 @@ static void mcryptd_hash_final(struct crypto_async_request *req_async, int err) 
		goto out;



	rctx->out = req->result;

	err = ahash_mcryptd_final(&rctx->areq);

	err = crypto_ahash_final(&rctx->areq);

	if (err) {

		req->base.complete = rctx->complete;

		goto out;
@@ -420,7 +420,7 @@ static void mcryptd_hash_finup(struct crypto_async_request *req_async, int err) 
	if (unlikely(err == -EINPROGRESS))

		goto out;

	rctx->out = req->result;

	err = ahash_mcryptd_finup(&rctx->areq);

	err = crypto_ahash_finup(&rctx->areq);



	if (err) {

		req->base.complete = rctx->complete;
@@ -455,7 +455,7 @@ static void mcryptd_hash_digest(struct crypto_async_request *req_async, int err) 
						rctx->complete, req_async);



	rctx->out = req->result;

	err = ahash_mcryptd_digest(desc);

	err = crypto_ahash_init(desc) ?: crypto_ahash_finup(desc);



out:

	local_bh_disable();
@@ -612,32 +612,6 @@ struct mcryptd_ahash *mcryptd_alloc_ahash(const char *alg_name, 
}

EXPORT_SYMBOL_GPL(mcryptd_alloc_ahash);



int ahash_mcryptd_digest(struct ahash_request *desc)

{

	return crypto_ahash_init(desc) ?: ahash_mcryptd_finup(desc);

}



int ahash_mcryptd_update(struct ahash_request *desc)

{

	/* alignment is to be done by multi-buffer crypto algorithm if needed */



	return crypto_ahash_update(desc);

}



int ahash_mcryptd_finup(struct ahash_request *desc)

{

	/* alignment is to be done by multi-buffer crypto algorithm if needed */



	return crypto_ahash_finup(desc);

}



int ahash_mcryptd_final(struct ahash_request *desc)

{

	/* alignment is to be done by multi-buffer crypto algorithm if needed */



	return crypto_ahash_final(desc);

}



struct crypto_ahash *mcryptd_ahash_child(struct mcryptd_ahash *tfm)

{

	struct mcryptd_hash_ctx *ctx = crypto_ahash_ctx(&tfm->base);

include/crypto/internal/hash.h

+0 −5
Original line number Diff line number Diff line
@@ -126,11 +126,6 @@ int shash_ahash_update(struct ahash_request *req, struct shash_desc *desc); 
int shash_ahash_finup(struct ahash_request *req, struct shash_desc *desc);

int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc);



int ahash_mcryptd_update(struct ahash_request *desc);

int ahash_mcryptd_final(struct ahash_request *desc);

int ahash_mcryptd_finup(struct ahash_request *desc);

int ahash_mcryptd_digest(struct ahash_request *desc);



int crypto_init_shash_ops_async(struct crypto_tfm *tfm);



static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)