1 files changed, 60 insertions, 4 deletions

diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index fb765173d41c..74e35377fd30 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -1669,17 +1669,73 @@ static struct hash_testvec aes_xcbc128_tv_template[] = {
         }
 };
 
-#define VMAC_AES_TEST_VECTORS   1
-static char vmac_string[128] = {'\x01', '\x01', '\x01', '\x01',
+#define VMAC_AES_TEST_VECTORS   8
+static char vmac_string1[128] = {'\x01', '\x01', '\x01', '\x01',
                                 '\x02', '\x03', '\x02', '\x02',
                                 '\x02', '\x04', '\x01', '\x07',
                                 '\x04', '\x01', '\x04', '\x03',};
+static char vmac_string2[128] = {'a', 'b', 'c',};
+static char vmac_string3[128] = {'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                'a', 'b', 'c', 'a', 'b', 'c',
+                                };
+
 static struct hash_testvec aes_vmac128_tv_template[] = {
         {
+                .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+                .plaintext = NULL,
+                .digest = "\x07\x58\x80\x35\x77\xa4\x7b\x54",
+                .psize  = 0,
+                .ksize  = 16,
+        }, {
+                .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+                .plaintext = vmac_string1,
+                .digest = "\xce\xf5\x3c\xd3\xae\x68\x8c\xa1",
+                .psize  = 128,
+                .ksize  = 16,
+        }, {
+                .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+                .plaintext = vmac_string2,
+                .digest = "\xc9\x27\xb0\x73\x81\xbd\x14\x2d",
+                .psize  = 128,
+                .ksize  = 16,
+        }, {
                 .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
                           "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-                .plaintext = vmac_string,
-                .digest = "\xcb\xd7\x8a\xfd\xb7\x33\x79\xe7",
+                .plaintext = vmac_string3,
+                .digest = "\x8d\x1a\x95\x8c\x98\x47\x0b\x19",
+                .psize  = 128,
+                .ksize  = 16,
+        }, {
+                .key    = "abcdefghijklmnop",
+                .plaintext = NULL,
+                .digest = "\x3b\x89\xa1\x26\x9e\x55\x8f\x84",
+                .psize  = 0,
+                .ksize  = 16,
+        }, {
+                .key    = "abcdefghijklmnop",
+                .plaintext = vmac_string1,
+                .digest = "\xab\x5e\xab\xb0\xf6\x8d\x74\xc2",
+                .psize  = 128,
+                .ksize  = 16,
+        }, {
+                .key    = "abcdefghijklmnop",
+                .plaintext = vmac_string2,
+                .digest = "\x11\x15\x68\x42\x3d\x7b\x09\xdf",
+                .psize  = 128,
+                .ksize  = 16,
+        }, {
+                .key    = "abcdefghijklmnop",
+                .plaintext = vmac_string3,
+                .digest = "\x8b\x32\x8f\xe1\xed\x8f\xfa\xd4",
                 .psize  = 128,
                 .ksize  = 16,
         },