From ba782f27d7f917825a36f72f71226438cd6c6126 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 27 Sep 2011 07:26:10 +0200
Subject: [PATCH] --- yaml --- r: 272295 b: refs/heads/master c:
 f4d663ce6357e533f107ce3789bd8848c94bea81 h: refs/heads/master i:   272293:
 5eed60d9480c943759f62989f2d08ade29702c91   272291:
 fa0d7d124bfb9fc51ba800a6275ac9ab3305fea5   272287:
 620f0480113fec1bfd024928722ebd7bd4d74be2 v: v3

---
 [refs]                           |  2 +-
 trunk/crypto/shash.c             | 21 +++++++++++++++++++++
 trunk/include/linux/cryptouser.h |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fa8a89158cc3..d90449fd81db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5a86f529a9e9ca4c9aca5fa477e9557d4a3d3d
+refs/heads/master: f4d663ce6357e533f107ce3789bd8848c94bea81
diff --git a/trunk/crypto/shash.c b/trunk/crypto/shash.c
index 76f74b963151..ea8a9c6e21e3 100644
--- a/trunk/crypto/shash.c
+++ b/trunk/crypto/shash.c
@@ -17,6 +17,8 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/seq_file.h>
+#include <linux/cryptouser.h>
+#include <net/netlink.h>
 
 #include "internal.h"
 
@@ -522,6 +524,24 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg)
 	return alg->cra_ctxsize;
 }
 
+static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	struct crypto_report_hash rhash;
+	struct shash_alg *salg = __crypto_shash_alg(alg);
+
+	snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "shash");
+	rhash.blocksize = alg->cra_blocksize;
+	rhash.digestsize = salg->digestsize;
+
+	NLA_PUT(skb, CRYPTOCFGA_REPORT_HASH,
+		sizeof(struct crypto_report_hash), &rhash);
+
+	return 0;
+
+nla_put_failure:
+	return -EMSGSIZE;
+}
+
 static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
 static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
@@ -541,6 +561,7 @@ static const struct crypto_type crypto_shash_type = {
 #ifdef CONFIG_PROC_FS
 	.show = crypto_shash_show,
 #endif
+	.report = crypto_shash_report,
 	.maskclear = ~CRYPTO_ALG_TYPE_MASK,
 	.maskset = CRYPTO_ALG_TYPE_MASK,
 	.type = CRYPTO_ALG_TYPE_SHASH,
diff --git a/trunk/include/linux/cryptouser.h b/trunk/include/linux/cryptouser.h
index 7a849b4c3b82..ee4688221975 100644
--- a/trunk/include/linux/cryptouser.h
+++ b/trunk/include/linux/cryptouser.h
@@ -37,6 +37,7 @@ enum crypto_attr_type_t {
 	CRYPTOCFGA_UNSPEC,
 	CRYPTOCFGA_PRIORITY_VAL,	/* __u32 */
 	CRYPTOCFGA_REPORT_LARVAL,	/* struct crypto_report_larval */
+	CRYPTOCFGA_REPORT_HASH,		/* struct crypto_report_hash */
 	__CRYPTOCFGA_MAX
 
 #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
@@ -55,3 +56,9 @@ struct crypto_user_alg {
 struct crypto_report_larval {
 	char type[CRYPTO_MAX_NAME];
 };
+
+struct crypto_report_hash {
+	char type[CRYPTO_MAX_NAME];
+	unsigned int blocksize;
+	unsigned int digestsize;
+};