diff options
| author | Tudor-Dan Ambarus <tudor.ambarus@microchip.com> | 2017-11-14 16:59:15 +0200 |
|---|---|---|
| committer | Mircea Pop <mircea.pop@nxp.com> | 2019-05-14 09:54:38 +0200 |
| commit | be3e655de2082d22f05a34c12751e6ebdc05f057 (patch) | |
| tree | 15019defee9109a5ac727cafa144a5c06f5c44b3 /crypto | |
| parent | 4af4ad7474aad1763b00407bd3b8f28a9bd3bfaf (diff) | |
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>
(cherry picked from commit 5601e014fe7229dae405c9ad72081d65ac102962)
Diffstat (limited to 'crypto')
| -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 dd9ddd96591d..2e291abd4221 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -184,7 +184,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; @@ -197,6 +198,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++) @@ -317,14 +321,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), |