Commit 6941c3a0 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: hash - Remove legacy hash/digest implementaion 



This patch removes the implementation of hash and digest now that
no algorithms use them anymore.  The interface though will remain
until the users are converted across.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9ef074fa

crypto/Makefile

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



obj-$(CONFIG_CRYPTO) += crypto.o

crypto-objs := api.o cipher.o digest.o compress.o

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



obj-$(CONFIG_CRYPTO_WORKQUEUE) += crypto_wq.o
@@ -22,7 +22,6 @@ obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o 
obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o



crypto_hash-objs := hash.o

crypto_hash-objs += ahash.o

crypto_hash-objs += shash.o

obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o

crypto/api.c

+2 −17
Original line number Diff line number Diff line
@@ -286,13 +286,6 @@ static int crypto_init_ops(struct crypto_tfm *tfm, u32 type, u32 mask) 
	case CRYPTO_ALG_TYPE_CIPHER:

		return crypto_init_cipher_ops(tfm);



	case CRYPTO_ALG_TYPE_DIGEST:

		if ((mask & CRYPTO_ALG_TYPE_HASH_MASK) !=

		    CRYPTO_ALG_TYPE_HASH_MASK)

			return crypto_init_digest_ops_async(tfm);

		else

			return crypto_init_digest_ops(tfm);



	case CRYPTO_ALG_TYPE_COMPRESS:

		return crypto_init_compress_ops(tfm);
@@ -319,10 +312,6 @@ static void crypto_exit_ops(struct crypto_tfm *tfm) 
		crypto_exit_cipher_ops(tfm);

		break;



	case CRYPTO_ALG_TYPE_DIGEST:

		crypto_exit_digest_ops(tfm);

		break;

		

	case CRYPTO_ALG_TYPE_COMPRESS:

		crypto_exit_compress_ops(tfm);

		break;
@@ -350,10 +339,6 @@ static unsigned int crypto_ctxsize(struct crypto_alg *alg, u32 type, u32 mask) 
		len += crypto_cipher_ctxsize(alg);

		break;



	case CRYPTO_ALG_TYPE_DIGEST:

		len += crypto_digest_ctxsize(alg);

		break;

		

	case CRYPTO_ALG_TYPE_COMPRESS:

		len += crypto_compress_ctxsize(alg);

		break;

crypto/internal.h

+0 −15
Original line number Diff line number Diff line
@@ -60,18 +60,6 @@ static inline void crypto_exit_proc(void) 
{ }

#endif



static inline unsigned int crypto_digest_ctxsize(struct crypto_alg *alg)

{

	unsigned int len = alg->cra_ctxsize;



	if (alg->cra_alignmask) {

		len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);

		len += alg->cra_digest.dia_digestsize;

	}



	return len;

}



static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg)

{

	return alg->cra_ctxsize;
@@ -86,12 +74,9 @@ struct crypto_alg *crypto_mod_get(struct crypto_alg *alg); 
struct crypto_alg *crypto_alg_lookup(const char *name, u32 type, u32 mask);

struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);



int crypto_init_digest_ops(struct crypto_tfm *tfm);

int crypto_init_digest_ops_async(struct crypto_tfm *tfm);

int crypto_init_cipher_ops(struct crypto_tfm *tfm);

int crypto_init_compress_ops(struct crypto_tfm *tfm);



void crypto_exit_digest_ops(struct crypto_tfm *tfm);

void crypto_exit_cipher_ops(struct crypto_tfm *tfm);

void crypto_exit_compress_ops(struct crypto_tfm *tfm);