diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2011-09-27 01:44:27 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-10-21 08:24:06 -0400 |
commit | 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 (patch) | |
tree | 965521c6a921338d59f3a7ec3de204ab2ebf3d22 | |
parent | 3e29c1095a091f606a26c04a6542061c9e5f1d6b (diff) |
crypto: Add userspace report for aead 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/aead.c | 25 | ||||
-rw-r--r-- | include/linux/cryptouser.h | 9 |
2 files changed, 34 insertions, 0 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 6729e8ff68e7..bb641bd0285b 100644 --- a/crypto/aead.c +++ b/crypto/aead.c | |||
@@ -21,6 +21,8 @@ | |||
21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/seq_file.h> | 23 | #include <linux/seq_file.h> |
24 | #include <linux/cryptouser.h> | ||
25 | #include <net/netlink.h> | ||
24 | 26 | ||
25 | #include "internal.h" | 27 | #include "internal.h" |
26 | 28 | ||
@@ -109,6 +111,28 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask) | |||
109 | return 0; | 111 | return 0; |
110 | } | 112 | } |
111 | 113 | ||
114 | static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) | ||
115 | { | ||
116 | struct crypto_report_aead raead; | ||
117 | struct aead_alg *aead = &alg->cra_aead; | ||
118 | |||
119 | snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "aead"); | ||
120 | snprintf(raead.geniv, CRYPTO_MAX_ALG_NAME, "%s", | ||
121 | aead->geniv ?: "<built-in>"); | ||
122 | |||
123 | raead.blocksize = alg->cra_blocksize; | ||
124 | raead.maxauthsize = aead->maxauthsize; | ||
125 | raead.ivsize = aead->ivsize; | ||
126 | |||
127 | NLA_PUT(skb, CRYPTOCFGA_REPORT_AEAD, | ||
128 | sizeof(struct crypto_report_aead), &raead); | ||
129 | |||
130 | return 0; | ||
131 | |||
132 | nla_put_failure: | ||
133 | return -EMSGSIZE; | ||
134 | } | ||
135 | |||
112 | static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) | 136 | static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) |
113 | __attribute__ ((unused)); | 137 | __attribute__ ((unused)); |
114 | static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) | 138 | static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) |
@@ -130,6 +154,7 @@ const struct crypto_type crypto_aead_type = { | |||
130 | #ifdef CONFIG_PROC_FS | 154 | #ifdef CONFIG_PROC_FS |
131 | .show = crypto_aead_show, | 155 | .show = crypto_aead_show, |
132 | #endif | 156 | #endif |
157 | .report = crypto_aead_report, | ||
133 | }; | 158 | }; |
134 | EXPORT_SYMBOL_GPL(crypto_aead_type); | 159 | EXPORT_SYMBOL_GPL(crypto_aead_type); |
135 | 160 | ||
diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index a96a1a11ee66..48030c7dfb51 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h | |||
@@ -39,6 +39,7 @@ enum crypto_attr_type_t { | |||
39 | CRYPTOCFGA_REPORT_LARVAL, /* struct crypto_report_larval */ | 39 | CRYPTOCFGA_REPORT_LARVAL, /* struct crypto_report_larval */ |
40 | CRYPTOCFGA_REPORT_HASH, /* struct crypto_report_hash */ | 40 | CRYPTOCFGA_REPORT_HASH, /* struct crypto_report_hash */ |
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_MAX | 43 | __CRYPTOCFGA_MAX |
43 | 44 | ||
44 | #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) | 45 | #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) |
@@ -72,3 +73,11 @@ struct crypto_report_blkcipher { | |||
72 | unsigned int max_keysize; | 73 | unsigned int max_keysize; |
73 | unsigned int ivsize; | 74 | unsigned int ivsize; |
74 | }; | 75 | }; |
76 | |||
77 | struct crypto_report_aead { | ||
78 | char type[CRYPTO_MAX_NAME]; | ||
79 | char geniv[CRYPTO_MAX_NAME]; | ||
80 | unsigned int blocksize; | ||
81 | unsigned int maxauthsize; | ||
82 | unsigned int ivsize; | ||
83 | }; | ||