Commit 62a465c2 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: deflate - Remove zlib-deflate 



Remove the implementation of zlib-deflate because it is completely
unused in the kernel.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent e9dd20e0

crypto/deflate.c

+17 −44
Original line number Diff line number Diff line
@@ -39,23 +39,19 @@ struct deflate_ctx { 
	struct z_stream_s decomp_stream;

};



static int deflate_comp_init(struct deflate_ctx *ctx, int format)

static int deflate_comp_init(struct deflate_ctx *ctx)

{

	int ret = 0;

	struct z_stream_s *stream = &ctx->comp_stream;



	stream->workspace = vzalloc(zlib_deflate_workspacesize(

				    MAX_WBITS, MAX_MEM_LEVEL));

				    -DEFLATE_DEF_WINBITS, MAX_MEM_LEVEL));

	if (!stream->workspace) {

		ret = -ENOMEM;

		goto out;

	}

	if (format)

		ret = zlib_deflateInit(stream, 3);

	else

	ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,

					-DEFLATE_DEF_WINBITS,

					DEFLATE_DEF_MEMLEVEL,

				-DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL,

				Z_DEFAULT_STRATEGY);

	if (ret != Z_OK) {

		ret = -EINVAL;
@@ -68,7 +64,7 @@ static int deflate_comp_init(struct deflate_ctx *ctx, int format) 
	goto out;

}



static int deflate_decomp_init(struct deflate_ctx *ctx, int format)

static int deflate_decomp_init(struct deflate_ctx *ctx)

{

	int ret = 0;

	struct z_stream_s *stream = &ctx->decomp_stream;
@@ -78,9 +74,6 @@ static int deflate_decomp_init(struct deflate_ctx *ctx, int format) 
		ret = -ENOMEM;

		goto out;

	}

	if (format)

		ret = zlib_inflateInit(stream);

	else

	ret = zlib_inflateInit2(stream, -DEFLATE_DEF_WINBITS);

	if (ret != Z_OK) {

		ret = -EINVAL;
@@ -105,21 +98,21 @@ static void deflate_decomp_exit(struct deflate_ctx *ctx) 
	vfree(ctx->decomp_stream.workspace);

}



static int __deflate_init(void *ctx, int format)

static int __deflate_init(void *ctx)

{

	int ret;



	ret = deflate_comp_init(ctx, format);

	ret = deflate_comp_init(ctx);

	if (ret)

		goto out;

	ret = deflate_decomp_init(ctx, format);

	ret = deflate_decomp_init(ctx);

	if (ret)

		deflate_comp_exit(ctx);

out:

	return ret;

}



static void *gen_deflate_alloc_ctx(struct crypto_scomp *tfm, int format)

static void *deflate_alloc_ctx(struct crypto_scomp *tfm)

{

	struct deflate_ctx *ctx;

	int ret;
@@ -128,7 +121,7 @@ static void *gen_deflate_alloc_ctx(struct crypto_scomp *tfm, int format) 
	if (!ctx)

		return ERR_PTR(-ENOMEM);



	ret = __deflate_init(ctx, format);

	ret = __deflate_init(ctx);

	if (ret) {

		kfree(ctx);

		return ERR_PTR(ret);
@@ -137,21 +130,11 @@ static void *gen_deflate_alloc_ctx(struct crypto_scomp *tfm, int format) 
	return ctx;

}



static void *deflate_alloc_ctx(struct crypto_scomp *tfm)

{

	return gen_deflate_alloc_ctx(tfm, 0);

}



static void *zlib_deflate_alloc_ctx(struct crypto_scomp *tfm)

{

	return gen_deflate_alloc_ctx(tfm, 1);

}



static int deflate_init(struct crypto_tfm *tfm)

{

	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);



	return __deflate_init(ctx, 0);

	return __deflate_init(ctx);

}



static void __deflate_exit(void *ctx)
@@ -286,7 +269,7 @@ static struct crypto_alg alg = { 
	.coa_decompress  	= deflate_decompress } }

};



static struct scomp_alg scomp[] = { {

static struct scomp_alg scomp = {

	.alloc_ctx		= deflate_alloc_ctx,

	.free_ctx		= deflate_free_ctx,

	.compress		= deflate_scompress,
@@ -296,17 +279,7 @@ static struct scomp_alg scomp[] = { { 
		.cra_driver_name = "deflate-scomp",

		.cra_module	 = THIS_MODULE,

	}

}, {

	.alloc_ctx		= zlib_deflate_alloc_ctx,

	.free_ctx		= deflate_free_ctx,

	.compress		= deflate_scompress,

	.decompress		= deflate_sdecompress,

	.base			= {

		.cra_name	= "zlib-deflate",

		.cra_driver_name = "zlib-deflate-scomp",

		.cra_module	 = THIS_MODULE,

	}

} };

};



static int __init deflate_mod_init(void)

{
@@ -316,7 +289,7 @@ static int __init deflate_mod_init(void) 
	if (ret)

		return ret;



	ret = crypto_register_scomps(scomp, ARRAY_SIZE(scomp));

	ret = crypto_register_scomp(&scomp);

	if (ret) {

		crypto_unregister_alg(&alg);

		return ret;
@@ -328,7 +301,7 @@ static int __init deflate_mod_init(void) 
static void __exit deflate_mod_fini(void)

{

	crypto_unregister_alg(&alg);

	crypto_unregister_scomps(scomp, ARRAY_SIZE(scomp));

	crypto_unregister_scomp(&scomp);

}



subsys_initcall(deflate_mod_init);