2 files changed, 29 insertions, 0 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index bfee6e9f642..84f96401b29 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 526f00a9c72..b77b61dad26 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;