Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c907ee76 authored by Herbert Xu's avatar Herbert Xu
Browse files

[CRYPTO] tcrypt: Use test_hash for crc32c 



Now that crc32c has been fixed to conform with standard digest semantics,
we can use test_hash for it.  I've turned the last test into a chunky
test.

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

crypto/tcrypt.c

+2 −104
Original line number Diff line number Diff line
@@ -762,108 +762,6 @@ out: 
	crypto_free_tfm(tfm);

}



static void test_crc32c(void)

{

#define NUMVEC 6

#define VECSIZE 40



	int i, j, pass;

	u32 crc;

	u8 b, test_vec[NUMVEC][VECSIZE];

	static u32 vec_results[NUMVEC] = {

		0x0e2c157f, 0xe980ebf6, 0xde74bded,

		0xd579c862, 0xba979ad0, 0x2b29d913

	};

	static u32 tot_vec_results = 0x24c5d375;



	struct scatterlist sg[NUMVEC];

	struct crypto_tfm *tfm;

	char *fmtdata = "testing crc32c initialized to %08x: %s\n";

#define SEEDTESTVAL 0xedcba987

	u32 seed;



	printk("\ntesting crc32c\n");



	tfm = crypto_alloc_tfm("crc32c", 0);

	if (tfm == NULL) {

		printk("failed to load transform for crc32c\n");

		return;

	}



	crypto_digest_init(tfm);

	crypto_digest_final(tfm, (u8*)&crc);

	printk(fmtdata, crc, (crc == 0) ? "pass" : "ERROR");



	/*

	 * stuff test_vec with known values, simple incrementing

	 * byte values.

	 */

	b = 0;

	for (i = 0; i < NUMVEC; i++) {

		for (j = 0; j < VECSIZE; j++)

			test_vec[i][j] = ++b;

		sg_set_buf(&sg[i], test_vec[i], VECSIZE);

	}



	seed = SEEDTESTVAL;

	(void)crypto_digest_setkey(tfm, (const u8*)&seed, sizeof(u32));

	crypto_digest_init(tfm);

	crypto_digest_final(tfm, (u8*)&crc);

	printk("testing crc32c setkey returns %08x : %s\n", crc, (crc == (SEEDTESTVAL ^ ~(u32)0)) ?

	       "pass" : "ERROR");



	printk("testing crc32c using update/final:\n");



	pass = 1;		    /* assume all is well */



	for (i = 0; i < NUMVEC; i++) {

		seed = ~(u32)0;

		(void)crypto_digest_setkey(tfm, (const u8*)&seed, sizeof(u32));

		crypto_digest_init(tfm);

		crypto_digest_update(tfm, &sg[i], 1);

		crypto_digest_final(tfm, (u8*)&crc);

		if (crc == vec_results[i]) {

			printk(" %08x:OK", crc);

		} else {

			printk(" %08x:BAD, wanted %08x\n", crc, vec_results[i]);

			pass = 0;

		}

	}



	printk("\ntesting crc32c using incremental accumulator:\n");

	crc = 0;

	for (i = 0; i < NUMVEC; i++) {

		seed = (crc ^ ~(u32)0);

		(void)crypto_digest_setkey(tfm, (const u8*)&seed, sizeof(u32));

		crypto_digest_init(tfm);

		crypto_digest_update(tfm, &sg[i], 1);

		crypto_digest_final(tfm, (u8*)&crc);

	}

	if (crc == tot_vec_results) {

		printk(" %08x:OK", crc);

	} else {

		printk(" %08x:BAD, wanted %08x\n", crc, tot_vec_results);

		pass = 0;

	}



	printk("\ntesting crc32c using digest:\n");

	seed = ~(u32)0;

	(void)crypto_digest_setkey(tfm, (const u8*)&seed, sizeof(u32));

	crypto_digest_init(tfm);

	crypto_digest_digest(tfm, sg, NUMVEC, (u8*)&crc);

	if (crc == tot_vec_results) {

		printk(" %08x:OK", crc);

	} else {

		printk(" %08x:BAD, wanted %08x\n", crc, tot_vec_results);

		pass = 0;

	}



	printk("\n%s\n", pass ? "pass" : "ERROR");



	crypto_free_tfm(tfm);

	printk("crc32c test complete\n");

}



static void test_available(void)

{

	char **name = check;
@@ -969,7 +867,7 @@ static void do_test(void) 
		test_hash("tgr160", tgr160_tv_template, TGR160_TEST_VECTORS);

		test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);

		test_deflate();

		test_crc32c();

		test_hash("crc32c", crc32c_tv_template, CRC32C_TEST_VECTORS);

#ifdef CONFIG_CRYPTO_HMAC

		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);

		test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);
@@ -1065,7 +963,7 @@ static void do_test(void) 
		break;



	case 18:

		test_crc32c();

		test_hash("crc32c", crc32c_tv_template, CRC32C_TEST_VECTORS);

		break;



	case 19:

crypto/tcrypt.h

+178 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
struct hash_testvec {

	/* only used with keyed hash algorithms */

	char key[128] __attribute__ ((__aligned__(4)));

	char plaintext[128];

	char plaintext[240];

	char digest[MAX_DIGEST_SIZE];

	unsigned char tap[MAX_TAP];

	unsigned char psize;
@@ -2896,6 +2896,183 @@ static struct hash_testvec michael_mic_tv_template[] = { 
	}

};



/*

 * CRC32C test vectors

 */

#define CRC32C_TEST_VECTORS 14



static struct hash_testvec crc32c_tv_template[] = {

	{

		.psize = 0,

		.digest = { 0x00, 0x00, 0x00, 0x00 }

	},

	{

		.key = { 0x87, 0xa9, 0xcb, 0xed },

		.ksize = 4,

		.psize = 0,

		.digest = { 0x78, 0x56, 0x34, 0x12 },

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,

			       0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,

			       0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,

			       0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,

			       0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28 },

		.psize = 40,

		.digest = { 0x7f, 0x15, 0x2c, 0x0e }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,

			       0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,

			       0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,

			       0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,

			       0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50 },

		.psize = 40,

		.digest = { 0xf6, 0xeb, 0x80, 0xe9 }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

			       0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60,

			       0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,

			       0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,

			       0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78 },

		.psize = 40,

		.digest = { 0xed, 0xbd, 0x74, 0xde }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80,

			       0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,

			       0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,

			       0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,

			       0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0 },

		.psize = 40,

		.digest = { 0x62, 0xc8, 0x79, 0xd5 }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,

			       0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0,

			       0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,

			       0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,

			       0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8 },

		.psize = 40,

		.digest = { 0xd0, 0x9a, 0x97, 0xba }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,

			       0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,

			       0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0,

			       0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,

			       0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0 },

		.psize = 40,

		.digest = { 0x13, 0xd9, 0x29, 0x2b }

	},

	{

		.key = { 0x80, 0xea, 0xd3, 0xf1 },

		.ksize = 4,

		.plaintext = { 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,

			       0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,

			       0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,

			       0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,

			       0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50 },

		.psize = 40,

		.digest = { 0x0c, 0xb5, 0xe2, 0xa2 }

	},

	{

		.key = { 0xf3, 0x4a, 0x1d, 0x5d },

		.ksize = 4,

		.plaintext = { 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

			       0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60,

			       0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,

			       0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,

			       0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78 },

		.psize = 40,

		.digest = { 0xd1, 0x7f, 0xfb, 0xa6 }

	},

	{

		.key = { 0x2e, 0x80, 0x04, 0x59 },

		.ksize = 4,

		.plaintext = { 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80,

			       0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,

			       0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,

			       0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,

			       0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0 },

		.psize = 40,

		.digest = { 0x59, 0x33, 0xe6, 0x7a }

	},

	{

		.key = { 0xa6, 0xcc, 0x19, 0x85 },

		.ksize = 4,

		.plaintext = { 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,

			       0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0,

			       0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,

			       0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,

			       0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8 },

		.psize = 40,

		.digest = { 0xbe, 0x03, 0x01, 0xd2 }

	},

	{

		.key = { 0x41, 0xfc, 0xfe, 0x2d },

		.ksize = 4,

		.plaintext = { 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,

			       0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,

			       0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0,

			       0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,

			       0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0 },

		.psize = 40,

		.digest = { 0x75, 0xd3, 0xc5, 0x24 }

	},

	{

		.key = { 0xff, 0xff, 0xff, 0xff },

		.ksize = 4,

		.plaintext = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,

			       0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,

			       0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,

			       0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,

			       0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,

			       0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,

			       0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,

			       0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,

			       0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,

			       0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,

			       0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

			       0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60,

			       0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,

			       0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,

			       0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,

			       0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80,

			       0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,

			       0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,

			       0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,

			       0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0,

			       0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,

			       0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0,

			       0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,

			       0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,

			       0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8,

			       0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,

			       0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,

			       0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0,

			       0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,

			       0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0 },

		.psize = 240,

		.digest = { 0x75, 0xd3, 0xc5, 0x24 },

		.np = 2,

		.tap = { 31, 209 }

	},

};



/*

 * Cipher speed tests

 */