diff options
author | Joonsoo Kim <js1304@gmail.com> | 2016-01-26 03:15:03 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-27 07:36:24 -0500 |
commit | 110492183c4b8f572b16fce096b9d78e2da30baf (patch) | |
tree | 89502e3140cba8a074a2996e53172db637c31d1e /crypto/testmgr.h | |
parent | 10cff58c6772587f9df422dc1dfaca936c66be1f (diff) |
crypto: compress - remove unused pcomp interface
It is unused now, so remove it.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.h')
-rw-r--r-- | crypto/testmgr.h | 144 |
1 files changed, 0 insertions, 144 deletions
diff --git a/crypto/testmgr.h b/crypto/testmgr.h index da0a8fd765f4..487ec880e889 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h | |||
@@ -25,9 +25,6 @@ | |||
25 | #define _CRYPTO_TESTMGR_H | 25 | #define _CRYPTO_TESTMGR_H |
26 | 26 | ||
27 | #include <linux/netlink.h> | 27 | #include <linux/netlink.h> |
28 | #include <linux/zlib.h> | ||
29 | |||
30 | #include <crypto/compress.h> | ||
31 | 28 | ||
32 | #define MAX_DIGEST_SIZE 64 | 29 | #define MAX_DIGEST_SIZE 64 |
33 | #define MAX_TAP 8 | 30 | #define MAX_TAP 8 |
@@ -32268,14 +32265,6 @@ struct comp_testvec { | |||
32268 | char output[COMP_BUF_SIZE]; | 32265 | char output[COMP_BUF_SIZE]; |
32269 | }; | 32266 | }; |
32270 | 32267 | ||
32271 | struct pcomp_testvec { | ||
32272 | const void *params; | ||
32273 | unsigned int paramsize; | ||
32274 | int inlen, outlen; | ||
32275 | char input[COMP_BUF_SIZE]; | ||
32276 | char output[COMP_BUF_SIZE]; | ||
32277 | }; | ||
32278 | |||
32279 | /* | 32268 | /* |
32280 | * Deflate test vectors (null-terminated strings). | 32269 | * Deflate test vectors (null-terminated strings). |
32281 | * Params: winbits=-11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL. | 32270 | * Params: winbits=-11, Z_DEFAULT_COMPRESSION, MAX_MEM_LEVEL. |
@@ -32356,139 +32345,6 @@ static struct comp_testvec deflate_decomp_tv_template[] = { | |||
32356 | }, | 32345 | }, |
32357 | }; | 32346 | }; |
32358 | 32347 | ||
32359 | #define ZLIB_COMP_TEST_VECTORS 2 | ||
32360 | #define ZLIB_DECOMP_TEST_VECTORS 2 | ||
32361 | |||
32362 | static const struct { | ||
32363 | struct nlattr nla; | ||
32364 | int val; | ||
32365 | } deflate_comp_params[] = { | ||
32366 | { | ||
32367 | .nla = { | ||
32368 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32369 | .nla_type = ZLIB_COMP_LEVEL, | ||
32370 | }, | ||
32371 | .val = Z_DEFAULT_COMPRESSION, | ||
32372 | }, { | ||
32373 | .nla = { | ||
32374 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32375 | .nla_type = ZLIB_COMP_METHOD, | ||
32376 | }, | ||
32377 | .val = Z_DEFLATED, | ||
32378 | }, { | ||
32379 | .nla = { | ||
32380 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32381 | .nla_type = ZLIB_COMP_WINDOWBITS, | ||
32382 | }, | ||
32383 | .val = -11, | ||
32384 | }, { | ||
32385 | .nla = { | ||
32386 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32387 | .nla_type = ZLIB_COMP_MEMLEVEL, | ||
32388 | }, | ||
32389 | .val = MAX_MEM_LEVEL, | ||
32390 | }, { | ||
32391 | .nla = { | ||
32392 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32393 | .nla_type = ZLIB_COMP_STRATEGY, | ||
32394 | }, | ||
32395 | .val = Z_DEFAULT_STRATEGY, | ||
32396 | } | ||
32397 | }; | ||
32398 | |||
32399 | static const struct { | ||
32400 | struct nlattr nla; | ||
32401 | int val; | ||
32402 | } deflate_decomp_params[] = { | ||
32403 | { | ||
32404 | .nla = { | ||
32405 | .nla_len = NLA_HDRLEN + sizeof(int), | ||
32406 | .nla_type = ZLIB_DECOMP_WINDOWBITS, | ||
32407 | }, | ||
32408 | .val = -11, | ||
32409 | } | ||
32410 | }; | ||
32411 | |||
32412 | static struct pcomp_testvec zlib_comp_tv_template[] = { | ||
32413 | { | ||
32414 | .params = &deflate_comp_params, | ||
32415 | .paramsize = sizeof(deflate_comp_params), | ||
32416 | .inlen = 70, | ||
32417 | .outlen = 38, | ||
32418 | .input = "Join us now and share the software " | ||
32419 | "Join us now and share the software ", | ||
32420 | .output = "\xf3\xca\xcf\xcc\x53\x28\x2d\x56" | ||
32421 | "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51" | ||
32422 | "\x28\xce\x48\x2c\x4a\x55\x28\xc9" | ||
32423 | "\x48\x55\x28\xce\x4f\x2b\x29\x07" | ||
32424 | "\x71\xbc\x08\x2b\x01\x00", | ||
32425 | }, { | ||
32426 | .params = &deflate_comp_params, | ||
32427 | .paramsize = sizeof(deflate_comp_params), | ||
32428 | .inlen = 191, | ||
32429 | .outlen = 122, | ||
32430 | .input = "This document describes a compression method based on the DEFLATE" | ||
32431 | "compression algorithm. This document defines the application of " | ||
32432 | "the DEFLATE algorithm to the IP Payload Compression Protocol.", | ||
32433 | .output = "\x5d\x8d\x31\x0e\xc2\x30\x10\x04" | ||
32434 | "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09" | ||
32435 | "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8" | ||
32436 | "\x24\xdb\x67\xd9\x47\xc1\xef\x49" | ||
32437 | "\x68\x12\x51\xae\x76\x67\xd6\x27" | ||
32438 | "\x19\x88\x1a\xde\x85\xab\x21\xf2" | ||
32439 | "\x08\x5d\x16\x1e\x20\x04\x2d\xad" | ||
32440 | "\xf3\x18\xa2\x15\x85\x2d\x69\xc4" | ||
32441 | "\x42\x83\x23\xb6\x6c\x89\x71\x9b" | ||
32442 | "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f" | ||
32443 | "\xed\x62\xa9\x4c\x80\xff\x13\xaf" | ||
32444 | "\x52\x37\xed\x0e\x52\x6b\x59\x02" | ||
32445 | "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98" | ||
32446 | "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a" | ||
32447 | "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79" | ||
32448 | "\xfa\x02", | ||
32449 | }, | ||
32450 | }; | ||
32451 | |||
32452 | static struct pcomp_testvec zlib_decomp_tv_template[] = { | ||
32453 | { | ||
32454 | .params = &deflate_decomp_params, | ||
32455 | .paramsize = sizeof(deflate_decomp_params), | ||
32456 | .inlen = 122, | ||
32457 | .outlen = 191, | ||
32458 | .input = "\x5d\x8d\x31\x0e\xc2\x30\x10\x04" | ||
32459 | "\xbf\xb2\x2f\xc8\x1f\x10\x04\x09" | ||
32460 | "\x89\xc2\x85\x3f\x70\xb1\x2f\xf8" | ||
32461 | "\x24\xdb\x67\xd9\x47\xc1\xef\x49" | ||
32462 | "\x68\x12\x51\xae\x76\x67\xd6\x27" | ||
32463 | "\x19\x88\x1a\xde\x85\xab\x21\xf2" | ||
32464 | "\x08\x5d\x16\x1e\x20\x04\x2d\xad" | ||
32465 | "\xf3\x18\xa2\x15\x85\x2d\x69\xc4" | ||
32466 | "\x42\x83\x23\xb6\x6c\x89\x71\x9b" | ||
32467 | "\xef\xcf\x8b\x9f\xcf\x33\xca\x2f" | ||
32468 | "\xed\x62\xa9\x4c\x80\xff\x13\xaf" | ||
32469 | "\x52\x37\xed\x0e\x52\x6b\x59\x02" | ||
32470 | "\xd9\x4e\xe8\x7a\x76\x1d\x02\x98" | ||
32471 | "\xfe\x8a\x87\x83\xa3\x4f\x56\x8a" | ||
32472 | "\xb8\x9e\x8e\x5c\x57\xd3\xa0\x79" | ||
32473 | "\xfa\x02", | ||
32474 | .output = "This document describes a compression method based on the DEFLATE" | ||
32475 | "compression algorithm. This document defines the application of " | ||
32476 | "the DEFLATE algorithm to the IP Payload Compression Protocol.", | ||
32477 | }, { | ||
32478 | .params = &deflate_decomp_params, | ||
32479 | .paramsize = sizeof(deflate_decomp_params), | ||
32480 | .inlen = 38, | ||
32481 | .outlen = 70, | ||
32482 | .input = "\xf3\xca\xcf\xcc\x53\x28\x2d\x56" | ||
32483 | "\xc8\xcb\x2f\x57\x48\xcc\x4b\x51" | ||
32484 | "\x28\xce\x48\x2c\x4a\x55\x28\xc9" | ||
32485 | "\x48\x55\x28\xce\x4f\x2b\x29\x07" | ||
32486 | "\x71\xbc\x08\x2b\x01\x00", | ||
32487 | .output = "Join us now and share the software " | ||
32488 | "Join us now and share the software ", | ||
32489 | }, | ||
32490 | }; | ||
32491 | |||
32492 | /* | 32348 | /* |
32493 | * LZO test vectors (null-terminated strings). | 32349 | * LZO test vectors (null-terminated strings). |
32494 | */ | 32350 | */ |