Commit e44a1b44 authored by Jarod Wilson's avatar Jarod Wilson Committed by Herbert Xu
Browse files

crypto: testmgr - Handle AEAD test vectors expected to fail verification 



Add infrastructure to tcrypt/testmgr to support handling ccm decryption
test vectors that are expected to fail verification.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2f817418

crypto/testmgr.c

+28 −0
Original line number Diff line number Diff line
@@ -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 "

crypto/testmgr.h

+1 −0
Original line number Diff line number Diff line
@@ -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;