From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 22 Apr 2015 03:42:35 +0000 (+0800)
Subject: crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b94e7dc581c68e383165b09f2aab7a98a597f10a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity

This patch removes the unnecessary CRYPTO_FIPS ifdef from
drbg_healthcheck_sanity so that the code always gets checked
by the compiler.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Stephan Mueller <smueller@chronox.de>
---

diff --git a/crypto/drbg.c b/crypto/drbg.c
index ec6bffd77001..23d444ed3176 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1707,7 +1707,6 @@ static int drbg_kcapi_seed(struct crypto_rng *tfm,
  */
 static inline int __init drbg_healthcheck_sanity(void)
 {
-#ifdef CONFIG_CRYPTO_FIPS
 	int len = 0;
 #define OUTBUFLEN 16
 	unsigned char buf[OUTBUFLEN];
@@ -1775,9 +1774,6 @@ static inline int __init drbg_healthcheck_sanity(void)
 outbuf:
 	kzfree(drbg);
 	return rc;
-#else /* CONFIG_CRYPTO_FIPS */
-	return 0;
-#endif /* CONFIG_CRYPTO_FIPS */
 }
 
 static struct rng_alg drbg_algs[22];