crypto: move fips_cprng_get_random and fips_cprng_reset to CONFIG_CRYPTO_FIPS
PATCH 1/1 crypto: move fips_cprng_get_random and fips_cprng_reset to CONFIG_CRYPTO_FIPS
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: ‘fips_cprng_get_random’ defined but not used crypto/ansi_cprng.c:393: warning: ‘fips_cprng_reset’ defined but not used
--- crypto/ansi_cprng.c | 56 +++++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 28 deletions(-)
crypto/ansi_cprng.c +28 -28
@@ -357,14 +357,6 @@ static int cprng_get_random(struct crypto_rng *tfm, u8 *rdata,return get_prng_bytes (rdata, dlen, prng,0 ); } -static int fips_cprng_get_random (struct crypto_rng *tfm,u8 *rdata, -unsigned int dlen) -{ -struct prng_context *prng =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 ; } -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 =crypto_rng_ctx (tfm); - - rc =cprng_reset (tfm, seed, slen); - -if (!rc) - goto out; - -/* this primes our continuity test */ - rc =get_prng_bytes (rdata,DEFAULT_BLK_SZ , prng,0 ); - prng->rand_data_valid =DEFAULT_BLK_SZ ; - -out: -return rc; -} -static struct crypto_alg rng_alg = { .cra_name ="stdrng" , .cra_driver_name ="ansi_cprng" ,
@@ -431,6 +403,34 @@ static struct crypto_alg rng_alg = { };#ifdef CONFIG_CRYPTO_FIPS +static int fips_cprng_get_random (struct crypto_rng *tfm,u8 *rdata, +unsigned int dlen) +{ +struct prng_context *prng =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 =crypto_rng_ctx (tfm); + + rc =cprng_reset (tfm, seed, slen); + +if (!rc) + goto out; + +/* this primes our continuity test */ + rc =get_prng_bytes (rdata,DEFAULT_BLK_SZ , prng,0 ); + prng->rand_data_valid =DEFAULT_BLK_SZ ; + +out: +return rc; +} +static struct crypto_alg fips_rng_alg = { .cra_name ="fips(ansi_cprng)" , .cra_driver_name = "fips_ansi_cprng",
Signature · 7 lines
1.6.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Jaswinder Singh Rajput
fips_cprng_get_randomandfips_cprng_resetis used only byCONFIG_CRYPTO_FIPS. This also fixes compilation warnings:
crypto/ansi_cprng.c:360: warning: ‘fips_cprng_get_random’ defined but not usedcrypto/ansi_cprng.c:393: warning: ‘fips_cprng_reset’ defined but not usedSigned-off-by Jaswinder Singh Rajput <[email protected]>
Yeah, looks good to me, thanks!
Quoted 1 line
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Herbert Xu
maintainerQuoted 11 lines · Neil Horman
Quoted 8 lines · Jaswinder Singh Rajput
fips_cprng_get_randomandfips_cprng_resetis used only byCONFIG_CRYPTO_FIPS. This also fixes compilation warnings:
crypto/ansi_cprng.c:360: warning: ‘fips_cprng_get_random’ defined but not usedcrypto/ansi_cprng.c:393: warning: ‘fips_cprng_reset’ defined but not usedSigned-off-by Jaswinder Singh Rajput <[email protected]>Yeah, looks good to me, thanks!
Acked-by Neil Horman <[email protected]>
Patch applied. Thanks!
Signature · 8 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html