Commit 34a1c740 authored by Herbert Xu's avatar Herbert Xu

crypto: tcrypt - Add support for new IV convention

This patch allows the AEAD speed tests to cope with the new seqiv
calling convention as well as the old one.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 85375446
...@@ -344,7 +344,12 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, ...@@ -344,7 +344,12 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
goto out_nosg; goto out_nosg;
sgout = &sg[9]; sgout = &sg[9];
tfm = crypto_alloc_aead(algo, 0, 0); tfm = crypto_alloc_aead(algo, CRYPTO_ALG_AEAD_NEW,
CRYPTO_ALG_AEAD_NEW);
if (PTR_ERR(tfm) == -ENOENT) {
aad_size -= 8;
tfm = crypto_alloc_aead(algo, 0, CRYPTO_ALG_AEAD_NEW);
}
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
pr_err("alg: aead: Failed to load transform for %s: %ld\n", algo, pr_err("alg: aead: Failed to load transform for %s: %ld\n", algo,
...@@ -1778,14 +1783,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m) ...@@ -1778,14 +1783,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m)
case 211: case 211:
test_aead_speed("rfc4106(gcm(aes))", ENCRYPT, sec, test_aead_speed("rfc4106(gcm(aes))", ENCRYPT, sec,
NULL, 0, 16, 8, aead_speed_template_20); NULL, 0, 16, 16, aead_speed_template_20);
test_aead_speed("gcm(aes)", ENCRYPT, sec, test_aead_speed("gcm(aes)", ENCRYPT, sec,
NULL, 0, 16, 8, aead_speed_template_20); NULL, 0, 16, 8, aead_speed_template_20);
break; break;
case 212: case 212:
test_aead_speed("rfc4309(ccm(aes))", ENCRYPT, sec, test_aead_speed("rfc4309(ccm(aes))", ENCRYPT, sec,
NULL, 0, 16, 8, aead_speed_template_19); NULL, 0, 16, 16, aead_speed_template_19);
break; break;
case 300: case 300:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment