diff options
| author | Horia Geantă <horia.geanta@nxp.com> | 2018-09-19 17:54:21 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-09-28 12:46:26 +0800 |
| commit | 4d407b04d4f3900ac9d6379c5f22364a9ef66ba6 (patch) | |
| tree | de05f9bad00c5d6504f323d6b7e0679d2b65ed0b | |
| parent | a6f37cee6e4f6fa9d61962efbcb06a032efed1ba (diff) | |
| download | linux-4d407b04d4f3900ac9d6379c5f22364a9ef66ba6.tar.gz | |
crypto: tcrypt - remove remnants of pcomp-based zlib
Commit 110492183c4b ("crypto: compress - remove unused pcomp interface")
removed pcomp interface but missed cleaning up tcrypt.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/tcrypt.c | 7 | ||||
| -rw-r--r-- | crypto/testmgr.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 6e0a054bb61d..4385abe1f547 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -76,8 +76,7 @@ static char *check[] = { "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", - "lzo", "cts", "zlib", "sha3-224", "sha3-256", "sha3-384", "sha3-512", - NULL + "lzo", "cts", "sha3-224", "sha3-256", "sha3-384", "sha3-512", NULL }; static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 }; @@ -1881,10 +1880,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) ret += tcrypt_test("ecb(seed)"); break; - case 44: - ret += tcrypt_test("zlib"); - break; - case 45: ret += tcrypt_test("rfc4309(ccm(aes))"); break; diff --git a/crypto/testmgr.h b/crypto/testmgr.h index 47629cb1efd3..adfe23e18fb3 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -24,8 +24,6 @@ #ifndef _CRYPTO_TESTMGR_H #define _CRYPTO_TESTMGR_H -#include <linux/netlink.h> - #define MAX_DIGEST_SIZE 64 #define MAX_TAP 8 |