summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorFranck LENORMAND <franck.lenormand@nxp.com>2018-09-19 19:09:31 +0200
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:34:15 +0800
commitc594f9aec462350a9ebc43bb2c4795016695fb2f (patch)
treeaf4f709d548174570de5760d588ef9277f99375e /crypto
parent7d165ab807527ed37230e2fc481c7d40ded83197 (diff)
MLK-19365: 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: Franck LENORMAND <franck.lenormand@nxp.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/tcrypt.c7
-rw-r--r--crypto/testmgr.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 8daf4c3a3e53..f7890aff8d1a 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -75,8 +75,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
};
struct tcrypt_result {
@@ -1244,10 +1243,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m)
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 fbc0fab5e79e..97adf7247ce0 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