hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: tcrypt - Switch to new AEAD interface 

This patch makes use of the new AEAD interface which uses a single
SG list instead of separate lists for the AD and plain text.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2015-05-27 16:03:51 +08:00
parent 957e0fe629
commit a3f2185a29
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/tcrypt.c
View File

@ -277,7 +277,6 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
const char *key; const char *key;
struct aead_request *req; struct aead_request *req;
struct scatterlist *sg; struct scatterlist *sg;
struct scatterlist *asg;
struct scatterlist *sgout; struct scatterlist *sgout;
const char *e; const char *e;
void *assoc; void *assoc;
@ -309,11 +308,10 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
if (testmgr_alloc_buf(xoutbuf)) if (testmgr_alloc_buf(xoutbuf))
goto out_nooutbuf; goto out_nooutbuf;
sg = kmalloc(sizeof(*sg) * 8 * 3, GFP_KERNEL); sg = kmalloc(sizeof(*sg) * 9 * 2, GFP_KERNEL);
if (!sg) if (!sg)
goto out_nosg; goto out_nosg;
asg = &sg[8]; sgout = &sg[9];
sgout = &asg[8];
tfm = crypto_alloc_aead(algo, 0, 0); tfm = crypto_alloc_aead(algo, 0, 0);
@ -339,7 +337,8 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
do { do {
assoc = axbuf[0]; assoc = axbuf[0];
memset(assoc, 0xff, aad_size); memset(assoc, 0xff, aad_size);
sg_init_one(&asg[0], assoc, aad_size); sg_set_buf(&sg[0], assoc, aad_size);
sg_set_buf(&sgout[0], assoc, aad_size);
if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) { if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {
pr_err("template (%u) too big for tvmem (%lu)\n", pr_err("template (%u) too big for tvmem (%lu)\n",
@ -375,14 +374,14 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
goto out; goto out;
} }
sg_init_aead(&sg[0], xbuf, sg_init_aead(&sg[1], xbuf,
*b_size + (enc ? authsize : 0)); *b_size + (enc ? authsize : 0));
sg_init_aead(&sgout[0], xoutbuf, sg_init_aead(&sgout[1], xoutbuf,
*b_size + (enc ? authsize : 0)); *b_size + (enc ? authsize : 0));
aead_request_set_crypt(req, sg, sgout, *b_size, iv); aead_request_set_crypt(req, sg, sgout, *b_size, iv);
aead_request_set_assoc(req, asg, aad_size); aead_request_set_ad(req, aad_size);
if (secs) if (secs)
ret = test_aead_jiffies(req, enc, *b_size, ret = test_aead_jiffies(req, enc, *b_size,