diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
| commit | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (patch) | |
| tree | 751bd51f7ec26e0d752c1a974c3d6c9bfc0604cb /crypto/tcrypt.c | |
| parent | 60c61f0d0919094cede7f96cf52cc79829b82e02 (diff) | |
| parent | 7c94fc0f6b9930805bd48d408243aeef581c6935 (diff) | |
| download | linux-crypto-8c4fc164921ed8989d0e8a37d7669e5a81f7b44c.tar.gz linux-crypto-8c4fc164921ed8989d0e8a37d7669e5a81f7b44c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a memory corruption issue in caam, as well as
reverting the new optimised crct10dif implementation as it breaks boot
on initrd systems.
Hopefully crct10dif will be reinstated once the supporting code is
added so that it doesn't break boot"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
crypto: caam - Fixed the memory out of bound overwrite issue
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 25a5934f..66d254ce 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1174,10 +1174,6 @@ static int do_test(int m) ret += tcrypt_test("ghash"); break; - case 47: - ret += tcrypt_test("crct10dif"); - break; - case 100: ret += tcrypt_test("hmac(md5)"); break; @@ -1502,10 +1498,6 @@ static int do_test(int m) test_hash_speed("crc32c", sec, generic_hash_speed_template); if (mode > 300 && mode < 400) break; - case 320: - test_hash_speed("crct10dif", sec, generic_hash_speed_template); - if (mode > 300 && mode < 400) break; - case 399: break; |