crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 70984f5341e2bd12ec035b9264787e01aaff4847..2257157da66b7fc5e605f22ab3214687666b42b5 100644 (file)
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -6979,8 +6979,8 @@ static struct cipher_testvec serpent_xts_dec_tv_template[] = {
 #define CAST6_DEC_TEST_VECTORS         4
 #define CAST6_CBC_ENC_TEST_VECTORS     1
 #define CAST6_CBC_DEC_TEST_VECTORS     1
-#define CAST6_CTR_ENC_TEST_VECTORS     1
-#define CAST6_CTR_DEC_TEST_VECTORS     1
+#define CAST6_CTR_ENC_TEST_VECTORS     2
+#define CAST6_CTR_DEC_TEST_VECTORS     2
 #define CAST6_LRW_ENC_TEST_VECTORS     1
 #define CAST6_LRW_DEC_TEST_VECTORS     1
 #define CAST6_XTS_ENC_TEST_VECTORS     1
@@ -7612,6 +7612,22 @@ static struct cipher_testvec cast6_cbc_dec_tv_template[] = {
 
 static struct cipher_testvec cast6_ctr_enc_tv_template[] = {
        { /* Generated from TF test vectors */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A",
+               .ilen   = 17,
+               .result = "\x26\x0A\xF1\xE2\x3F\x8A\xEF\xA3"
+                         "\x53\x9A\x5E\x1B\x2A\x1A\xC6\x0A"
+                         "\x57",
+               .rlen   = 17,
+       }, { /* Generated from TF test vectors */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
                          "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
@@ -7753,6 +7769,22 @@ static struct cipher_testvec cast6_ctr_enc_tv_template[] = {
 
 static struct cipher_testvec cast6_ctr_dec_tv_template[] = {
        { /* Generated from TF test vectors */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\x26\x0A\xF1\xE2\x3F\x8A\xEF\xA3"
+                         "\x53\x9A\x5E\x1B\x2A\x1A\xC6\x0A"
+                         "\x57",
+               .ilen   = 17,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A",
+               .rlen   = 17,
+       }, { /* Generated from TF test vectors */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
                          "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
@@ -13657,8 +13689,8 @@ static struct cprng_testvec ansi_cprng_aes_tv_template[] = {
 #define CAST5_DEC_TEST_VECTORS         4
 #define CAST5_CBC_ENC_TEST_VECTORS     1
 #define CAST5_CBC_DEC_TEST_VECTORS     1
-#define CAST5_CTR_ENC_TEST_VECTORS     1
-#define CAST5_CTR_DEC_TEST_VECTORS     1
+#define CAST5_CTR_ENC_TEST_VECTORS     2
+#define CAST5_CTR_DEC_TEST_VECTORS     2
 
 static struct cipher_testvec cast5_enc_tv_template[] = {
        {
@@ -14260,6 +14292,19 @@ static struct cipher_testvec cast5_cbc_dec_tv_template[] = {
 
 static struct cipher_testvec cast5_ctr_enc_tv_template[] = {
        { /* Generated from TF test vectors */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A",
+               .klen   = 16,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F",
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A",
+               .ilen   = 17,
+               .result = "\xFF\xC4\x2E\x82\x3D\xF8\xA8\x39"
+                         "\x7C\x52\xC4\xD3\xBB\x62\xC6\xA8"
+                         "\x0C",
+               .rlen   = 17,
+       }, { /* Generated from TF test vectors */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A",
                .klen   = 16,
@@ -14398,6 +14443,19 @@ static struct cipher_testvec cast5_ctr_enc_tv_template[] = {
 
 static struct cipher_testvec cast5_ctr_dec_tv_template[] = {
        { /* Generated from TF test vectors */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A",
+               .klen   = 16,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F",
+               .input  = "\xFF\xC4\x2E\x82\x3D\xF8\xA8\x39"
+                         "\x7C\x52\xC4\xD3\xBB\x62\xC6\xA8"
+                         "\x0C",
+               .ilen   = 17,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A",
+               .rlen   = 17,
+       }, { /* Generated from TF test vectors */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A",
                .klen   = 16,