Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: drbg - add MODULE_ALIAS for all DRBG types

Browse source 
The kernel module drbg.ko is currently not loaded automatically when a
DRBG is requested by a consumer. This is due to missing MODULE_ALIAS
flags for each of the implemented DRBG types.

This patch adds aliases for each of the 22 defined DRBGs.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Stephan Mueller 2014-11-04 03:08:09 +01:00 committed by Herbert Xu
parent 49783d0f54
commit 62b62b6e5c
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crypto/drbg.c
View file

@ -291,6 +291,13 @@ static inline void drbg_cpu_to_be32(__u32 val, unsigned char *buf)
#ifdef CONFIG_CRYPTO_DRBG_CTR #ifdef CONFIG_CRYPTO_DRBG_CTR
#define CRYPTO_DRBG_CTR_STRING "CTR " #define CRYPTO_DRBG_CTR_STRING "CTR "
MODULE_ALIAS("drbg_pr_ctr_aes256");
MODULE_ALIAS("drbg_nopr_ctr_aes256");
MODULE_ALIAS("drbg_pr_ctr_aes192");
MODULE_ALIAS("drbg_nopr_ctr_aes192");
MODULE_ALIAS("drbg_pr_ctr_aes128");
MODULE_ALIAS("drbg_nopr_ctr_aes128");
static int drbg_kcapi_sym(struct drbg_state *drbg, const unsigned char *key, static int drbg_kcapi_sym(struct drbg_state *drbg, const unsigned char *key,
unsigned char *outval, const struct drbg_string *in); unsigned char *outval, const struct drbg_string *in);
static int drbg_init_sym_kernel(struct drbg_state *drbg); static int drbg_init_sym_kernel(struct drbg_state *drbg);
@ -651,6 +658,15 @@ static int drbg_fini_hash_kernel(struct drbg_state *drbg);
#ifdef CONFIG_CRYPTO_DRBG_HMAC #ifdef CONFIG_CRYPTO_DRBG_HMAC
#define CRYPTO_DRBG_HMAC_STRING "HMAC " #define CRYPTO_DRBG_HMAC_STRING "HMAC "
MODULE_ALIAS("drbg_pr_hmac_sha512");
MODULE_ALIAS("drbg_nopr_hmac_sha512");
MODULE_ALIAS("drbg_pr_hmac_sha384");
MODULE_ALIAS("drbg_nopr_hmac_sha384");
MODULE_ALIAS("drbg_pr_hmac_sha256");
MODULE_ALIAS("drbg_nopr_hmac_sha256");
MODULE_ALIAS("drbg_pr_hmac_sha1");
MODULE_ALIAS("drbg_nopr_hmac_sha1");
/* update function of HMAC DRBG as defined in 10.1.2.2 */ /* update function of HMAC DRBG as defined in 10.1.2.2 */
static int drbg_hmac_update(struct drbg_state *drbg, struct list_head *seed, static int drbg_hmac_update(struct drbg_state *drbg, struct list_head *seed,
int reseed) int reseed)
@ -762,6 +778,15 @@ static struct drbg_state_ops drbg_hmac_ops = {
#ifdef CONFIG_CRYPTO_DRBG_HASH #ifdef CONFIG_CRYPTO_DRBG_HASH
#define CRYPTO_DRBG_HASH_STRING "HASH " #define CRYPTO_DRBG_HASH_STRING "HASH "
MODULE_ALIAS("drbg_pr_sha512");
MODULE_ALIAS("drbg_nopr_sha512");
MODULE_ALIAS("drbg_pr_sha384");
MODULE_ALIAS("drbg_nopr_sha384");
MODULE_ALIAS("drbg_pr_sha256");
MODULE_ALIAS("drbg_nopr_sha256");
MODULE_ALIAS("drbg_pr_sha1");
MODULE_ALIAS("drbg_nopr_sha1");
/* /*
* Increment buffer * Increment buffer
* *