From: Steffen Klassert Subject: [PATCH 06/16] crypto: Add userspace report for shash type algorithms Date: Thu, 11 Aug 2011 13:29:52 +0200 Message-ID: <20110811112952.GJ16877@secunet.com> References: <20110811112603.GD16877@secunet.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-crypto@vger.kernel.org To: Herbert Xu Return-path: Received: from a.mx.secunet.com ([195.81.216.161]:44128 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755028Ab1HKL33 (ORCPT ); Thu, 11 Aug 2011 07:29:29 -0400 Content-Disposition: inline In-Reply-To: <20110811112603.GD16877@secunet.com> Sender: linux-crypto-owner@vger.kernel.org List-ID: Signed-off-by: Steffen Klassert --- crypto/shash.c | 25 +++++++++++++++++++++++++ include/linux/cryptouser.h | 7 +++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/crypto/shash.c b/crypto/shash.c index 76f74b9..d27a134 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include "internal.h" @@ -522,6 +524,26 @@ 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) + __attribute__ ((unused)); +static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + struct crypto_report_shash rshash; + struct shash_alg *salg = __crypto_shash_alg(alg); + + snprintf(rshash.type, CRYPTO_MAX_ALG_NAME, "%s", "shash"); + rshash.blocksize = alg->cra_blocksize; + rshash.digestsize = salg->digestsize; + + NLA_PUT(skb, CRYPTOCFGA_REPORT_SHASH, + sizeof(struct crypto_report_shash), &rshash); + + 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 +563,9 @@ static const struct crypto_type crypto_shash_type = { #ifdef CONFIG_PROC_FS .show = crypto_shash_show, #endif +#ifdef CONFIG_CRYPTO_USER + .report = crypto_shash_report, +#endif .maskclear = ~CRYPTO_ALG_TYPE_MASK, .maskset = CRYPTO_ALG_TYPE_MASK, .type = CRYPTO_ALG_TYPE_SHASH, diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index d0766e3..8f2b4a1 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h @@ -35,6 +35,7 @@ enum crypto_attr_type_t { CRYPTOCFGA_UNSPEC, CRYPTOCFGA_PRIORITY_VAL, /* __u32 */ CRYPTOCFGA_REPORT_LARVAL, /* struct crypto_report_larval */ + CRYPTOCFGA_REPORT_SHASH, /* struct crypto_report_shash */ __CRYPTOCFGA_MAX #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) @@ -62,3 +63,9 @@ struct crypto_report_larval { char type[CRYPTO_MAX_NAME]; __u32 flags; }; + +struct crypto_report_shash { + char type[CRYPTO_MAX_NAME]; + unsigned int blocksize; + unsigned int digestsize; +}; -- 1.7.0.4