---

yaml --- r: 283279 b: refs/heads/master c: 5209c07 h: refs/heads/master i: 283277: 661d4db 283275: 97746e5 283271: 8249197 283263: 86cd68d v: v3
git-mirror · Nov 9, 2011 · e5cca2d · e5cca2d
1 parent 845f9ed
commit e5cca2d
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: 18be20b9445731c57ef2fa0c7c9e71ac1b4a7872
+refs/heads/master: 5209c07ac3601cfdbe2edff016e80ad93cee8dbc
diff --git a/trunk/crypto/tcrypt.c b/trunk/crypto/tcrypt.c
@@ -998,6 +998,7 @@ static int do_test(int m)
 		ret += tcrypt_test("cbc(serpent)");
 		ret += tcrypt_test("ctr(serpent)");
 		ret += tcrypt_test("lrw(serpent)");
+		ret += tcrypt_test("xts(serpent)");
 		break;
 
 	case 10:
@@ -1315,6 +1316,10 @@ static int do_test(int m)
 				  speed_template_32_48);
 		test_cipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,
 				  speed_template_32_48);
+		test_cipher_speed("xts(serpent)", ENCRYPT, sec, NULL, 0,
+				  speed_template_32_64);
+		test_cipher_speed("xts(serpent)", DECRYPT, sec, NULL, 0,
+				  speed_template_32_64);
 		break;
 
 	case 300:
@@ -1535,6 +1540,10 @@ static int do_test(int m)
 				   speed_template_32_48);
 		test_acipher_speed("lrw(serpent)", DECRYPT, sec, NULL, 0,
 				   speed_template_32_48);
+		test_acipher_speed("xts(serpent)", ENCRYPT, sec, NULL, 0,
+				   speed_template_32_64);
+		test_acipher_speed("xts(serpent)", DECRYPT, sec, NULL, 0,
+				   speed_template_32_64);
 		break;
 
 	case 1000:

diff --git a/trunk/crypto/tcrypt.h b/trunk/crypto/tcrypt.h
@@ -53,6 +53,7 @@ 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};
+static u8 speed_template_32_64[] = {32, 64, 0};
 
 /*
  * Digest speed tests