---

yaml --- r: 283272 b: refs/heads/master c: 87aae4b h: refs/heads/master v: v3
git-mirror · Nov 9, 2011 · 28f0509 · 28f0509
1 parent 8249197
commit 28f0509
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7bfc0fa31bc237a5d49e9c5638676a5dedff6fc
+refs/heads/master: 87aae4bfb2912d18f2c92a4484b9edcc8c7b3f21
diff --git a/trunk/crypto/tcrypt.c b/trunk/crypto/tcrypt.c
@@ -996,6 +996,7 @@ static int do_test(int m)
 		ret += tcrypt_test("ecb(serpent)");
 		ret += tcrypt_test("cbc(serpent)");
 		ret += tcrypt_test("ctr(serpent)");
+		ret += tcrypt_test("lrw(serpent)");
 		break;
 
 	case 10:
@@ -1305,6 +1306,10 @@ static int do_test(int m)
 				  speed_template_16_32);
 		test_cipher_speed("ctr(serpent)", DECRYPT, sec, NULL, 0,
 				  speed_template_16_32);
+		test_cipher_speed("lrw(serpent)", ENCRYPT, sec, NULL, 0,
+				  speed_template_32_48);
+		test_cipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,
+				  speed_template_32_48);
 		break;
 
 	case 300:
@@ -1521,6 +1526,10 @@ static int do_test(int m)
 				   speed_template_16_32);
 		test_acipher_speed("ctr(serpent)", DECRYPT, sec, NULL, 0,
 				   speed_template_16_32);
+		test_acipher_speed("lrw(serpent)", ENCRYPT, sec, NULL, 0,
+				   speed_template_32_48);
+		test_acipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,
+				   speed_template_32_48);
 		break;
 
 	case 1000:

diff --git a/trunk/crypto/tcrypt.h b/trunk/crypto/tcrypt.h
@@ -51,6 +51,7 @@ static u8 speed_template_8_32[] = {8, 32, 0};
 static u8 speed_template_16_32[] = {16, 32, 0};
 static u8 speed_template_16_24_32[] = {16, 24, 32, 0};
 static u8 speed_template_32_40_48[] = {32, 40, 48, 0};
+static u8 speed_template_32_48[] = {32, 48, 0};
 static u8 speed_template_32_48_64[] = {32, 48, 64, 0};
 
 /*