linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity
@ 2015-04-22  3:42 Herbert Xu
  2015-04-22  4:30 ` Stephan Mueller
  0 siblings, 1 reply; 2+ messages in thread
From: Herbert Xu @ 2015-04-22  3:42 UTC (permalink / raw)
  To: Stephan Mueller, Linux Crypto Mailing List

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>

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];
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity
  2015-04-22  3:42 crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity Herbert Xu
@ 2015-04-22  4:30 ` Stephan Mueller
  0 siblings, 0 replies; 2+ messages in thread
From: Stephan Mueller @ 2015-04-22  4:30 UTC (permalink / raw)
  To: Herbert Xu; +Cc: Linux Crypto Mailing List

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>

-- 
Ciao
Stephan

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-22  4:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-22  3:42 crypto: drbg - Remove FIPS ifdef from drbg_healthcheck_sanity Herbert Xu
2015-04-22  4:30 ` Stephan Mueller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).