diff options
| author |   Tudor-Dan Ambarus <tudor.ambarus@microchip.com> | 2017-11-14 16:59:15 +0200 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-29 17:33:26 +1100 |
| commit | 5601e014fe7229dae405c9ad72081d65ac102962 (patch) | |
| tree | 3190e162482d1eed2110b5eefc96b2abd157f68a /crypto/tcrypt.c | |
| parent | crypto: nx - fix spelling mistake: "availavle" -> "available" (diff) | |
| download | linux-dev-5601e014fe7229dae405c9ad72081d65ac102962.tar.xz linux-dev-5601e014fe7229dae405c9ad72081d65ac102962.zip | |
crypto: tcrypt - set assoc in sg_init_aead()
Results better code readability.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | crypto/tcrypt.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 3ced1ba1fd11..28b4882f1944 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -185,7 +185,8 @@ static void testmgr_free_buf(char *buf[XBUFSIZE]) } static void sg_init_aead(struct scatterlist *sg, char *xbuf[XBUFSIZE], - unsigned int buflen) + unsigned int buflen, const void *assoc, + unsigned int aad_size) { int np = (buflen + PAGE_SIZE - 1)/PAGE_SIZE; int k, rem; @@ -198,6 +199,9 @@ static void sg_init_aead(struct scatterlist *sg, char *xbuf[XBUFSIZE], } sg_init_table(sg, np + 1); + + sg_set_buf(&sg[0], assoc, aad_size); + if (rem) np--; for (k = 0; k < np; k++) @@ -318,14 +322,12 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, goto out; } - sg_init_aead(sg, xbuf, - *b_size + (enc ? 0 : authsize)); + sg_init_aead(sg, xbuf, *b_size + (enc ? 0 : authsize), + assoc, aad_size); sg_init_aead(sgout, xoutbuf, - *b_size + (enc ? authsize : 0)); - - sg_set_buf(&sg[0], assoc, aad_size); - sg_set_buf(&sgout[0], assoc, aad_size); + *b_size + (enc ? authsize : 0), assoc, + aad_size); aead_request_set_crypt(req, sg, sgout, *b_size + (enc ? 0 : authsize), |