Commit e25e47ec authored by Stephan Mueller's avatar Stephan Mueller Committed by Herbert Xu

crypto: drbg - cleanup of preprocessor macros

The structure used to construct the module description line was marked
problematic by the sparse code analysis tool. The module line
description now does not contain any ifdefs to prevent error reports
from sparse.
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 44b933b9
...@@ -356,6 +356,7 @@ static inline void drbg_add_buf(unsigned char *dst, size_t dstlen, ...@@ -356,6 +356,7 @@ static inline void drbg_add_buf(unsigned char *dst, size_t dstlen,
******************************************************************/ ******************************************************************/
#ifdef CONFIG_CRYPTO_DRBG_CTR #ifdef CONFIG_CRYPTO_DRBG_CTR
#define CRYPTO_DRBG_CTR_STRING "CTR "
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);
...@@ -717,6 +718,7 @@ static int drbg_fini_hash_kernel(struct drbg_state *drbg); ...@@ -717,6 +718,7 @@ static int drbg_fini_hash_kernel(struct drbg_state *drbg);
#endif /* (CONFIG_CRYPTO_DRBG_HASH || CONFIG_CRYPTO_DRBG_HMAC) */ #endif /* (CONFIG_CRYPTO_DRBG_HASH || CONFIG_CRYPTO_DRBG_HMAC) */
#ifdef CONFIG_CRYPTO_DRBG_HMAC #ifdef CONFIG_CRYPTO_DRBG_HMAC
#define CRYPTO_DRBG_HMAC_STRING "HMAC "
/* 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)
...@@ -836,6 +838,7 @@ static struct drbg_state_ops drbg_hmac_ops = { ...@@ -836,6 +838,7 @@ static struct drbg_state_ops drbg_hmac_ops = {
******************************************************************/ ******************************************************************/
#ifdef CONFIG_CRYPTO_DRBG_HASH #ifdef CONFIG_CRYPTO_DRBG_HASH
#define CRYPTO_DRBG_HASH_STRING "HASH "
/* /*
* scratchpad usage: as drbg_hash_update and drbg_hash_df are used * scratchpad usage: as drbg_hash_update and drbg_hash_df are used
* interlinked, the scratchpad is used as follows: * interlinked, the scratchpad is used as follows:
...@@ -1867,7 +1870,7 @@ static inline int __init drbg_healthcheck_sanity(void) ...@@ -1867,7 +1870,7 @@ static inline int __init drbg_healthcheck_sanity(void)
#ifdef CONFIG_CRYPTO_DRBG_CTR #ifdef CONFIG_CRYPTO_DRBG_CTR
drbg_convert_tfm_core("drbg_nopr_ctr_aes128", &coreref, &pr); drbg_convert_tfm_core("drbg_nopr_ctr_aes128", &coreref, &pr);
#elif CONFIG_CRYPTO_DRBG_HASH #elif defined CONFIG_CRYPTO_DRBG_HASH
drbg_convert_tfm_core("drbg_nopr_sha256", &coreref, &pr); drbg_convert_tfm_core("drbg_nopr_sha256", &coreref, &pr);
#else #else
drbg_convert_tfm_core("drbg_nopr_hmac_sha256", &coreref, &pr); drbg_convert_tfm_core("drbg_nopr_hmac_sha256", &coreref, &pr);
...@@ -2009,16 +2012,19 @@ void __exit drbg_exit(void) ...@@ -2009,16 +2012,19 @@ void __exit drbg_exit(void)
module_init(drbg_init); module_init(drbg_init);
module_exit(drbg_exit); module_exit(drbg_exit);
MODULE_LICENSE("GPL"); #ifndef CRYPTO_DRBG_HASH_STRING
MODULE_AUTHOR("Stephan Mueller <smueller@chronox.de>"); #define CRYPTO_DRBG_HASH_STRING ""
MODULE_DESCRIPTION("NIST SP800-90A Deterministic Random Bit Generator (DRBG) using following cores:"
#ifdef CONFIG_CRYPTO_DRBG_HMAC
"HMAC "
#endif #endif
#ifdef CONFIG_CRYPTO_DRBG_HASH #ifndef CRYPTO_DRBG_HMAC_STRING
"Hash " #define CRYPTO_DRBG_HMAC_STRING ""
#endif #endif
#ifdef CONFIG_CRYPTO_DRBG_CTR #ifndef CRYPTO_DRBG_CTR_STRING
"CTR" #define CRYPTO_DRBG_CTR_STRING ""
#endif #endif
); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Stephan Mueller <smueller@chronox.de>");
MODULE_DESCRIPTION("NIST SP800-90A Deterministic Random Bit Generator (DRBG) "
"using following cores: "
CRYPTO_DRBG_HASH_STRING
CRYPTO_DRBG_HMAC_STRING
CRYPTO_DRBG_CTR_STRING);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment