diff options
author | Stephan Mueller <smueller@chronox.de> | 2014-11-25 03:28:43 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-26 07:06:30 -0500 |
commit | 0653a7cf6fa49bc769628b6078c3ea9e1489cb7b (patch) | |
tree | 043742bc23aebf89e9f9b948513a1be64e6fc996 /crypto | |
parent | 4943ba16bbc2db05115707b3ff7b4874e9e3c560 (diff) |
crypto: drbg - use MODULE_ALIAS_CRYPTO
Use the crypto- prefix for the DRBG implementations.
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/drbg.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 9fb38a55118a..c90e3cf5967f 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c | |||
@@ -291,12 +291,12 @@ static inline void drbg_cpu_to_be32(__u32 val, unsigned char *buf) | |||
291 | 291 | ||
292 | #ifdef CONFIG_CRYPTO_DRBG_CTR | 292 | #ifdef CONFIG_CRYPTO_DRBG_CTR |
293 | #define CRYPTO_DRBG_CTR_STRING "CTR " | 293 | #define CRYPTO_DRBG_CTR_STRING "CTR " |
294 | MODULE_ALIAS("drbg_pr_ctr_aes256"); | 294 | MODULE_ALIAS_CRYPTO("drbg_pr_ctr_aes256"); |
295 | MODULE_ALIAS("drbg_nopr_ctr_aes256"); | 295 | MODULE_ALIAS_CRYPTO("drbg_nopr_ctr_aes256"); |
296 | MODULE_ALIAS("drbg_pr_ctr_aes192"); | 296 | MODULE_ALIAS_CRYPTO("drbg_pr_ctr_aes192"); |
297 | MODULE_ALIAS("drbg_nopr_ctr_aes192"); | 297 | MODULE_ALIAS_CRYPTO("drbg_nopr_ctr_aes192"); |
298 | MODULE_ALIAS("drbg_pr_ctr_aes128"); | 298 | MODULE_ALIAS_CRYPTO("drbg_pr_ctr_aes128"); |
299 | MODULE_ALIAS("drbg_nopr_ctr_aes128"); | 299 | MODULE_ALIAS_CRYPTO("drbg_nopr_ctr_aes128"); |
300 | 300 | ||
301 | static int drbg_kcapi_sym(struct drbg_state *drbg, const unsigned char *key, | 301 | static int drbg_kcapi_sym(struct drbg_state *drbg, const unsigned char *key, |
302 | unsigned char *outval, const struct drbg_string *in); | 302 | unsigned char *outval, const struct drbg_string *in); |
@@ -658,14 +658,14 @@ static int drbg_fini_hash_kernel(struct drbg_state *drbg); | |||
658 | 658 | ||
659 | #ifdef CONFIG_CRYPTO_DRBG_HMAC | 659 | #ifdef CONFIG_CRYPTO_DRBG_HMAC |
660 | #define CRYPTO_DRBG_HMAC_STRING "HMAC " | 660 | #define CRYPTO_DRBG_HMAC_STRING "HMAC " |
661 | MODULE_ALIAS("drbg_pr_hmac_sha512"); | 661 | MODULE_ALIAS_CRYPTO("drbg_pr_hmac_sha512"); |
662 | MODULE_ALIAS("drbg_nopr_hmac_sha512"); | 662 | MODULE_ALIAS_CRYPTO("drbg_nopr_hmac_sha512"); |
663 | MODULE_ALIAS("drbg_pr_hmac_sha384"); | 663 | MODULE_ALIAS_CRYPTO("drbg_pr_hmac_sha384"); |
664 | MODULE_ALIAS("drbg_nopr_hmac_sha384"); | 664 | MODULE_ALIAS_CRYPTO("drbg_nopr_hmac_sha384"); |
665 | MODULE_ALIAS("drbg_pr_hmac_sha256"); | 665 | MODULE_ALIAS_CRYPTO("drbg_pr_hmac_sha256"); |
666 | MODULE_ALIAS("drbg_nopr_hmac_sha256"); | 666 | MODULE_ALIAS_CRYPTO("drbg_nopr_hmac_sha256"); |
667 | MODULE_ALIAS("drbg_pr_hmac_sha1"); | 667 | MODULE_ALIAS_CRYPTO("drbg_pr_hmac_sha1"); |
668 | MODULE_ALIAS("drbg_nopr_hmac_sha1"); | 668 | MODULE_ALIAS_CRYPTO("drbg_nopr_hmac_sha1"); |
669 | 669 | ||
670 | /* update function of HMAC DRBG as defined in 10.1.2.2 */ | 670 | /* update function of HMAC DRBG as defined in 10.1.2.2 */ |
671 | static int drbg_hmac_update(struct drbg_state *drbg, struct list_head *seed, | 671 | static int drbg_hmac_update(struct drbg_state *drbg, struct list_head *seed, |
@@ -778,14 +778,14 @@ static struct drbg_state_ops drbg_hmac_ops = { | |||
778 | 778 | ||
779 | #ifdef CONFIG_CRYPTO_DRBG_HASH | 779 | #ifdef CONFIG_CRYPTO_DRBG_HASH |
780 | #define CRYPTO_DRBG_HASH_STRING "HASH " | 780 | #define CRYPTO_DRBG_HASH_STRING "HASH " |
781 | MODULE_ALIAS("drbg_pr_sha512"); | 781 | MODULE_ALIAS_CRYPTO("drbg_pr_sha512"); |
782 | MODULE_ALIAS("drbg_nopr_sha512"); | 782 | MODULE_ALIAS_CRYPTO("drbg_nopr_sha512"); |
783 | MODULE_ALIAS("drbg_pr_sha384"); | 783 | MODULE_ALIAS_CRYPTO("drbg_pr_sha384"); |
784 | MODULE_ALIAS("drbg_nopr_sha384"); | 784 | MODULE_ALIAS_CRYPTO("drbg_nopr_sha384"); |
785 | MODULE_ALIAS("drbg_pr_sha256"); | 785 | MODULE_ALIAS_CRYPTO("drbg_pr_sha256"); |
786 | MODULE_ALIAS("drbg_nopr_sha256"); | 786 | MODULE_ALIAS_CRYPTO("drbg_nopr_sha256"); |
787 | MODULE_ALIAS("drbg_pr_sha1"); | 787 | MODULE_ALIAS_CRYPTO("drbg_pr_sha1"); |
788 | MODULE_ALIAS("drbg_nopr_sha1"); | 788 | MODULE_ALIAS_CRYPTO("drbg_nopr_sha1"); |
789 | 789 | ||
790 | /* | 790 | /* |
791 | * Increment buffer | 791 | * Increment buffer |