aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/tcrypt.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/tcrypt.c')
-rw-r--r--crypto/tcrypt.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index e87fa60f5831..7ae2130e1b00 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -971,11 +971,13 @@ static int do_test(int m)
971 case 3: 971 case 3:
972 ret += tcrypt_test("ecb(des)"); 972 ret += tcrypt_test("ecb(des)");
973 ret += tcrypt_test("cbc(des)"); 973 ret += tcrypt_test("cbc(des)");
974 ret += tcrypt_test("ctr(des)");
974 break; 975 break;
975 976
976 case 4: 977 case 4:
977 ret += tcrypt_test("ecb(des3_ede)"); 978 ret += tcrypt_test("ecb(des3_ede)");
978 ret += tcrypt_test("cbc(des3_ede)"); 979 ret += tcrypt_test("cbc(des3_ede)");
980 ret += tcrypt_test("ctr(des3_ede)");
979 break; 981 break;
980 982
981 case 5: 983 case 5:
@@ -1479,6 +1481,10 @@ static int do_test(int m)
1479 test_hash_speed("ghash-generic", sec, hash_speed_template_16); 1481 test_hash_speed("ghash-generic", sec, hash_speed_template_16);
1480 if (mode > 300 && mode < 400) break; 1482 if (mode > 300 && mode < 400) break;
1481 1483
1484 case 319:
1485 test_hash_speed("crc32c", sec, generic_hash_speed_template);
1486 if (mode > 300 && mode < 400) break;
1487
1482 case 399: 1488 case 399:
1483 break; 1489 break;
1484 1490
@@ -1722,6 +1728,29 @@ static int do_test(int m)
1722 speed_template_32_64); 1728 speed_template_32_64);
1723 break; 1729 break;
1724 1730
1731 case 508:
1732 test_acipher_speed("ecb(camellia)", ENCRYPT, sec, NULL, 0,
1733 speed_template_16_32);
1734 test_acipher_speed("ecb(camellia)", DECRYPT, sec, NULL, 0,
1735 speed_template_16_32);
1736 test_acipher_speed("cbc(camellia)", ENCRYPT, sec, NULL, 0,
1737 speed_template_16_32);
1738 test_acipher_speed("cbc(camellia)", DECRYPT, sec, NULL, 0,
1739 speed_template_16_32);
1740 test_acipher_speed("ctr(camellia)", ENCRYPT, sec, NULL, 0,
1741 speed_template_16_32);
1742 test_acipher_speed("ctr(camellia)", DECRYPT, sec, NULL, 0,
1743 speed_template_16_32);
1744 test_acipher_speed("lrw(camellia)", ENCRYPT, sec, NULL, 0,
1745 speed_template_32_48);
1746 test_acipher_speed("lrw(camellia)", DECRYPT, sec, NULL, 0,
1747 speed_template_32_48);
1748 test_acipher_speed("xts(camellia)", ENCRYPT, sec, NULL, 0,
1749 speed_template_32_64);
1750 test_acipher_speed("xts(camellia)", DECRYPT, sec, NULL, 0,
1751 speed_template_32_64);
1752 break;
1753
1725 case 1000: 1754 case 1000:
1726 test_available(); 1755 test_available();
1727 break; 1756 break;