diff options
author | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
commit | 4c2d6cb3bde307e7db8e95181cb66cf72ea5f253 (patch) | |
tree | 751bd51f7ec26e0d752c1a974c3d6c9bfc0604cb /crypto/testmgr.c | |
parent | 60c61f0d0919094cede7f96cf52cc79829b82e02 (diff) | |
parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
download | linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.tar.gz linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.zip |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
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 2f006070..ecddf921 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, |