@@ -354,8 +354,10 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
ret = crypto_aead_setauthsize(tfm, authsize);
iv_len = crypto_aead_ivsize(tfm);
- if (iv_len)
- memset(&iv, 0xff, iv_len);
+ if (iv_len) {
+ for (j = 0; j < iv_len; j++)
+ iv[j] = j + 1;
+ }
crypto_aead_clear_flags(tfm, ~0);
printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ",
@@ -1751,6 +1753,15 @@ static int do_test(int m)
NULL, 0, 16, 8, aead_speed_template_20);
break;
+ case 212:
+ test_aead_speed("ccm_base(ctr(aes-aesni),aes-aesni)", ENCRYPT, sec,
+ NULL, 0, 16, 8, aead_speed_template_16);
+ break;
+ case 213:
+ test_aead_speed("ccm-aes-aesni", ENCRYPT, sec,
+ NULL, 0, 16, 8, aead_speed_template_16);
+ break;
+
case 300:
/* fall through */
@@ -66,6 +66,7 @@ static u8 speed_template_32_64[] = {32, 64, 0};
* AEAD speed tests
*/
static u8 aead_speed_template_20[] = {20, 0};
+static u8 aead_speed_template_16[] = {16, 0};
/*
* Digest speed tests