crypto: tcrypt - include larger key sizes in RFC4106 benchmark

RFC4106 wraps AES in GCM mode, and can be used with larger key sizes
than 128/160 bits, just like AES itself. So add these to the tcrypt
recipe so they will be benchmarked as well.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index a083365..6521fee 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -2044,11 +2044,11 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
 
        case 211:
                test_aead_speed("rfc4106(gcm(aes))", ENCRYPT, sec,
-                               NULL, 0, 16, 16, aead_speed_template_20);
+                               NULL, 0, 16, 16, aead_speed_template_20_28_36);
                test_aead_speed("gcm(aes)", ENCRYPT, sec,
                                NULL, 0, 16, 8, speed_template_16_24_32);
                test_aead_speed("rfc4106(gcm(aes))", DECRYPT, sec,
-                               NULL, 0, 16, 16, aead_speed_template_20);
+                               NULL, 0, 16, 16, aead_speed_template_20_28_36);
                test_aead_speed("gcm(aes)", DECRYPT, sec,
                                NULL, 0, 16, 8, speed_template_16_24_32);
                break;
@@ -2074,11 +2074,11 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
 
        case 215:
                test_mb_aead_speed("rfc4106(gcm(aes))", ENCRYPT, sec, NULL,
-                                  0, 16, 16, aead_speed_template_20, num_mb);
+                                  0, 16, 16, aead_speed_template_20_28_36, num_mb);
                test_mb_aead_speed("gcm(aes)", ENCRYPT, sec, NULL, 0, 16, 8,
                                   speed_template_16_24_32, num_mb);
                test_mb_aead_speed("rfc4106(gcm(aes))", DECRYPT, sec, NULL,
-                                  0, 16, 16, aead_speed_template_20, num_mb);
+                                  0, 16, 16, aead_speed_template_20_28_36, num_mb);
                test_mb_aead_speed("gcm(aes)", DECRYPT, sec, NULL, 0, 16, 8,
                                   speed_template_16_24_32, num_mb);
                break;

diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 9f65467..96c843a 100644 (file)
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -62,7 +62,7 @@ static u8 speed_template_32[] = {32, 0};
  * AEAD speed tests
  */
 static u8 aead_speed_template_19[] = {19, 0};
-static u8 aead_speed_template_20[] = {20, 0};
+static u8 aead_speed_template_20_28_36[] = {20, 28, 36, 0};
 static u8 aead_speed_template_36[] = {36, 0};
 
 /*