diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
commit | 21e3a539957468d04a7d4f9461332d1199adec16 (patch) | |
tree | 1862c879e19589359002e0622da83bc6152cbb9c /crypto/testmgr.c | |
parent | 796be36a9b84fab6b1a150399ec1f9b2267c0a7e (diff) | |
parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
download | linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.tar.gz linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r-- | crypto/testmgr.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index e091ef6e..b7bc2e70 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -2046,16 +2046,6 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { - .alg = "crct10dif", - .test = alg_test_hash, - .fips_allowed = 1, - .suite = { - .hash = { - .vecs = crct10dif_tv_template, - .count = CRCT10DIF_TEST_VECTORS - } - } - }, { .alg = "cryptd(__driver-cbc-aes-aesni)", .test = alg_test_null, .fips_allowed = 1, |