From 106fa0523b7eac189b2547df39d20761015ee11e Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 8 Jul 2009 17:56:28 +0800
Subject: [PATCH] --- yaml --- r: 157949 b: refs/heads/master c:
 7d6f56400a695af497a8b7c23ea0ff9c3d9d99f4 h: refs/heads/master i:   157947:
 f38244be31f32bad066cd254129158684ded183e v: v3

---
 [refs]                               |  2 +-
 trunk/crypto/shash.c                 | 10 ++++++++++
 trunk/include/crypto/internal/hash.h |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3288d30dd684..78cb636eb5a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d06854f0243d91badabaab14503f7f3bb770061d
+refs/heads/master: 7d6f56400a695af497a8b7c23ea0ff9c3d9d99f4
diff --git a/trunk/crypto/shash.c b/trunk/crypto/shash.c
index 97f6c8ba103a..21bcff6be5b0 100644
--- a/trunk/crypto/shash.c
+++ b/trunk/crypto/shash.c
@@ -518,5 +518,15 @@ int crypto_init_shash_spawn(struct crypto_shash_spawn *spawn,
 }
 EXPORT_SYMBOL_GPL(crypto_init_shash_spawn);
 
+struct shash_alg *shash_attr_alg(struct rtattr *rta, u32 type, u32 mask)
+{
+	struct crypto_alg *alg;
+
+	alg = crypto_attr_alg2(rta, &crypto_shash_type, type, mask);
+	return IS_ERR(alg) ? ERR_CAST(alg) :
+	       container_of(alg, struct shash_alg, base);
+}
+EXPORT_SYMBOL_GPL(shash_attr_alg);
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Synchronous cryptographic hash type");
diff --git a/trunk/include/crypto/internal/hash.h b/trunk/include/crypto/internal/hash.h
index 6cc824b79331..e2ab35a74c62 100644
--- a/trunk/include/crypto/internal/hash.h
+++ b/trunk/include/crypto/internal/hash.h
@@ -60,6 +60,8 @@ int crypto_init_shash_spawn(struct crypto_shash_spawn *spawn,
 			    struct shash_alg *alg,
 			    struct crypto_instance *inst);
 
+struct shash_alg *shash_attr_alg(struct rtattr *rta, u32 type, u32 mask);
+
 static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)
 {
 	return crypto_tfm_ctx(&tfm->base);