Commit 5163ab50 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Move crypto attr definitions out of crypto.h 



The definitions for crypto_attr-related types and enums are not
needed by most Crypto API users.  This patch moves them out of
crypto.h and into algapi.h/internal.h depending on the extent of
their use.

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

crypto/internal.h

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,18 @@ struct crypto_larval { 
	u32 mask;

};



enum {

	CRYPTOA_UNSPEC,

	CRYPTOA_ALG,

	CRYPTOA_TYPE,

	__CRYPTOA_MAX,

};



#define CRYPTOA_MAX (__CRYPTOA_MAX - 1)



/* Maximum number of (rtattr) parameters for each template. */

#define CRYPTO_MAX_ATTRS 32



extern struct list_head crypto_alg_list;

extern struct rw_semaphore crypto_alg_sem;

extern struct blocking_notifier_head crypto_chain;

include/crypto/algapi.h

+9 −0
Original line number Diff line number Diff line
@@ -96,6 +96,15 @@ struct scatter_walk { 
	unsigned int offset;

};



struct crypto_attr_alg {

	char name[CRYPTO_MAX_ALG_NAME];

};



struct crypto_attr_type {

	u32 type;

	u32 mask;

};



void crypto_mod_put(struct crypto_alg *alg);



int crypto_register_template(struct crypto_template *tmpl);

include/linux/crypto.h

+0 −21
Original line number Diff line number Diff line
@@ -643,27 +643,6 @@ struct crypto_comp { 
	struct crypto_tfm base;

};



enum {

	CRYPTOA_UNSPEC,

	CRYPTOA_ALG,

	CRYPTOA_TYPE,

	__CRYPTOA_MAX,

};



#define CRYPTOA_MAX (__CRYPTOA_MAX - 1)



/* Maximum number of (rtattr) parameters for each template. */

#define CRYPTO_MAX_ATTRS 32



struct crypto_attr_alg {

	char name[CRYPTO_MAX_ALG_NAME];

};



struct crypto_attr_type {

	u32 type;

	u32 mask;

};



/* 

 * Transform user interface.

 */