diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 12:59:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 12:59:55 +0000 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /crypto/tcrypt.c | |
| parent | 43f627ac9de42607b2cdcc7a41f2bcc82187e06a (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
| download | op-kernel-dev-68066bb378a0504439e046cdb55d88362eb6379d.zip op-kernel-dev-68066bb378a0504439e046cdb55d88362eb6379d.tar.gz | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 1ab8258..001f07c 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1242,6 +1242,10 @@ static int do_test(int m) ret += tcrypt_test("cmac(des3_ede)"); break; + case 155: + ret += tcrypt_test("authenc(hmac(sha1),cbc(aes))"); + break; + case 200: test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0, speed_template_16_24_32); |
