1 files changed, 17 insertions, 1 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 3ca68f9fc14d..2222617b3bed 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -8,6 +8,13 @@
  * Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org>
  * Copyright (c) 2007 Nokia Siemens Networks
  *
+ * Updated RFC4106 AES-GCM testing.
+ *    Authors: Aidan O'Mahony (aidan.o.mahony@intel.com)
+ *             Adrian Hoban <adrian.hoban@intel.com>
+ *             Gabriele Paoloni <gabriele.paoloni@intel.com>
+ *             Tadeusz Struk (tadeusz.struk@intel.com)
+ *             Copyright (c) 2010, Intel Corporation.
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
@@ -139,7 +146,8 @@ static void test_cipher_speed(const char *algo, int enc, unsigned int sec,
                               unsigned int tcount, u8 *keysize)
 {
         unsigned int ret, i, j, iv_len;
-        const char *key, iv[128];
+        const char *key;
+        char iv[128];
         struct crypto_blkcipher *tfm;
         struct blkcipher_desc desc;
         const char *e;
@@ -980,6 +988,10 @@ static int do_test(int m)
                 ret += tcrypt_test("ansi_cprng");
                 break;
 
+        case 151:
+                ret += tcrypt_test("rfc4106(gcm(aes))");
+                break;
+
         case 200:
                 test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                 speed_template_16_24_32);
@@ -997,6 +1009,10 @@ static int do_test(int m)
                                 speed_template_32_48_64);
                 test_cipher_speed("xts(aes)", DECRYPT, sec, NULL, 0,
                                 speed_template_32_48_64);
+                test_cipher_speed("ctr(aes)", ENCRYPT, sec, NULL, 0,
+                                speed_template_16_24_32);
+                test_cipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,
+                                speed_template_16_24_32);
                 break;
 
         case 201: