diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-10-18 13:33:22 +0300 | 
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-11-09 11:57:56 +0800 | 
| commit | 5209c07ac3601cfdbe2edff016e80ad93cee8dbc (patch) | |
| tree | de277911051a3715cbbf2b37d1f254796717feee | |
| parent | 18be20b9445731c57ef2fa0c7c9e71ac1b4a7872 (diff) | |
| download | olio-linux-3.10-5209c07ac3601cfdbe2edff016e80ad93cee8dbc.tar.xz olio-linux-3.10-5209c07ac3601cfdbe2edff016e80ad93cee8dbc.zip  | |
crypto: tcrypt - add xts(serpent) tests
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/tcrypt.c | 9 | ||||
| -rw-r--r-- | crypto/tcrypt.h | 1 | 
2 files changed, 10 insertions, 0 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 01203833ccc..a66459594be 100644 --- a/crypto/tcrypt.c +++ b/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/crypto/tcrypt.h b/crypto/tcrypt.h index 3eceaef2754..5be1fc8c1ab 100644 --- a/crypto/tcrypt.h +++ b/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  |