korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: tcrypt - remove remnants of pcomp-based zlib

Browse Source 
Commit 110492183c ("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>
This commit is contained in:
Horia Geantă 2018-09-19 17:54:21 +03:00 committed by Herbert Xu
parent a6f37cee6e
commit 4d407b04d4
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/tcrypt.c
View File

@ -76,8 +76,7 @@ static char *check[] = {
"cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
"khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt",
"camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320",
"lzo", "cts", "zlib", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "lzo", "cts", "sha3-224", "sha3-256", "sha3-384", "sha3-512", NULL
NULL
}; };
static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 }; 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)"); ret += tcrypt_test("ecb(seed)");
break; break;
case 44:
ret += tcrypt_test("zlib");
break;
case 45: case 45:
ret += tcrypt_test("rfc4309(ccm(aes))"); ret += tcrypt_test("rfc4309(ccm(aes))");
break; break;

2
crypto/testmgr.h
View File

@ -24,8 +24,6 @@
#ifndef _CRYPTO_TESTMGR_H #ifndef _CRYPTO_TESTMGR_H
#define _CRYPTO_TESTMGR_H #define _CRYPTO_TESTMGR_H
#include <linux/netlink.h>
#define MAX_DIGEST_SIZE 64 #define MAX_DIGEST_SIZE 64
#define MAX_TAP 8 #define MAX_TAP 8