Commit 214a9bd0 authored by Antoine Ténart's avatar Antoine Ténart Committed by Herbert Xu

crypto: sun4i-ss - simplify the pad length calculation

When sending the last block of data to the engine, it should be padded
so that the total length of the request can be given to the engine as
the last 2 words of the last 64 bytes block.

Simplify the calculation of this pad offset.
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7e6df1f7
...@@ -177,7 +177,7 @@ static int sun4i_hash(struct ahash_request *areq) ...@@ -177,7 +177,7 @@ static int sun4i_hash(struct ahash_request *areq)
* *
* in_i: advancement in the current SG * in_i: advancement in the current SG
*/ */
unsigned int i = 0, end, index, padlen, nwait, nbw = 0, j = 0, todo; unsigned int i = 0, end, fill, min_fill, nwait, nbw = 0, j = 0, todo;
unsigned int in_i = 0; unsigned int in_i = 0;
u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, wb = 0, v, ivmode = 0; u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, wb = 0, v, ivmode = 0;
struct sun4i_req_ctx *op = ahash_request_ctx(areq); struct sun4i_req_ctx *op = ahash_request_ctx(areq);
...@@ -186,7 +186,7 @@ static int sun4i_hash(struct ahash_request *areq) ...@@ -186,7 +186,7 @@ static int sun4i_hash(struct ahash_request *areq)
struct sun4i_ss_ctx *ss = tfmctx->ss; struct sun4i_ss_ctx *ss = tfmctx->ss;
struct scatterlist *in_sg = areq->src; struct scatterlist *in_sg = areq->src;
struct sg_mapping_iter mi; struct sg_mapping_iter mi;
int in_r, err = 0, zeros; int in_r, err = 0;
size_t copied = 0; size_t copied = 0;
dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x", dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x",
...@@ -387,6 +387,8 @@ static int sun4i_hash(struct ahash_request *areq) ...@@ -387,6 +387,8 @@ static int sun4i_hash(struct ahash_request *areq)
nbw = op->len - 4 * nwait; nbw = op->len - 4 * nwait;
wb = *(u32 *)(op->buf + nwait * 4); wb = *(u32 *)(op->buf + nwait * 4);
wb &= (0xFFFFFFFF >> (4 - nbw) * 8); wb &= (0xFFFFFFFF >> (4 - nbw) * 8);
op->byte_count += nbw;
} }
/* write the remaining bytes of the nbw buffer */ /* write the remaining bytes of the nbw buffer */
...@@ -402,22 +404,15 @@ static int sun4i_hash(struct ahash_request *areq) ...@@ -402,22 +404,15 @@ static int sun4i_hash(struct ahash_request *areq)
* I take the operations from other MD5/SHA1 implementations * I take the operations from other MD5/SHA1 implementations
*/ */
/* we have already send 4 more byte of which nbw data */ /* last block size */
if (op->mode == SS_OP_MD5) { fill = 64 - (op->byte_count % 64);
index = (op->byte_count + 4) & 0x3f; min_fill = 2 * sizeof(u32) + (nbw ? 0 : sizeof(u32));
op->byte_count += nbw;
if (index > 56) /* if we can't fill all data, jump to the next 64 block */
zeros = (120 - index) / 4; if (fill < min_fill)
else fill += 64;
zeros = (56 - index) / 4;
} else {
op->byte_count += nbw;
index = op->byte_count & 0x3f;
padlen = (index < 56) ? (56 - index) : ((64 + 56) - index);
zeros = (padlen - 1) / 4;
}
j += zeros; j += (fill - min_fill) / sizeof(u32);
/* write the length of data */ /* write the length of data */
if (op->mode == SS_OP_SHA1) { if (op->mode == SS_OP_SHA1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment