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

Commit a9eb678f authored by Russell King's avatar Russell King Committed by Herbert Xu
Browse files

crypto: marvell/cesa - add flag to determine algorithm endianness 



Rather than determining whether we're using a MD5 hash by looking at
the digest size, switch to a cleaner solution using a per-request flag
initialised by the method type.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4c2b130c

drivers/crypto/marvell/cesa.h

+1 −0
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ struct mv_cesa_ahash_req { 
	u64 len;

	int src_nents;

	bool last_req;

	bool algo_le;

	u32 state[8];

};

drivers/crypto/marvell/hash.c

+9 −8
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static int mv_cesa_ahash_process(struct crypto_async_request *req, u32 status) 
		 * Hardware's MD5 digest is in little endian format, but

		 * SHA in big endian format

		 */

		if (digsize == MD5_DIGEST_SIZE) {

		if (creq->algo_le) {

			__le32 *result = (void *)ahashreq->result;



			for (i = 0; i < digsize / 4; i++)
@@ -407,7 +407,7 @@ static const struct mv_cesa_req_ops mv_cesa_ahash_req_ops = { 
};



static int mv_cesa_ahash_init(struct ahash_request *req,

			      struct mv_cesa_op_ctx *tmpl)

			      struct mv_cesa_op_ctx *tmpl, bool algo_le)

{

	struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
@@ -421,6 +421,7 @@ static int mv_cesa_ahash_init(struct ahash_request *req, 
	mv_cesa_set_mac_op_frag_len(tmpl, 0);

	creq->op_tmpl = *tmpl;

	creq->len = 0;

	creq->algo_le = algo_le;



	return 0;

}
@@ -863,7 +864,7 @@ static int mv_cesa_md5_init(struct ahash_request *req) 


	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_MD5);



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, true);



	return 0;

}
@@ -926,7 +927,7 @@ static int mv_cesa_sha1_init(struct ahash_request *req) 


	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_SHA1);



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, false);



	return 0;

}
@@ -989,7 +990,7 @@ static int mv_cesa_sha256_init(struct ahash_request *req) 


	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_SHA256);



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, false);



	return 0;

}
@@ -1220,7 +1221,7 @@ static int mv_cesa_ahmac_md5_init(struct ahash_request *req) 
	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_HMAC_MD5);

	memcpy(tmpl.ctx.hash.iv, ctx->iv, sizeof(ctx->iv));



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, true);



	return 0;

}
@@ -1290,7 +1291,7 @@ static int mv_cesa_ahmac_sha1_init(struct ahash_request *req) 
	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_HMAC_SHA1);

	memcpy(tmpl.ctx.hash.iv, ctx->iv, sizeof(ctx->iv));



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, false);



	return 0;

}
@@ -1380,7 +1381,7 @@ static int mv_cesa_ahmac_sha256_init(struct ahash_request *req) 
	mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_HMAC_SHA256);

	memcpy(tmpl.ctx.hash.iv, ctx->iv, sizeof(ctx->iv));



	mv_cesa_ahash_init(req, &tmpl);

	mv_cesa_ahash_init(req, &tmpl, false);



	return 0;

}