| Message ID | 20150422034235.GA6907@gondor.apana.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
Am Mittwoch, 22. April 2015, 11:42:35 schrieb Herbert Xu: Hi Herbert, > 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 ec6bffd..23d444e 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];
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>