diff options
Diffstat (limited to 'crypto/tcrypt.c')
-rw-r--r-- | crypto/tcrypt.c | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 1026173d721a..5fb120474902 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c | |||
@@ -76,7 +76,9 @@ static char *check[] = { | |||
76 | "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", | 76 | "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", |
77 | "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", | 77 | "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", |
78 | "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", | 78 | "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", |
79 | "lzo", "cts", "sha3-224", "sha3-256", "sha3-384", "sha3-512", NULL | 79 | "lzo", "cts", "sha3-224", "sha3-256", "sha3-384", "sha3-512", |
80 | "streebog256", "streebog512", | ||
81 | NULL | ||
80 | }; | 82 | }; |
81 | 83 | ||
82 | static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 }; | 84 | static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 }; |
@@ -1914,6 +1916,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) | |||
1914 | ret += tcrypt_test("sm3"); | 1916 | ret += tcrypt_test("sm3"); |
1915 | break; | 1917 | break; |
1916 | 1918 | ||
1919 | case 53: | ||
1920 | ret += tcrypt_test("streebog256"); | ||
1921 | break; | ||
1922 | |||
1923 | case 54: | ||
1924 | ret += tcrypt_test("streebog512"); | ||
1925 | break; | ||
1926 | |||
1917 | case 100: | 1927 | case 100: |
1918 | ret += tcrypt_test("hmac(md5)"); | 1928 | ret += tcrypt_test("hmac(md5)"); |
1919 | break; | 1929 | break; |
@@ -1970,6 +1980,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) | |||
1970 | ret += tcrypt_test("hmac(sha3-512)"); | 1980 | ret += tcrypt_test("hmac(sha3-512)"); |
1971 | break; | 1981 | break; |
1972 | 1982 | ||
1983 | case 115: | ||
1984 | ret += tcrypt_test("hmac(streebog256)"); | ||
1985 | break; | ||
1986 | |||
1987 | case 116: | ||
1988 | ret += tcrypt_test("hmac(streebog512)"); | ||
1989 | break; | ||
1990 | |||
1973 | case 150: | 1991 | case 150: |
1974 | ret += tcrypt_test("ansi_cprng"); | 1992 | ret += tcrypt_test("ansi_cprng"); |
1975 | break; | 1993 | break; |
@@ -2412,6 +2430,16 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) | |||
2412 | test_hash_speed("sm3", sec, generic_hash_speed_template); | 2430 | test_hash_speed("sm3", sec, generic_hash_speed_template); |
2413 | if (mode > 300 && mode < 400) break; | 2431 | if (mode > 300 && mode < 400) break; |
2414 | /* fall through */ | 2432 | /* fall through */ |
2433 | case 327: | ||
2434 | test_hash_speed("streebog256", sec, | ||
2435 | generic_hash_speed_template); | ||
2436 | if (mode > 300 && mode < 400) break; | ||
2437 | /* fall through */ | ||
2438 | case 328: | ||
2439 | test_hash_speed("streebog512", sec, | ||
2440 | generic_hash_speed_template); | ||
2441 | if (mode > 300 && mode < 400) break; | ||
2442 | /* fall through */ | ||
2415 | case 399: | 2443 | case 399: |
2416 | break; | 2444 | break; |
2417 | 2445 | ||
@@ -2525,6 +2553,16 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) | |||
2525 | num_mb); | 2553 | num_mb); |
2526 | if (mode > 400 && mode < 500) break; | 2554 | if (mode > 400 && mode < 500) break; |
2527 | /* fall through */ | 2555 | /* fall through */ |
2556 | case 426: | ||
2557 | test_mb_ahash_speed("streebog256", sec, | ||
2558 | generic_hash_speed_template, num_mb); | ||
2559 | if (mode > 400 && mode < 500) break; | ||
2560 | /* fall through */ | ||
2561 | case 427: | ||
2562 | test_mb_ahash_speed("streebog512", sec, | ||
2563 | generic_hash_speed_template, num_mb); | ||
2564 | if (mode > 400 && mode < 500) break; | ||
2565 | /* fall through */ | ||
2528 | case 499: | 2566 | case 499: |
2529 | break; | 2567 | break; |
2530 | 2568 | ||