From: Jarod Wilson <jarod@wilsonet.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>,
Jarod Wilson <jarod@redhat.com>
Subject: [PATCH 1/2] crypto: handle ccm dec test vectors expected to fail verification
Date: Thu, 23 Apr 2009 14:22:49 -0400 [thread overview]
Message-ID: <200904231422.50153.jarod@wilsonet.com> (raw)
In-Reply-To: <49F0B09D.6040308@redhat.com>
Add infrastructure to tcrypt/testmgr to support handling ccm decryption
test vectors that are expected to fail verification.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
crypto/testmgr.c | 28 ++++++++++++++++++++++++++++
crypto/testmgr.h | 1 +
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index bfee6e9..84f9640 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -363,6 +363,16 @@ static int test_aead(struct crypto_aead *tfm, int enc,
switch (ret) {
case 0:
+ if (template[i].novrfy) {
+ /* verification was supposed to fail */
+ printk(KERN_ERR "alg: aead: %s failed "
+ "on test %d for %s: ret was 0, "
+ "expected -EBADMSG\n",
+ e, j, algo);
+ /* so really, we got a bad message */
+ ret = -EBADMSG;
+ goto out;
+ }
break;
case -EINPROGRESS:
case -EBUSY:
@@ -372,6 +382,10 @@ static int test_aead(struct crypto_aead *tfm, int enc,
INIT_COMPLETION(result.completion);
break;
}
+ case -EBADMSG:
+ if (template[i].novrfy)
+ /* verification failure was expected */
+ continue;
/* fall through */
default:
printk(KERN_ERR "alg: aead: %s failed on test "
@@ -481,6 +495,16 @@ static int test_aead(struct crypto_aead *tfm, int enc,
switch (ret) {
case 0:
+ if (template[i].novrfy) {
+ /* verification was supposed to fail */
+ printk(KERN_ERR "alg: aead: %s failed "
+ "on chunk test %d for %s: ret "
+ "was 0, expected -EBADMSG\n",
+ e, j, algo);
+ /* so really, we got a bad message */
+ ret = -EBADMSG;
+ goto out;
+ }
break;
case -EINPROGRESS:
case -EBUSY:
@@ -490,6 +514,10 @@ static int test_aead(struct crypto_aead *tfm, int enc,
INIT_COMPLETION(result.completion);
break;
}
+ case -EBADMSG:
+ if (template[i].novrfy)
+ /* verification failure was expected */
+ continue;
/* fall through */
default:
printk(KERN_ERR "alg: aead: %s failed on "
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 526f00a..b77b61d 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -62,6 +62,7 @@ struct aead_testvec {
int np;
int anp;
unsigned char fail;
+ unsigned char novrfy; /* ccm dec verification failure expected */
unsigned char wk; /* weak key flag */
unsigned char klen;
unsigned short ilen;
--
Jarod Wilson
jarod@wilsonet.com
next prev parent reply other threads:[~2009-04-23 18:30 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 ` [PATCH 1/3] crypto: properly handle null input and assoc data aead test vectors Jarod Wilson
2009-04-20 6:23 ` 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 ` Jarod Wilson [this message]
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=200904231422.50153.jarod@wilsonet.com \
--to=jarod@wilsonet.com \
--cc=herbert@gondor.apana.org.au \
--cc=jarod@redhat.com \
--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).