crypto: testmgr - add ARIA testmgr tests

[linux-2.6-block.git] / crypto / tcrypt.c

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index a8831060c4ceec93bd180893e14ccf138d371f5a..f56d1a9cf0a78ab408dabaf88daa0e00f8f49ceb 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -71,7 +71,7 @@ static const char *check[] = {
        "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
        "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
        "khazad", "wp512", "wp384", "wp256", "xeta",  "fcrypt",
-       "camellia", "seed", "rmd160",
+       "camellia", "seed", "rmd160", "aria",
        "lzo", "lzo-rle", "cts", "sha3-224", "sha3-256", "sha3-384",
        "sha3-512", "streebog256", "streebog512",
        NULL
@@ -1730,6 +1730,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("polyval");
                break;
 
+       case 58:
+               ret += tcrypt_test("gcm(aria)");
+               break;
+
        case 100:
                ret += tcrypt_test("hmac(md5)");
                break;
@@ -1866,6 +1870,12 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("cfb(sm4)");
                ret += tcrypt_test("ctr(sm4)");
                break;
+       case 192:
+               ret += tcrypt_test("ecb(aria)");
+               ret += tcrypt_test("cbc(aria)");
+               ret += tcrypt_test("cfb(aria)");
+               ret += tcrypt_test("ctr(aria)");
+               break;
        case 200:
                test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
@@ -2192,6 +2202,32 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                                  0, speed_template_32);
                break;
 
+       case 227:
+               test_cipher_speed("ecb(aria)", ENCRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("ecb(aria)", DECRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("cbc(aria)", ENCRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("cbc(aria)", DECRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("cfb(aria)", ENCRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("cfb(aria)", DECRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("ctr(aria)", ENCRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               test_cipher_speed("ctr(aria)", DECRYPT, sec, NULL, 0,
+                                 speed_template_16_24_32);
+               break;
+
+       case 228:
+               test_aead_speed("gcm(aria)", ENCRYPT, sec,
+                               NULL, 0, 16, 8, speed_template_16_24_32);
+               test_aead_speed("gcm(aria)", DECRYPT, sec,
+                               NULL, 0, 16, 8, speed_template_16_24_32);
+               break;
+
        case 300:
                if (alg) {
                        test_hash_speed(alg, sec, generic_hash_speed_template);