diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-20 22:46:37 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-21 21:30:07 -0400 |
commit | 3c5d8fa9f56ad0928e7a1f06003e5034f5eedb52 (patch) | |
tree | 26b035754eb3cf014cbcf7c90351a0bc1711b170 /crypto/rng.c | |
parent | ff030b099a21a4753af575b4304249e88400e506 (diff) |
crypto: rng - Mark crypto_rng_reset seed as const
There is no reason why crypto_rng_reset should modify the seed
so this patch marks it as const. Since our algorithms don't
export a const seed function yet we have to go through some
contortions for now.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/rng.c')
-rw-r--r-- | crypto/rng.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/crypto/rng.c b/crypto/rng.c index 4514d3755f79..f1d64948f6fc 100644 --- a/crypto/rng.c +++ b/crypto/rng.c | |||
@@ -42,7 +42,29 @@ static int generate(struct crypto_rng *tfm, const u8 *src, unsigned int slen, | |||
42 | return crypto_rng_alg(tfm)->rng_make_random(tfm, dst, dlen); | 42 | return crypto_rng_alg(tfm)->rng_make_random(tfm, dst, dlen); |
43 | } | 43 | } |
44 | 44 | ||
45 | static int rngapi_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen) | 45 | static int rngapi_reset(struct crypto_rng *tfm, const u8 *seed, |
46 | unsigned int slen) | ||
47 | { | ||
48 | u8 *buf = NULL; | ||
49 | u8 *src = (u8 *)seed; | ||
50 | int err; | ||
51 | |||
52 | if (slen) { | ||
53 | buf = kmalloc(slen, GFP_KERNEL); | ||
54 | if (!buf) | ||
55 | return -ENOMEM; | ||
56 | |||
57 | memcpy(buf, seed, slen); | ||
58 | src = buf; | ||
59 | } | ||
60 | |||
61 | err = crypto_rng_alg(tfm)->rng_reset(tfm, src, slen); | ||
62 | |||
63 | kzfree(buf); | ||
64 | return err; | ||
65 | } | ||
66 | |||
67 | int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) | ||
46 | { | 68 | { |
47 | u8 *buf = NULL; | 69 | u8 *buf = NULL; |
48 | int err; | 70 | int err; |
@@ -56,11 +78,12 @@ static int rngapi_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen) | |||
56 | seed = buf; | 78 | seed = buf; |
57 | } | 79 | } |
58 | 80 | ||
59 | err = crypto_rng_alg(tfm)->rng_reset(tfm, seed, slen); | 81 | err = tfm->seed(tfm, seed, slen); |
60 | 82 | ||
61 | kfree(buf); | 83 | kfree(buf); |
62 | return err; | 84 | return err; |
63 | } | 85 | } |
86 | EXPORT_SYMBOL_GPL(crypto_rng_reset); | ||
64 | 87 | ||
65 | static int crypto_rng_init_tfm(struct crypto_tfm *tfm) | 88 | static int crypto_rng_init_tfm(struct crypto_tfm *tfm) |
66 | { | 89 | { |