From 7ce4f961b3d7df9838dbb62dba3809694ca11bb0 Mon Sep 17 00:00:00 2001 From: Michael Benedict Date: Thu, 6 Jun 2019 23:53:14 +1000 Subject: [PATCH] crypto: fix section mismatch Signed-off-by: Michael Benedict --- crypto/tcrypt.c | 2 ++ crypto/testmgr.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 3e371a7f1fec..23bf7f0aea06 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -76,6 +76,7 @@ static char *check[] = { "lzo", "cts", "zlib", NULL }; +#ifdef CONFIG_CRYPTO_FIPS #ifdef CONFIG_CRYPTO_DRBG static char *drbg_cores[] = { #ifdef CONFIG_CRYPTO_DRBG_CTR @@ -97,6 +98,7 @@ static char *drbg_cores[] = { #endif /* CONFIG_CRYPTO_DRBG_HMAC */ }; #endif /* CONFIG_CRYPTO_DRBG */ +#endif /* CONFIG_CRYPTO_FIPS */ struct tcrypt_result { struct completion completion; diff --git a/crypto/testmgr.c b/crypto/testmgr.c index c43623af0c34..4aa8abb25f0e 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4075,6 +4075,7 @@ non_fips_alg: return rc; } +#ifdef CONFIG_CRYPTO_FIPS int testmgr_crypto_proc_init(void) { #ifdef CONFIG_CRYPTO_FIPS @@ -4085,6 +4086,7 @@ int testmgr_crypto_proc_init(void) return 0; } EXPORT_SYMBOL_GPL(testmgr_crypto_proc_init); +#endif #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ -- 2.20.1