From e5cca2d7e97887b0fd54869d01f05dfd5e29117f Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Tue, 18 Oct 2011 13:33:22 +0300 Subject: [PATCH] --- yaml --- r: 283279 b: refs/heads/master c: 5209c07ac3601cfdbe2edff016e80ad93cee8dbc h: refs/heads/master i: 283277: 661d4db161eb8f19357ada55c3d9b718fc6bf896 283275: 97746e5a79863de1ac4d89e5cb26c9dcc4929d83 283271: 8249197a9d9807e80b1a554c34670d00dad14d09 283263: 86cd68d0ef8dfa4b98693fd8f6f7f4e16e9fd426 v: v3 --- [refs] | 2 +- trunk/crypto/tcrypt.c | 9 +++++++++ trunk/crypto/tcrypt.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 724f16872de8..5283da64f0ee 100644 --- 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 index 01203833ccc2..a66459594bed 100644 --- 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 index 3eceaef2754d..5be1fc8c1ab3 100644 --- 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