crypto: shash - Add shash_instance

This patch adds shash_instance and the associated alloc/free
functions.  This is meant to be an instance that with a shash
algorithm under it.  Note that the instance itself doesn't have
to be shash.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/shash.c b/crypto/shash.c
index 2ccc8b0076ce36ed7d67ff6202e44e90076d7ee2..8f9d8831e29381c5d6cca327b49908affa7f28bb 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -502,5 +502,12 @@ int crypto_unregister_shash(struct shash_alg *alg)
 }
 EXPORT_SYMBOL_GPL(crypto_unregister_shash);
 
+void shash_free_instance(struct crypto_instance *inst)
+{
+       crypto_drop_spawn(crypto_instance_ctx(inst));
+       kfree(shash_instance(inst));
+}
+EXPORT_SYMBOL_GPL(shash_free_instance);
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Synchronous cryptographic hash type");

diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 82b70564bcabe53cc9b109eee004fe419a8e5e44..44d3bcdce6e2cd17fbc06300a7e139ed5918cdd3 100644 (file)
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -34,6 +34,10 @@ struct crypto_hash_walk {
        unsigned int flags;
 };
 
+struct shash_instance {
+       struct shash_alg alg;
+};
+
 extern const struct crypto_type crypto_ahash_type;
 
 int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err);
@@ -46,6 +50,8 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc,
 int crypto_register_shash(struct shash_alg *alg);
 int crypto_unregister_shash(struct shash_alg *alg);
 
+void shash_free_instance(struct crypto_instance *inst);
+
 static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)
 {
        return crypto_tfm_ctx(&tfm->base);
@@ -80,5 +86,25 @@ static inline void *crypto_shash_ctx(struct crypto_shash *tfm)
        return crypto_tfm_ctx(&tfm->base);
 }
 
+static inline struct crypto_instance *shash_crypto_instance(
+       struct shash_instance *inst)
+{
+       return container_of(&inst->alg.base, struct crypto_instance, alg);
+}
+
+static inline struct shash_instance *shash_instance(
+       struct crypto_instance *inst)
+{
+       return container_of(__crypto_shash_alg(&inst->alg),
+                           struct shash_instance, alg);
+}
+
+static inline struct shash_instance *shash_alloc_instance(
+       const char *name, struct crypto_alg *alg)
+{
+       return crypto_alloc_instance2(name, alg,
+                                     sizeof(struct shash_alg) - sizeof(*alg));
+}
+
 #endif /* _CRYPTO_INTERNAL_HASH_H */