Commit d3ca75a8 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: skcipher - unify the crypto_has_skcipher*() functions 



crypto_has_skcipher() and crypto_has_skcipher2() do the same thing: they
check for the availability of an algorithm of type skcipher, blkcipher,
or ablkcipher, which also meets any non-type constraints the caller
specified.  And they have exactly the same prototype.

Therefore, eliminate the redundancy by removing crypto_has_skcipher()
and renaming crypto_has_skcipher2() to crypto_has_skcipher().

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8d68e7e1

crypto/skcipher.c

+2 −2
Original line number Diff line number Diff line
@@ -1017,12 +1017,12 @@ struct crypto_sync_skcipher *crypto_alloc_sync_skcipher( 
}

EXPORT_SYMBOL_GPL(crypto_alloc_sync_skcipher);



int crypto_has_skcipher2(const char *alg_name, u32 type, u32 mask)

int crypto_has_skcipher(const char *alg_name, u32 type, u32 mask)

{

	return crypto_type_has_alg(alg_name, &crypto_skcipher_type2,

				   type, mask);

}

EXPORT_SYMBOL_GPL(crypto_has_skcipher2);

EXPORT_SYMBOL_GPL(crypto_has_skcipher);



static int skcipher_prepare_alg(struct skcipher_alg *alg)

{

include/crypto/skcipher.h

+1 −18
Original line number Diff line number Diff line
@@ -218,30 +218,13 @@ static inline void crypto_free_sync_skcipher(struct crypto_sync_skcipher *tfm) 
 * crypto_has_skcipher() - Search for the availability of an skcipher.

 * @alg_name: is the cra_name / name or cra_driver_name / driver name of the

 *	      skcipher

 * @type: specifies the type of the cipher

 * @mask: specifies the mask for the cipher

 *

 * Return: true when the skcipher is known to the kernel crypto API; false

 *	   otherwise

 */

static inline int crypto_has_skcipher(const char *alg_name, u32 type,

					u32 mask)

{

	return crypto_has_alg(alg_name, crypto_skcipher_type(type),

			      crypto_skcipher_mask(mask));

}



/**

 * crypto_has_skcipher2() - Search for the availability of an skcipher.

 * @alg_name: is the cra_name / name or cra_driver_name / driver name of the

 *	      skcipher

 * @type: specifies the type of the skcipher

 * @mask: specifies the mask for the skcipher

 *

 * Return: true when the skcipher is known to the kernel crypto API; false

 *	   otherwise

 */

int crypto_has_skcipher2(const char *alg_name, u32 type, u32 mask);

int crypto_has_skcipher(const char *alg_name, u32 type, u32 mask);



static inline const char *crypto_skcipher_driver_name(

	struct crypto_skcipher *tfm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE