crypto: testmgr - add larger cast6 testvectors

New ECB, CBC, CTR, LRW and XTS testvectors for cast6. We need larger
testvectors to check parallel code paths in the optimized implementation. Tests
have also been added to the tcrypt module.

Signed-off-by: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 50 insertions, 0 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index a94bbd77dc60..871076b1e0ab 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1043,6 +1043,10 @@ static int do_test(int m)
 
         case 15:
                 ret += tcrypt_test("ecb(cast6)");
+                ret += tcrypt_test("cbc(cast6)");
+                ret += tcrypt_test("ctr(cast6)");
+                ret += tcrypt_test("lrw(cast6)");
+                ret += tcrypt_test("xts(cast6)");
                 break;
 
         case 16:
@@ -1376,6 +1380,29 @@ static int do_test(int m)
                                   speed_template_8_16);
                 break;
 
+        case 210:
+                test_cipher_speed("ecb(cast6)", ENCRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("ecb(cast6)", DECRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("cbc(cast6)", ENCRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("cbc(cast6)", DECRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("ctr(cast6)", ENCRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("ctr(cast6)", DECRYPT, sec, NULL, 0,
+                                  speed_template_16_32);
+                test_cipher_speed("lrw(cast6)", ENCRYPT, sec, NULL, 0,
+                                  speed_template_32_48);
+                test_cipher_speed("lrw(cast6)", DECRYPT, sec, NULL, 0,
+                                  speed_template_32_48);
+                test_cipher_speed("xts(cast6)", ENCRYPT, sec, NULL, 0,
+                                  speed_template_32_64);
+                test_cipher_speed("xts(cast6)", DECRYPT, sec, NULL, 0,
+                                  speed_template_32_64);
+                break;
+
         case 300:
                 /* fall through */
 
@@ -1671,6 +1698,29 @@ static int do_test(int m)
                                    speed_template_8_16);
                 break;
 
+        case 507:
+                test_acipher_speed("ecb(cast6)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("ecb(cast6)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("cbc(cast6)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("cbc(cast6)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("ctr(cast6)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("ctr(cast6)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_32);
+                test_acipher_speed("lrw(cast6)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_32_48);
+                test_acipher_speed("lrw(cast6)", DECRYPT, sec, NULL, 0,
+                                   speed_template_32_48);
+                test_acipher_speed("xts(cast6)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_32_64);
+                test_acipher_speed("xts(cast6)", DECRYPT, sec, NULL, 0,
+                                   speed_template_32_64);
+                break;
+
         case 1000:
                 test_available();
                 break;