diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2011-09-27 01:47:11 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-10-21 08:24:06 -0400 |
commit | 792608e9c215141fa4b870b7b2a23767a1ef12f4 (patch) | |
tree | cb781b8cec57d958fb0cdbec0807289a3b868ad8 | |
parent | a55465dca7befd31f4ffa54508d4e2d1e701b8dc (diff) |
crypto: Add userspace report for rng type algorithms
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/rng.c | 20 | ||||
-rw-r--r-- | include/linux/cryptouser.h | 6 |
2 files changed, 26 insertions, 0 deletions
diff --git a/crypto/rng.c b/crypto/rng.c index 45229ae782be..feb7de00f437 100644 --- a/crypto/rng.c +++ b/crypto/rng.c | |||
@@ -21,6 +21,8 @@ | |||
21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/cryptouser.h> | ||
25 | #include <net/netlink.h> | ||
24 | 26 | ||
25 | static DEFINE_MUTEX(crypto_default_rng_lock); | 27 | static DEFINE_MUTEX(crypto_default_rng_lock); |
26 | struct crypto_rng *crypto_default_rng; | 28 | struct crypto_rng *crypto_default_rng; |
@@ -58,6 +60,23 @@ static int crypto_init_rng_ops(struct crypto_tfm *tfm, u32 type, u32 mask) | |||
58 | return 0; | 60 | return 0; |
59 | } | 61 | } |
60 | 62 | ||
63 | static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) | ||
64 | { | ||
65 | struct crypto_report_rng rrng; | ||
66 | |||
67 | snprintf(rrng.type, CRYPTO_MAX_ALG_NAME, "%s", "rng"); | ||
68 | |||
69 | rrng.seedsize = alg->cra_rng.seedsize; | ||
70 | |||
71 | NLA_PUT(skb, CRYPTOCFGA_REPORT_RNG, | ||
72 | sizeof(struct crypto_report_rng), &rrng); | ||
73 | |||
74 | return 0; | ||
75 | |||
76 | nla_put_failure: | ||
77 | return -EMSGSIZE; | ||
78 | } | ||
79 | |||
61 | static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) | 80 | static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) |
62 | __attribute__ ((unused)); | 81 | __attribute__ ((unused)); |
63 | static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) | 82 | static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) |
@@ -78,6 +97,7 @@ const struct crypto_type crypto_rng_type = { | |||
78 | #ifdef CONFIG_PROC_FS | 97 | #ifdef CONFIG_PROC_FS |
79 | .show = crypto_rng_show, | 98 | .show = crypto_rng_show, |
80 | #endif | 99 | #endif |
100 | .report = crypto_rng_report, | ||
81 | }; | 101 | }; |
82 | EXPORT_SYMBOL_GPL(crypto_rng_type); | 102 | EXPORT_SYMBOL_GPL(crypto_rng_type); |
83 | 103 | ||
diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index c8c1dfcb7cf2..ed8a40e8fb6b 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h | |||
@@ -41,6 +41,7 @@ enum crypto_attr_type_t { | |||
41 | CRYPTOCFGA_REPORT_BLKCIPHER, /* struct crypto_report_blkcipher */ | 41 | CRYPTOCFGA_REPORT_BLKCIPHER, /* struct crypto_report_blkcipher */ |
42 | CRYPTOCFGA_REPORT_AEAD, /* struct crypto_report_aead */ | 42 | CRYPTOCFGA_REPORT_AEAD, /* struct crypto_report_aead */ |
43 | CRYPTOCFGA_REPORT_COMPRESS, /* struct crypto_report_comp */ | 43 | CRYPTOCFGA_REPORT_COMPRESS, /* struct crypto_report_comp */ |
44 | CRYPTOCFGA_REPORT_RNG, /* struct crypto_report_rng */ | ||
44 | __CRYPTOCFGA_MAX | 45 | __CRYPTOCFGA_MAX |
45 | 46 | ||
46 | #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) | 47 | #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) |
@@ -86,3 +87,8 @@ struct crypto_report_aead { | |||
86 | struct crypto_report_comp { | 87 | struct crypto_report_comp { |
87 | char type[CRYPTO_MAX_NAME]; | 88 | char type[CRYPTO_MAX_NAME]; |
88 | }; | 89 | }; |
90 | |||
91 | struct crypto_report_rng { | ||
92 | char type[CRYPTO_MAX_NAME]; | ||
93 | unsigned int seedsize; | ||
94 | }; | ||