From: Tan Swee Heng <thesweeheng@gmail.com>
Date: Fri, 7 Dec 2007 09:17:43 +0000 (+0800)
Subject: [CRYPTO] tcrypt: Added salsa20 speed test
X-Git-Tag: v2.6.25-rc1~1242^2~58
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5de8f1b562e87ae9d93a4e0897e54c18a5e82915;p=linux-2.6-omap-h63xx.git

[CRYPTO] tcrypt: Added salsa20 speed test

This patch adds a simple speed test for salsa20.
Usage: modprobe tcrypt mode=206

Signed-of-by: Tan Swee Heng <thesweeheng@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 943a514478b..0cfb8ebb22b 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1668,6 +1668,11 @@ static void do_test(void)
 				camellia_speed_template);
 		break;
 
+	case 206:
+		test_cipher_speed("salsa20", ENCRYPT, sec, NULL, 0,
+				  salsa20_speed_template);
+		break;
+
 	case 300:
 		/* fall through */
 
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 175f26a58e2..5b865092151 100644
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -7947,4 +7947,20 @@ static struct cipher_speed camellia_speed_template[] = {
       {  .klen = 0, .blen = 0, }
 };
 
+static struct cipher_speed salsa20_speed_template[] = {
+      { .klen = 16, .blen = 16, },
+      { .klen = 16, .blen = 64, },
+      { .klen = 16, .blen = 256, },
+      { .klen = 16, .blen = 1024, },
+      { .klen = 16, .blen = 8192, },
+      { .klen = 32, .blen = 16, },
+      { .klen = 32, .blen = 64, },
+      { .klen = 32, .blen = 256, },
+      { .klen = 32, .blen = 1024, },
+      { .klen = 32, .blen = 8192, },
+
+      /* End marker */
+      {  .klen = 0, .blen = 0, }
+};
+
 #endif	/* _CRYPTO_TCRYPT_H */