Commit 0c0edf61 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Move MODULE_ALIAS_CRYPTO to algapi.h 



This is part of the low-level API and should not be exposed to
top-level Crypto API users.

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

include/crypto/algapi.h

+13 −0
Original line number Diff line number Diff line
@@ -34,6 +34,19 @@ 


#define CRYPTO_DMA_PADDING ((CRYPTO_DMA_ALIGN - 1) & ~(CRYPTO_MINALIGN - 1))



/*

 * Autoloaded crypto modules should only use a prefixed name to avoid allowing

 * arbitrary modules to be loaded. Loading from userspace may still need the

 * unprefixed names, so retains those aliases as well.

 * This uses __MODULE_INFO directly instead of MODULE_ALIAS because pre-4.3

 * gcc (e.g. avr32 toolchain) uses __LINE__ for uniqueness, and this macro

 * expands twice on the same line. Instead, use a separate base name for the

 * alias.

 */

#define MODULE_ALIAS_CRYPTO(name)	\

		__MODULE_INFO(alias, alias_userspace, name);	\

		__MODULE_INFO(alias, alias_crypto, "crypto-" name)



struct crypto_aead;

struct crypto_instance;

struct module;

include/linux/crypto.h

+0 −13
Original line number Diff line number Diff line
@@ -20,19 +20,6 @@ 
#include <linux/slab.h>

#include <linux/completion.h>



/*

 * Autoloaded crypto modules should only use a prefixed name to avoid allowing

 * arbitrary modules to be loaded. Loading from userspace may still need the

 * unprefixed names, so retains those aliases as well.

 * This uses __MODULE_INFO directly instead of MODULE_ALIAS because pre-4.3

 * gcc (e.g. avr32 toolchain) uses __LINE__ for uniqueness, and this macro

 * expands twice on the same line. Instead, use a separate base name for the

 * alias.

 */

#define MODULE_ALIAS_CRYPTO(name)	\

		__MODULE_INFO(alias, alias_userspace, name);	\

		__MODULE_INFO(alias, alias_crypto, "crypto-" name)



/*

 * Algorithm masks and types.

 */