3 files changed, 89 insertions, 60 deletions

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index fcc02d978231..262861d8f0cb 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -15,6 +15,39 @@
 
 #include <linux/crypto.h>
 
+struct crypto_ahash;
+
+struct hash_alg_common {
+        unsigned int digestsize;
+        unsigned int statesize;
+
+        struct crypto_alg base;
+};
+
+struct ahash_request {
+        struct crypto_async_request base;
+
+        unsigned int nbytes;
+        struct scatterlist *src;
+        u8 *result;
+
+        void *__ctx[] CRYPTO_MINALIGN_ATTR;
+};
+
+struct ahash_alg {
+        int (*init)(struct ahash_request *req);
+        int (*update)(struct ahash_request *req);
+        int (*final)(struct ahash_request *req);
+        int (*finup)(struct ahash_request *req);
+        int (*digest)(struct ahash_request *req);
+        int (*export)(struct ahash_request *req, void *out);
+        int (*import)(struct ahash_request *req, const void *in);
+        int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
+                      unsigned int keylen);
+
+        struct hash_alg_common halg;
+};
+
 struct shash_desc {
         struct crypto_shash *tfm;
         u32 flags;
@@ -37,6 +70,8 @@ struct shash_alg {
                       unsigned int keylen);
 
         unsigned int descsize;
+
+        /* These fields must match hash_alg_common. */
         unsigned int digestsize;
         unsigned int statesize;
 
@@ -44,6 +79,18 @@ struct shash_alg {
 };
 
 struct crypto_ahash {
+        int (*init)(struct ahash_request *req);
+        int (*update)(struct ahash_request *req);
+        int (*final)(struct ahash_request *req);
+        int (*finup)(struct ahash_request *req);
+        int (*digest)(struct ahash_request *req);
+        int (*export)(struct ahash_request *req, void *out);
+        int (*import)(struct ahash_request *req, const void *in);
+        int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
+                      unsigned int keylen);
+
+        unsigned int digestsize;
+        unsigned int reqsize;
         struct crypto_tfm base;
 };
 
@@ -54,19 +101,11 @@ struct crypto_shash {
 
 static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm)
 {
-        return (struct crypto_ahash *)tfm;
+        return container_of(tfm, struct crypto_ahash, base);
 }
 
-static inline struct crypto_ahash *crypto_alloc_ahash(const char *alg_name,
-                                                      u32 type, u32 mask)
-{
-        type &= ~CRYPTO_ALG_TYPE_MASK;
-        mask &= ~CRYPTO_ALG_TYPE_MASK;
-        type |= CRYPTO_ALG_TYPE_AHASH;
-        mask |= CRYPTO_ALG_TYPE_AHASH_MASK;
-
-        return __crypto_ahash_cast(crypto_alloc_base(alg_name, type, mask));
-}
+struct crypto_ahash *crypto_alloc_ahash(const char *alg_name, u32 type,
+                                        u32 mask);
 
 static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm)
 {
@@ -75,7 +114,7 @@ static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm)
 
 static inline void crypto_free_ahash(struct crypto_ahash *tfm)
 {
-        crypto_free_tfm(crypto_ahash_tfm(tfm));
+        crypto_destroy_tfm(tfm, crypto_ahash_tfm(tfm));
 }
 
 static inline unsigned int crypto_ahash_alignmask(
@@ -84,14 +123,26 @@ static inline unsigned int crypto_ahash_alignmask(
         return crypto_tfm_alg_alignmask(crypto_ahash_tfm(tfm));
 }
 
-static inline struct ahash_tfm *crypto_ahash_crt(struct crypto_ahash *tfm)
+static inline struct hash_alg_common *__crypto_hash_alg_common(
+        struct crypto_alg *alg)
 {
-        return &crypto_ahash_tfm(tfm)->crt_ahash;
+        return container_of(alg, struct hash_alg_common, base);
+}
+
+static inline struct hash_alg_common *crypto_hash_alg_common(
+        struct crypto_ahash *tfm)
+{
+        return __crypto_hash_alg_common(crypto_ahash_tfm(tfm)->__crt_alg);
 }
 
 static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm)
 {
-        return crypto_ahash_crt(tfm)->digestsize;
+        return tfm->digestsize;
+}
+
+static inline unsigned int crypto_ahash_statesize(struct crypto_ahash *tfm)
+{
+        return crypto_hash_alg_common(tfm)->statesize;
 }
 
 static inline u32 crypto_ahash_get_flags(struct crypto_ahash *tfm)
@@ -117,7 +168,7 @@ static inline struct crypto_ahash *crypto_ahash_reqtfm(
 
 static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm)
 {
-        return crypto_ahash_crt(tfm)->reqsize;
+        return tfm->reqsize;
 }
 
 static inline void *ahash_request_ctx(struct ahash_request *req)
@@ -128,41 +179,37 @@ static inline void *ahash_request_ctx(struct ahash_request *req)
 static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
                                       const u8 *key, unsigned int keylen)
 {
-        struct ahash_tfm *crt = crypto_ahash_crt(tfm);
-
-        return crt->setkey(tfm, key, keylen);
+        return tfm->setkey(tfm, key, keylen);
 }
 
 static inline int crypto_ahash_digest(struct ahash_request *req)
 {
-        struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
-        return crt->digest(req);
+        return crypto_ahash_reqtfm(req)->digest(req);
 }
 
-static inline void crypto_ahash_export(struct ahash_request *req, u8 *out)
+static inline int crypto_ahash_export(struct ahash_request *req, void *out)
 {
-        memcpy(out, ahash_request_ctx(req),
-               crypto_ahash_reqsize(crypto_ahash_reqtfm(req)));
+        return crypto_ahash_reqtfm(req)->export(req, out);
 }
 
-int crypto_ahash_import(struct ahash_request *req, const u8 *in);
+static inline int crypto_ahash_import(struct ahash_request *req, const void *in)
+{
+        return crypto_ahash_reqtfm(req)->import(req, in);
+}
 
 static inline int crypto_ahash_init(struct ahash_request *req)
 {
-        struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
-        return crt->init(req);
+        return crypto_ahash_reqtfm(req)->init(req);
 }
 
 static inline int crypto_ahash_update(struct ahash_request *req)
 {
-        struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
-        return crt->update(req);
+        return crypto_ahash_reqtfm(req)->update(req);
 }
 
 static inline int crypto_ahash_final(struct ahash_request *req)
 {
-        struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
-        return crt->final(req);
+        return crypto_ahash_reqtfm(req)->final(req);
 }
 
 static inline void ahash_request_set_tfm(struct ahash_request *req,
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 5e45818f3351..08bdffafefad 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -51,6 +51,9 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc,
                                   struct crypto_hash_walk *walk,
                                   struct scatterlist *sg, unsigned int len);
 
+int crypto_register_ahash(struct ahash_alg *alg);
+int crypto_unregister_ahash(struct ahash_alg *alg);
+
 int crypto_register_shash(struct shash_alg *alg);
 int crypto_unregister_shash(struct shash_alg *alg);
 int shash_register_instance(struct crypto_template *tmpl,
@@ -66,12 +69,14 @@ struct shash_alg *shash_attr_alg(struct rtattr *rta, u32 type, u32 mask);
 int shash_ahash_update(struct ahash_request *req, struct shash_desc *desc);
 int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc);
 
+int crypto_init_shash_ops_async(struct crypto_tfm *tfm);
+
 static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)
 {
-        return crypto_tfm_ctx(&tfm->base);
+        return crypto_tfm_ctx(crypto_ahash_tfm(tfm));
 }
 
-static inline struct ahash_alg *crypto_ahash_alg(
+static inline struct old_ahash_alg *crypto_old_ahash_alg(
         struct crypto_ahash *tfm)
 {
         return &crypto_ahash_tfm(tfm)->__crt_alg->cra_ahash;
@@ -80,7 +85,7 @@ static inline struct ahash_alg *crypto_ahash_alg(
 static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm,
                                             unsigned int reqsize)
 {
-        crypto_ahash_crt(tfm)->reqsize = reqsize;
+        tfm->reqsize = reqsize;
 }
 
 static inline int ahash_enqueue_request(struct crypto_queue *queue,
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 274f9c7da90c..9e7e9b62a3dc 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -120,6 +120,7 @@ struct crypto_rng;
 struct crypto_tfm;
 struct crypto_type;
 struct aead_givcrypt_request;
+struct ahash_request;
 struct skcipher_givcrypt_request;
 
 typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err);
@@ -146,16 +147,6 @@ struct ablkcipher_request {
         void *__ctx[] CRYPTO_MINALIGN_ATTR;
 };
 
-struct ahash_request {
-        struct crypto_async_request base;
-
-        unsigned int nbytes;
-        struct scatterlist *src;
-        u8                 *result;
-
-        void *__ctx[] CRYPTO_MINALIGN_ATTR;
-};
-
 /**
  *      struct aead_request - AEAD request
  *      @base: Common attributes for async crypto requests
@@ -220,7 +211,7 @@ struct ablkcipher_alg {
         unsigned int ivsize;
 };
 
-struct ahash_alg {
+struct old_ahash_alg {
         int (*init)(struct ahash_request *req);
         int (*reinit)(struct ahash_request *req);
         int (*update)(struct ahash_request *req);
@@ -346,7 +337,7 @@ struct crypto_alg {
                 struct cipher_alg cipher;
                 struct digest_alg digest;
                 struct hash_alg hash;
-                struct ahash_alg ahash;
+                struct old_ahash_alg ahash;
                 struct compress_alg compress;
                 struct rng_alg rng;
         } cra_u;
@@ -433,18 +424,6 @@ struct hash_tfm {
         unsigned int digestsize;
 };
 
-struct ahash_tfm {
-        int (*init)(struct ahash_request *req);
-        int (*update)(struct ahash_request *req);
-        int (*final)(struct ahash_request *req);
-        int (*digest)(struct ahash_request *req);
-        int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
-                        unsigned int keylen);
-
-        unsigned int digestsize;
-        unsigned int reqsize;
-};
-
 struct compress_tfm {
         int (*cot_compress)(struct crypto_tfm *tfm,
                             const u8 *src, unsigned int slen,
@@ -465,7 +444,6 @@ struct rng_tfm {
 #define crt_blkcipher   crt_u.blkcipher
 #define crt_cipher      crt_u.cipher
 #define crt_hash        crt_u.hash
-#define crt_ahash       crt_u.ahash
 #define crt_compress    crt_u.compress
 #define crt_rng         crt_u.rng
 
@@ -479,7 +457,6 @@ struct crypto_tfm {
                 struct blkcipher_tfm blkcipher;
                 struct cipher_tfm cipher;
                 struct hash_tfm hash;
-                struct ahash_tfm ahash;
                 struct compress_tfm compress;
                 struct rng_tfm rng;
         } crt_u;