Commit 1c95b546 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: tcrypt - Remove cfb and ofb 


    
Remove tests for CFB/OFB.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 92650f93

crypto/tcrypt.c

+0 −76
Original line number Diff line number Diff line
@@ -1524,8 +1524,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
		ret = min(ret, tcrypt_test("xts(aes)"));

		ret = min(ret, tcrypt_test("ctr(aes)"));

		ret = min(ret, tcrypt_test("rfc3686(ctr(aes))"));

		ret = min(ret, tcrypt_test("ofb(aes)"));

		ret = min(ret, tcrypt_test("cfb(aes)"));

		ret = min(ret, tcrypt_test("xctr(aes)"));

		break;
@@ -1845,14 +1843,12 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
	case 191:

		ret = min(ret, tcrypt_test("ecb(sm4)"));

		ret = min(ret, tcrypt_test("cbc(sm4)"));

		ret = min(ret, tcrypt_test("cfb(sm4)"));

		ret = min(ret, tcrypt_test("ctr(sm4)"));

		ret = min(ret, tcrypt_test("xts(sm4)"));

		break;

	case 192:

		ret = min(ret, tcrypt_test("ecb(aria)"));

		ret = min(ret, tcrypt_test("cbc(aria)"));

		ret = min(ret, tcrypt_test("cfb(aria)"));

		ret = min(ret, tcrypt_test("ctr(aria)"));

		break;

	case 200:
@@ -1880,10 +1876,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				speed_template_16_24_32);

		test_cipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,

				speed_template_16_24_32);

		test_cipher_speed("cfb(aes)", ENCRYPT, sec, NULL, 0,

				speed_template_16_24_32);

		test_cipher_speed("cfb(aes)", DECRYPT, sec, NULL, 0,

				speed_template_16_24_32);

		break;



	case 201:
@@ -2115,10 +2107,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				speed_template_16);

		test_cipher_speed("cts(cbc(sm4))", DECRYPT, sec, NULL, 0,

				speed_template_16);

		test_cipher_speed("cfb(sm4)", ENCRYPT, sec, NULL, 0,

				speed_template_16);

		test_cipher_speed("cfb(sm4)", DECRYPT, sec, NULL, 0,

				speed_template_16);

		test_cipher_speed("ctr(sm4)", ENCRYPT, sec, NULL, 0,

				speed_template_16);

		test_cipher_speed("ctr(sm4)", DECRYPT, sec, NULL, 0,
@@ -2198,10 +2186,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				  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,
@@ -2436,14 +2420,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				   speed_template_16_24_32);

		test_acipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,

				   speed_template_16_24_32);

		test_acipher_speed("cfb(aes)", ENCRYPT, sec, NULL, 0,

				   speed_template_16_24_32);

		test_acipher_speed("cfb(aes)", DECRYPT, sec, NULL, 0,

				   speed_template_16_24_32);

		test_acipher_speed("ofb(aes)", ENCRYPT, sec, NULL, 0,

				   speed_template_16_24_32);

		test_acipher_speed("ofb(aes)", DECRYPT, sec, NULL, 0,

				   speed_template_16_24_32);

		test_acipher_speed("rfc3686(ctr(aes))", ENCRYPT, sec, NULL, 0,

				   speed_template_20_28_36);

		test_acipher_speed("rfc3686(ctr(aes))", DECRYPT, sec, NULL, 0,
@@ -2463,18 +2439,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
		test_acipher_speed("cbc(des3_ede)", DECRYPT, sec,

				   des3_speed_template, DES3_SPEED_VECTORS,

				   speed_template_24);

		test_acipher_speed("cfb(des3_ede)", ENCRYPT, sec,

				   des3_speed_template, DES3_SPEED_VECTORS,

				   speed_template_24);

		test_acipher_speed("cfb(des3_ede)", DECRYPT, sec,

				   des3_speed_template, DES3_SPEED_VECTORS,

				   speed_template_24);

		test_acipher_speed("ofb(des3_ede)", ENCRYPT, sec,

				   des3_speed_template, DES3_SPEED_VECTORS,

				   speed_template_24);

		test_acipher_speed("ofb(des3_ede)", DECRYPT, sec,

				   des3_speed_template, DES3_SPEED_VECTORS,

				   speed_template_24);

		break;



	case 502:
@@ -2486,14 +2450,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				   speed_template_8);

		test_acipher_speed("cbc(des)", DECRYPT, sec, NULL, 0,

				   speed_template_8);

		test_acipher_speed("cfb(des)", ENCRYPT, sec, NULL, 0,

				   speed_template_8);

		test_acipher_speed("cfb(des)", DECRYPT, sec, NULL, 0,

				   speed_template_8);

		test_acipher_speed("ofb(des)", ENCRYPT, sec, NULL, 0,

				   speed_template_8);

		test_acipher_speed("ofb(des)", DECRYPT, sec, NULL, 0,

				   speed_template_8);

		break;



	case 503:
@@ -2632,10 +2588,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				speed_template_16);

		test_acipher_speed("cbc(sm4)", DECRYPT, sec, NULL, 0,

				speed_template_16);

		test_acipher_speed("cfb(sm4)", ENCRYPT, sec, NULL, 0,

				speed_template_16);

		test_acipher_speed("cfb(sm4)", DECRYPT, sec, NULL, 0,

				speed_template_16);

		test_acipher_speed("ctr(sm4)", ENCRYPT, sec, NULL, 0,

				speed_template_16);

		test_acipher_speed("ctr(sm4)", DECRYPT, sec, NULL, 0,
@@ -2682,14 +2634,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,

				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("cfb(aes)", ENCRYPT, sec, NULL, 0,

				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("cfb(aes)", DECRYPT, sec, NULL, 0,

				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("ofb(aes)", ENCRYPT, sec, NULL, 0,

				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("ofb(aes)", DECRYPT, sec, NULL, 0,

				       speed_template_16_24_32, num_mb);

		test_mb_skcipher_speed("rfc3686(ctr(aes))", ENCRYPT, sec, NULL,

				       0, speed_template_20_28_36, num_mb);

		test_mb_skcipher_speed("rfc3686(ctr(aes))", DECRYPT, sec, NULL,
@@ -2709,18 +2653,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
		test_mb_skcipher_speed("cbc(des3_ede)", DECRYPT, sec,

				       des3_speed_template, DES3_SPEED_VECTORS,

				       speed_template_24, num_mb);

		test_mb_skcipher_speed("cfb(des3_ede)", ENCRYPT, sec,

				       des3_speed_template, DES3_SPEED_VECTORS,

				       speed_template_24, num_mb);

		test_mb_skcipher_speed("cfb(des3_ede)", DECRYPT, sec,

				       des3_speed_template, DES3_SPEED_VECTORS,

				       speed_template_24, num_mb);

		test_mb_skcipher_speed("ofb(des3_ede)", ENCRYPT, sec,

				       des3_speed_template, DES3_SPEED_VECTORS,

				       speed_template_24, num_mb);

		test_mb_skcipher_speed("ofb(des3_ede)", DECRYPT, sec,

				       des3_speed_template, DES3_SPEED_VECTORS,

				       speed_template_24, num_mb);

		break;



	case 602:
@@ -2732,14 +2664,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) 
				       speed_template_8, num_mb);

		test_mb_skcipher_speed("cbc(des)", DECRYPT, sec, NULL, 0,

				       speed_template_8, num_mb);

		test_mb_skcipher_speed("cfb(des)", ENCRYPT, sec, NULL, 0,

				       speed_template_8, num_mb);

		test_mb_skcipher_speed("cfb(des)", DECRYPT, sec, NULL, 0,

				       speed_template_8, num_mb);

		test_mb_skcipher_speed("ofb(des)", ENCRYPT, sec, NULL, 0,

				       speed_template_8, num_mb);

		test_mb_skcipher_speed("ofb(des)", DECRYPT, sec, NULL, 0,

				       speed_template_8, num_mb);

		break;



	case 603: