Commit 9b8b0405 authored by Johannes Goetzfried's avatar Johannes Goetzfried Committed by Herbert Xu
Browse files

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: default avatarJohannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2b49b906

crypto/tcrypt.c

+50 −0
Original line number Diff line number Diff line
@@ -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;

crypto/testmgr.c

+60 −0
Original line number Diff line number Diff line
@@ -1877,6 +1877,21 @@ static const struct alg_test_desc alg_test_descs[] = { 
				}

			}

		}

	}, {

		.alg = "cbc(cast6)",

		.test = alg_test_skcipher,

		.suite = {

			.cipher = {

				.enc = {

					.vecs = cast6_cbc_enc_tv_template,

					.count = CAST6_CBC_ENC_TEST_VECTORS

				},

				.dec = {

					.vecs = cast6_cbc_dec_tv_template,

					.count = CAST6_CBC_DEC_TEST_VECTORS

				}

			}

		}

	}, {

		.alg = "cbc(des)",

		.test = alg_test_skcipher,
@@ -2143,6 +2158,21 @@ static const struct alg_test_desc alg_test_descs[] = { 
				}

			}

		}

	}, {

		.alg = "ctr(cast6)",

		.test = alg_test_skcipher,

		.suite = {

			.cipher = {

				.enc = {

					.vecs = cast6_ctr_enc_tv_template,

					.count = CAST6_CTR_ENC_TEST_VECTORS

				},

				.dec = {

					.vecs = cast6_ctr_dec_tv_template,

					.count = CAST6_CTR_DEC_TEST_VECTORS

				}

			}

		}

	}, {

		.alg = "ctr(serpent)",

		.test = alg_test_skcipher,
@@ -2619,6 +2649,21 @@ static const struct alg_test_desc alg_test_descs[] = { 
				}

			}

		}

	}, {

		.alg = "lrw(cast6)",

		.test = alg_test_skcipher,

		.suite = {

			.cipher = {

				.enc = {

					.vecs = cast6_lrw_enc_tv_template,

					.count = CAST6_LRW_ENC_TEST_VECTORS

				},

				.dec = {

					.vecs = cast6_lrw_dec_tv_template,

					.count = CAST6_LRW_DEC_TEST_VECTORS

				}

			}

		}

	}, {

		.alg = "lrw(serpent)",

		.test = alg_test_skcipher,
@@ -2971,6 +3016,21 @@ static const struct alg_test_desc alg_test_descs[] = { 
				}

			}

		}

	}, {

		.alg = "xts(cast6)",

		.test = alg_test_skcipher,

		.suite = {

			.cipher = {

				.enc = {

					.vecs = cast6_xts_enc_tv_template,

					.count = CAST6_XTS_ENC_TEST_VECTORS

				},

				.dec = {

					.vecs = cast6_xts_dec_tv_template,

					.count = CAST6_XTS_DEC_TEST_VECTORS

				}

			}

		}

	}, {

		.alg = "xts(serpent)",

		.test = alg_test_skcipher,

crypto/testmgr.h

+1410 −2

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE