Skip to content

Commit

Permalink
crypto: rng - Mark crypto_rng_reset seed as const
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
herbertx committed Apr 22, 2015
1 parent ff030b0 commit 3c5d8fa
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 8 deletions.
27 changes: 25 additions & 2 deletions crypto/rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,29 @@ static int generate(struct crypto_rng *tfm, const u8 *src, unsigned int slen,
return crypto_rng_alg(tfm)->rng_make_random(tfm, dst, dlen);
}

static int rngapi_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)
static int rngapi_reset(struct crypto_rng *tfm, const u8 *seed,
unsigned int slen)
{
u8 *buf = NULL;
u8 *src = (u8 *)seed;
int err;

if (slen) {
buf = kmalloc(slen, GFP_KERNEL);
if (!buf)
return -ENOMEM;

memcpy(buf, seed, slen);
src = buf;
}

err = crypto_rng_alg(tfm)->rng_reset(tfm, src, slen);

kzfree(buf);
return err;
}

int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen)
{
u8 *buf = NULL;
int err;
Expand All @@ -56,11 +78,12 @@ static int rngapi_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)
seed = buf;
}

err = crypto_rng_alg(tfm)->rng_reset(tfm, seed, slen);
err = tfm->seed(tfm, seed, slen);

kfree(buf);
return err;
}
EXPORT_SYMBOL_GPL(crypto_rng_reset);

static int crypto_rng_init_tfm(struct crypto_tfm *tfm)
{
Expand Down
9 changes: 3 additions & 6 deletions include/crypto/rng.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct crypto_rng {
int (*generate)(struct crypto_rng *tfm,
const u8 *src, unsigned int slen,
u8 *dst, unsigned int dlen);
int (*seed)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
int (*seed)(struct crypto_rng *tfm, const u8 *seed, unsigned int slen);
struct crypto_tfm base;
};

Expand Down Expand Up @@ -139,11 +139,8 @@ static inline int crypto_rng_get_bytes(struct crypto_rng *tfm,
*
* Return: 0 if the setting of the key was successful; < 0 if an error occurred
*/
static inline int crypto_rng_reset(struct crypto_rng *tfm,
u8 *seed, unsigned int slen)
{
return tfm->seed(tfm, seed, slen);
}
int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed,
unsigned int slen);

/**
* crypto_rng_seedsize() - obtain seed size of RNG
Expand Down

0 comments on commit 3c5d8fa

Please sign in to comment.