p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Russell King 2015-10-18 17:23:35 +01:00 committed by Herbert Xu
parent 80754539ec
commit 4c2b130c8a
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/marvell/cesa.h
View File

@ -612,7 +612,7 @@ struct mv_cesa_ahash_req {
u64 len; u64 len;
int src_nents; int src_nents;
bool last_req; bool last_req;
__be32 state[8]; u32 state[8];
}; };
/* CESA functions */ /* CESA functions */

25
drivers/crypto/marvell/hash.c
View File

@ -347,18 +347,21 @@ static int mv_cesa_ahash_process(struct crypto_async_request *req, u32 status)
ahashreq->nbytes - creq->cache_ptr); ahashreq->nbytes - creq->cache_ptr);
if (creq->last_req) { if (creq->last_req) {
for (i = 0; i < digsize / 4; i++) { /*
/* * Hardware's MD5 digest is in little endian format, but
* Hardware provides MD5 digest in a different * SHA in big endian format
* endianness than SHA-1 and SHA-256 ones. */
*/ if (digsize == MD5_DIGEST_SIZE) {
if (digsize == MD5_DIGEST_SIZE) __le32 *result = (void *)ahashreq->result;
creq->state[i] = cpu_to_le32(creq->state[i]);
else
creq->state[i] = cpu_to_be32(creq->state[i]);
}
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; return ret;