summaryrefslogtreecommitdiffstats
path: root/crypto/rng.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-04-21 04:46:46 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2015-04-22 03:30:20 +0200
commit94f1bb15bed84ad6c893916b7e7b9db6f1d7eec6 (patch)
tree5deafd0b955a212c1b86893bf1e43c711ac7b861 /crypto/rng.c
parentcrypto: krng - Convert to new rng interface (diff)
downloadlinux-94f1bb15bed84ad6c893916b7e7b9db6f1d7eec6.tar.xz
linux-94f1bb15bed84ad6c893916b7e7b9db6f1d7eec6.zip
crypto: rng - Remove old low-level rng interface
Now that all rng implementations have switched over to the new interface, we can remove the old low-level interface. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/rng.c')
-rw-r--r--crypto/rng.c57
1 files changed, 4 insertions, 53 deletions
diff --git a/crypto/rng.c b/crypto/rng.c
index e98ce1ca527d..055e276427b1 100644
--- a/crypto/rng.c
+++ b/crypto/rng.c
@@ -4,6 +4,7 @@
* RNG operations.
*
* Copyright (c) 2008 Neil Horman <nhorman@tuxdriver.com>
+ * Copyright (c) 2015 Herbert Xu <herbert@gondor.apana.org.au>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -36,39 +37,6 @@ static inline struct crypto_rng *__crypto_rng_cast(struct crypto_tfm *tfm)
return container_of(tfm, struct crypto_rng, base);
}
-static inline struct old_rng_alg *crypto_old_rng_alg(struct crypto_rng *tfm)
-{
- return &crypto_rng_tfm(tfm)->__crt_alg->cra_rng;
-}
-
-static int generate(struct crypto_rng *tfm, const u8 *src, unsigned int slen,
- u8 *dst, unsigned int dlen)
-{
- return crypto_old_rng_alg(tfm)->rng_make_random(tfm, dst, dlen);
-}
-
-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_old_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;
@@ -83,7 +51,7 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen)
seed = buf;
}
- err = tfm->seed(tfm, seed, slen);
+ err = crypto_rng_alg(tfm)->seed(tfm, seed, slen);
kfree(buf);
return err;
@@ -92,21 +60,6 @@ EXPORT_SYMBOL_GPL(crypto_rng_reset);
static int crypto_rng_init_tfm(struct crypto_tfm *tfm)
{
- struct crypto_rng *rng = __crypto_rng_cast(tfm);
- struct rng_alg *alg = crypto_rng_alg(rng);
- struct old_rng_alg *oalg = crypto_old_rng_alg(rng);
-
- if (oalg->rng_make_random) {
- rng->generate = generate;
- rng->seed = rngapi_reset;
- rng->seedsize = oalg->seedsize;
- return 0;
- }
-
- rng->generate = alg->generate;
- rng->seed = alg->seed;
- rng->seedsize = alg->seedsize;
-
return 0;
}
@@ -114,8 +67,7 @@ static unsigned int seedsize(struct crypto_alg *alg)
{
struct rng_alg *ralg = container_of(alg, struct rng_alg, base);
- return alg->cra_rng.rng_make_random ?
- alg->cra_rng.seedsize : ralg->seedsize;
+ return ralg->seedsize;
}
#ifdef CONFIG_NET
@@ -150,7 +102,7 @@ static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)
seq_printf(m, "seedsize : %u\n", seedsize(alg));
}
-const struct crypto_type crypto_rng_type = {
+static const struct crypto_type crypto_rng_type = {
.extsize = crypto_alg_extsize,
.init_tfm = crypto_rng_init_tfm,
#ifdef CONFIG_PROC_FS
@@ -162,7 +114,6 @@ const struct crypto_type crypto_rng_type = {
.type = CRYPTO_ALG_TYPE_RNG,
.tfmsize = offsetof(struct crypto_rng, base),
};
-EXPORT_SYMBOL_GPL(crypto_rng_type);
struct crypto_rng *crypto_alloc_rng(const char *alg_name, u32 type, u32 mask)
{