Commit 2c985943 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: skcipher - Remove obsolete skcipher_alg helpers 



As skcipher spawn users can no longer assume the spawn is of type
struct skcipher_alg, these helpers are no longer used.  Remove them.

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

include/crypto/internal/skcipher.h

+0 −42
Original line number Diff line number Diff line
@@ -148,12 +148,6 @@ static inline void crypto_drop_lskcipher(struct crypto_lskcipher_spawn *spawn) 
	crypto_drop_spawn(&spawn->base);

}



static inline struct skcipher_alg *crypto_skcipher_spawn_alg(

	struct crypto_skcipher_spawn *spawn)

{

	return container_of(spawn->base.alg, struct skcipher_alg, base);

}



static inline struct lskcipher_alg *crypto_lskcipher_spawn_alg(

	struct crypto_lskcipher_spawn *spawn)

{
@@ -166,12 +160,6 @@ static inline struct skcipher_alg_common *crypto_spawn_skcipher_alg_common( 
	return container_of(spawn->base.alg, struct skcipher_alg_common, base);

}



static inline struct skcipher_alg *crypto_spawn_skcipher_alg(

	struct crypto_skcipher_spawn *spawn)

{

	return crypto_skcipher_spawn_alg(spawn);

}



static inline struct lskcipher_alg *crypto_spawn_lskcipher_alg(

	struct crypto_lskcipher_spawn *spawn)

{
@@ -269,36 +257,6 @@ static inline u32 skcipher_request_flags(struct skcipher_request *req) 
	return req->base.flags;

}



static inline unsigned int crypto_skcipher_alg_min_keysize(

	struct skcipher_alg *alg)

{

	return alg->min_keysize;

}



static inline unsigned int crypto_skcipher_alg_max_keysize(

	struct skcipher_alg *alg)

{

	return alg->max_keysize;

}



static inline unsigned int crypto_skcipher_alg_walksize(

	struct skcipher_alg *alg)

{

	return alg->walksize;

}



static inline unsigned int crypto_lskcipher_alg_min_keysize(

	struct lskcipher_alg *alg)

{

	return alg->co.min_keysize;

}



static inline unsigned int crypto_lskcipher_alg_max_keysize(

	struct lskcipher_alg *alg)

{

	return alg->co.max_keysize;

}



/* Helpers for simple block cipher modes of operation */

struct skcipher_ctx_simple {

	struct crypto_cipher *cipher;	/* underlying block cipher */

include/crypto/skcipher.h

+1 −24
Original line number Diff line number Diff line
@@ -395,17 +395,6 @@ static inline struct lskcipher_alg *crypto_lskcipher_alg( 
			    struct lskcipher_alg, co.base);

}



static inline unsigned int crypto_skcipher_alg_ivsize(struct skcipher_alg *alg)

{

	return alg->ivsize;

}



static inline unsigned int crypto_lskcipher_alg_ivsize(

	struct lskcipher_alg *alg)

{

	return alg->co.ivsize;

}



/**

 * crypto_skcipher_ivsize() - obtain IV size

 * @tfm: cipher handle
@@ -473,18 +462,6 @@ static inline unsigned int crypto_lskcipher_blocksize( 
	return crypto_tfm_alg_blocksize(crypto_lskcipher_tfm(tfm));

}



static inline unsigned int crypto_skcipher_alg_chunksize(

	struct skcipher_alg *alg)

{

	return alg->chunksize;

}



static inline unsigned int crypto_lskcipher_alg_chunksize(

	struct lskcipher_alg *alg)

{

	return alg->co.chunksize;

}



/**

 * crypto_skcipher_chunksize() - obtain chunk size

 * @tfm: cipher handle
@@ -516,7 +493,7 @@ static inline unsigned int crypto_skcipher_chunksize( 
static inline unsigned int crypto_lskcipher_chunksize(

	struct crypto_lskcipher *tfm)

{

	return crypto_lskcipher_alg_chunksize(crypto_lskcipher_alg(tfm));

	return crypto_lskcipher_alg(tfm)->co.chunksize;

}



static inline unsigned int crypto_sync_skcipher_blocksize(