Commit fce8b8d5 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: remove obsolete 'comp' compression API 



The 'comp' compression API has been superseded by the acomp API, which
is a bit more cumbersome to use, but ultimately more flexible when it
comes to hardware implementations.

Now that all the users and implementations have been removed, let's
remove the core plumbing of the 'comp' API as well.

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

Documentation/crypto/architecture.rst

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ the aforementioned cipher types: 


-  CRYPTO_ALG_TYPE_CIPHER Single block cipher



-  CRYPTO_ALG_TYPE_COMPRESS Compression



-  CRYPTO_ALG_TYPE_AEAD Authenticated Encryption with Associated Data

   (MAC)

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



obj-$(CONFIG_CRYPTO) += crypto.o

crypto-y := api.o cipher.o compress.o

crypto-y := api.o cipher.o



obj-$(CONFIG_CRYPTO_ENGINE) += crypto_engine.o

obj-$(CONFIG_CRYPTO_FIPS) += fips.o

crypto/api.c

+0 −4
Original line number Diff line number Diff line
@@ -383,10 +383,6 @@ static unsigned int crypto_ctxsize(struct crypto_alg *alg, u32 type, u32 mask) 
	case CRYPTO_ALG_TYPE_CIPHER:

		len += crypto_cipher_ctxsize(alg);

		break;



	case CRYPTO_ALG_TYPE_COMPRESS:

		len += crypto_compress_ctxsize(alg);

		break;

	}



	return len;

crypto/compress.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Cryptographic API.

 *

 * Compression operations.

 *

 * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>

 */

#include <linux/crypto.h>

#include "internal.h"



int crypto_comp_compress(struct crypto_comp *comp,

			 const u8 *src, unsigned int slen,

			 u8 *dst, unsigned int *dlen)

{

	struct crypto_tfm *tfm = crypto_comp_tfm(comp);



	return tfm->__crt_alg->cra_compress.coa_compress(tfm, src, slen, dst,

	                                                 dlen);

}

EXPORT_SYMBOL_GPL(crypto_comp_compress);



int crypto_comp_decompress(struct crypto_comp *comp,

			   const u8 *src, unsigned int slen,

			   u8 *dst, unsigned int *dlen)

{

	struct crypto_tfm *tfm = crypto_comp_tfm(comp);



	return tfm->__crt_alg->cra_compress.coa_decompress(tfm, src, slen, dst,

	                                                   dlen);

}

EXPORT_SYMBOL_GPL(crypto_comp_decompress);

crypto/crypto_user.c

+0 −16
Original line number Diff line number Diff line
@@ -84,17 +84,6 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg) 
		       sizeof(rcipher), &rcipher);

}



static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)

{

	struct crypto_report_comp rcomp;



	memset(&rcomp, 0, sizeof(rcomp));



	strscpy(rcomp.type, "compression", sizeof(rcomp.type));



	return nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS, sizeof(rcomp), &rcomp);

}



static int crypto_report_one(struct crypto_alg *alg,

			     struct crypto_user_alg *ualg, struct sk_buff *skb)

{
@@ -135,11 +124,6 @@ static int crypto_report_one(struct crypto_alg *alg, 
		if (crypto_report_cipher(skb, alg))

			goto nla_put_failure;



		break;

	case CRYPTO_ALG_TYPE_COMPRESS:

		if (crypto_report_comp(skb, alg))

			goto nla_put_failure;



		break;

	}