linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarod Wilson <jarod@redhat.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	Neil Horman <nhorman@tuxdriver.com>
Subject: [PATCH 1/3] crypto: properly handle null input and assoc data aead test vectors
Date: Wed, 15 Apr 2009 09:36:10 -0400	[thread overview]
Message-ID: <200904150936.10800.jarod@redhat.com> (raw)
In-Reply-To: <200904150935.15947.jarod@redhat.com>

Currenty, if either input or associated data are null in an aead
test vector, we'll have random contents of the input and assoc
arrays. Similar to the iv, play it safe and zero out the contents.

Signed-off-by: Jarod Wilson <jarod@redhat.com>

---
 crypto/testmgr.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index bfee6e9..a8bdcb3 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -314,8 +314,18 @@ static int test_aead(struct crypto_aead *tfm, int enc,
 			input = xbuf[0];
 			assoc = axbuf[0];
 
-			memcpy(input, template[i].input, template[i].ilen);
-			memcpy(assoc, template[i].assoc, template[i].alen);
+			if (template[i].input)
+				memcpy(input, template[i].input,
+				       template[i].ilen);
+			else
+				memset(input, 0, MAX_IVLEN);
+
+			if (template[i].assoc)
+				memcpy(assoc, template[i].assoc,
+				       template[i].alen);
+			else
+				memset(assoc, 0, MAX_IVLEN);
+
 			if (template[i].iv)
 				memcpy(iv, template[i].iv, MAX_IVLEN);
 			else
-- 
1.6.2.2


-- 
Jarod Wilson
jarod@redhat.com

  reply	other threads:[~2009-04-15 13:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-09 18:34 [PATCH] add self-tests for rfc4309(ccm(aes)) Jarod Wilson
2009-04-09 18:52 ` Neil Horman
2009-04-09 19:16   ` Jarod Wilson
2009-04-10  2:31     ` Neil Horman
2009-04-13 21:03       ` Jarod Wilson
2009-04-13 23:11         ` [PATCH v2] crypto: " Jarod Wilson
2009-04-14 11:13           ` Neil Horman
2009-04-15 11:20           ` Herbert Xu
2009-04-15 12:35             ` Jarod Wilson
2009-04-15 13:35               ` [PATCH 0/3] crypto: add testmgr support and self-tests for rfc4309 Jarod Wilson
2009-04-15 13:36                 ` Jarod Wilson [this message]
2009-04-20  6:23                   ` [PATCH 1/3] crypto: properly handle null input and assoc data aead test vectors Herbert Xu
2009-04-23 17:30                     ` Jarod Wilson
2009-04-15 13:36                 ` [PATCH 2/3] crypto: handle ccm dec test vectors expected to fail verification Jarod Wilson
2009-04-20  6:25                   ` Herbert Xu
2009-04-23 17:31                     ` Jarod Wilson
2009-04-15 13:37                 ` [PATCH 3/3] crypto: add self-tests for rfc4309(ccm(aes)) Jarod Wilson
2009-04-20  6:26                   ` Herbert Xu
2009-04-23 18:17                     ` [PATCH v4 0/2] crypto: add testmgr support and self-tests for rfc4309 Jarod Wilson
2009-04-23 18:22                       ` [PATCH 1/2] crypto: handle ccm dec test vectors expected to fail verification Jarod Wilson
2009-04-23 18:23                       ` [PATCH 2/2] crypto: add self-tests for rfc4309(ccm(aes)) Jarod Wilson
2009-05-04 11:24                       ` [PATCH v4 0/2] crypto: add testmgr support and self-tests for rfc4309 Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200904150936.10800.jarod@redhat.com \
    --to=jarod@redhat.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).