From: Jaswinder Singh Rajput Subject: [PATCH] crypto: move fips_cprng_get_random and fips_cprng_reset to CONFIG_CRYPTO_FIPS Date: Fri, 20 Nov 2009 19:20:19 +0530 Message-ID: <1258725019.3562.3.camel@ht.satnam> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: Herbert Xu , Neil Horman , Jarod Wilson , David Miller , linux-crypto@vger.kernel.org, LKML Return-path: Received: from hera.kernel.org ([140.211.167.34]:45136 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752268AbZKTNwJ (ORCPT ); Fri, 20 Nov 2009 08:52:09 -0500 Sender: linux-crypto-owner@vger.kernel.org List-ID: fips_cprng_get_random and fips_cprng_reset is used only by CONFIG_CRYPTO_FIPS. This also fixes compilation warnings: crypto/ansi_cprng.c:360: warning: =E2=80=98fips_cprng_get_random=E2=80= =99 defined but not used crypto/ansi_cprng.c:393: warning: =E2=80=98fips_cprng_reset=E2=80=99 d= efined but not used Signed-off-by: Jaswinder Singh Rajput --- crypto/ansi_cprng.c | 56 +++++++++++++++++++++++++------------------= ------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c index 45bd218..2bc3321 100644 --- a/crypto/ansi_cprng.c +++ b/crypto/ansi_cprng.c @@ -357,14 +357,6 @@ static int cprng_get_random(struct crypto_rng *tfm= , u8 *rdata, return get_prng_bytes(rdata, dlen, prng, 0); } =20 -static int fips_cprng_get_random(struct crypto_rng *tfm, u8 *rdata, - unsigned int dlen) -{ - struct prng_context *prng =3D crypto_rng_ctx(tfm); - - return get_prng_bytes(rdata, dlen, prng, 1); -} - /* * This is the cprng_registered reset method the seed value is * interpreted as the tuple { V KEY DT} @@ -390,26 +382,6 @@ static int cprng_reset(struct crypto_rng *tfm, u8 = *seed, unsigned int slen) return 0; } =20 -static int fips_cprng_reset(struct crypto_rng *tfm, u8 *seed, unsigned= int slen) -{ - u8 rdata[DEFAULT_BLK_SZ]; - int rc; - - struct prng_context *prng =3D crypto_rng_ctx(tfm); - - rc =3D cprng_reset(tfm, seed, slen); - - if (!rc) - goto out; - - /* this primes our continuity test */ - rc =3D get_prng_bytes(rdata, DEFAULT_BLK_SZ, prng, 0); - prng->rand_data_valid =3D DEFAULT_BLK_SZ; - -out: - return rc; -} - static struct crypto_alg rng_alg =3D { .cra_name =3D "stdrng", .cra_driver_name =3D "ansi_cprng", @@ -431,6 +403,34 @@ static struct crypto_alg rng_alg =3D { }; =20 #ifdef CONFIG_CRYPTO_FIPS +static int fips_cprng_get_random(struct crypto_rng *tfm, u8 *rdata, + unsigned int dlen) +{ + struct prng_context *prng =3D crypto_rng_ctx(tfm); + + return get_prng_bytes(rdata, dlen, prng, 1); +} + +static int fips_cprng_reset(struct crypto_rng *tfm, u8 *seed, unsigned= int slen) +{ + u8 rdata[DEFAULT_BLK_SZ]; + int rc; + + struct prng_context *prng =3D crypto_rng_ctx(tfm); + + rc =3D cprng_reset(tfm, seed, slen); + + if (!rc) + goto out; + + /* this primes our continuity test */ + rc =3D get_prng_bytes(rdata, DEFAULT_BLK_SZ, prng, 0); + prng->rand_data_valid =3D DEFAULT_BLK_SZ; + +out: + return rc; +} + static struct crypto_alg fips_rng_alg =3D { .cra_name =3D "fips(ansi_cprng)", .cra_driver_name =3D "fips_ansi_cprng", --=20 1.6.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-crypto"= in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html