|
@@ -277,7 +277,6 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
|
|
|
const char *key;
|
|
|
struct aead_request *req;
|
|
|
struct scatterlist *sg;
|
|
|
- struct scatterlist *asg;
|
|
|
struct scatterlist *sgout;
|
|
|
const char *e;
|
|
|
void *assoc;
|
|
@@ -309,11 +308,10 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
|
|
|
if (testmgr_alloc_buf(xoutbuf))
|
|
|
goto out_nooutbuf;
|
|
|
|
|
|
- sg = kmalloc(sizeof(*sg) * 8 * 3, GFP_KERNEL);
|
|
|
+ sg = kmalloc(sizeof(*sg) * 9 * 2, GFP_KERNEL);
|
|
|
if (!sg)
|
|
|
goto out_nosg;
|
|
|
- asg = &sg[8];
|
|
|
- sgout = &asg[8];
|
|
|
+ sgout = &sg[9];
|
|
|
|
|
|
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 {
|
|
|
assoc = axbuf[0];
|
|
|
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) {
|
|
|
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;
|
|
|
}
|
|
|
|
|
|
- sg_init_aead(&sg[0], xbuf,
|
|
|
+ sg_init_aead(&sg[1], xbuf,
|
|
|
*b_size + (enc ? authsize : 0));
|
|
|
|
|
|
- sg_init_aead(&sgout[0], xoutbuf,
|
|
|
+ sg_init_aead(&sgout[1], xoutbuf,
|
|
|
*b_size + (enc ? authsize : 0));
|
|
|
|
|
|
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)
|
|
|
ret = test_aead_jiffies(req, enc, *b_size,
|