Skip to content

Commit

Permalink
crypto: testmgr - limit IV copy length in aead tests
Browse files Browse the repository at this point in the history
The working copy of IV is the same size as the transformation's IV.
It is not necessary to copy more than that from the template since
iv_len is usually less than MAX_IVLEN and the rest of the copied data
is garbage.

Signed-off-by: Cristian Stoica <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
Cristian Stoica authored and herbertx committed Feb 4, 2015
1 parent c476899 commit 424a5da
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions crypto/testmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
struct scatterlist *sgout;
const char *e, *d;
struct tcrypt_result result;
unsigned int authsize;
unsigned int authsize, iv_len;
void *input;
void *output;
void *assoc;
Expand Down Expand Up @@ -500,10 +500,11 @@ static int __test_aead(struct crypto_aead *tfm, int enc,

memcpy(input, template[i].input, template[i].ilen);
memcpy(assoc, template[i].assoc, template[i].alen);
iv_len = crypto_aead_ivsize(tfm);
if (template[i].iv)
memcpy(iv, template[i].iv, MAX_IVLEN);
memcpy(iv, template[i].iv, iv_len);
else
memset(iv, 0, MAX_IVLEN);
memset(iv, 0, iv_len);

crypto_aead_clear_flags(tfm, ~0);
if (template[i].wk)
Expand Down

0 comments on commit 424a5da

Please sign in to comment.