]> git.karo-electronics.de Git - linux-beck.git/commitdiff
crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 22 Apr 2015 03:42:35 +0000 (11:42 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 23 Apr 2015 06:18:07 +0000 (14:18 +0800)
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>
crypto/drbg.c

index ec6bffd77001e211f74166e2731989b5894ac4e3..23d444ed3176a8d67babb09b0333794cbb9c777f 100644 (file)
@@ -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];