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

crypto: marvell/cesa - keep creq->state in CPU endian format at all times 



Currently, we read/write the state in CPU endian, but on the final
request, we convert its endian according to the requested algorithm.
(md5 is little endian, SHA are big endian.)

Always keep creq->state in CPU native endian format, and perform the
necessary conversion when copying the hash to the result.

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

drivers/crypto/marvell/cesa.h

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

	int src_nents;

	bool last_req;

	__be32 state[8];

	u32 state[8];

};



/* CESA functions */

drivers/crypto/marvell/hash.c

+14 −11
Original line number Diff line number Diff line
@@ -347,18 +347,21 @@ static int mv_cesa_ahash_process(struct crypto_async_request *req, u32 status) 
				   ahashreq->nbytes - creq->cache_ptr);



	if (creq->last_req) {

		for (i = 0; i < digsize / 4; i++) {

		/*

			 * Hardware provides MD5 digest in a different

			 * endianness than SHA-1 and SHA-256 ones.

		 * Hardware's MD5 digest is in little endian format, but

		 * SHA in big endian format

		 */

			if (digsize == MD5_DIGEST_SIZE)

				creq->state[i] = cpu_to_le32(creq->state[i]);

			else

				creq->state[i] = cpu_to_be32(creq->state[i]);

		}

		if (digsize == MD5_DIGEST_SIZE) {

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



		memcpy(ahashreq->result, creq->state, digsize);

			for (i = 0; i < digsize / 4; i++)

				result[i] = cpu_to_le32(creq->state[i]);

		} else {

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



			for (i = 0; i < digsize / 4; i++)

				result[i] = cpu_to_be32(creq->state[i]);

		}

	}



	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE