crypto: api - Remove frontend argument from extsize/init_tfm

[firefly-linux-kernel-4.4.55.git] / crypto / shash.c

diff --git a/crypto/shash.c b/crypto/shash.c
index 131e14d2b57215d4ac360b710e1013abbe5833e3..7063e1421504a06a244e679b0cafe140bfb39f61 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -202,9 +202,8 @@ static int shash_async_init(struct ahash_request *req)
        return crypto_shash_init(desc);
 }
 
-static int shash_async_update(struct ahash_request *req)
+int shash_ahash_update(struct ahash_request *req, struct shash_desc *desc)
 {
-       struct shash_desc *desc = ahash_request_ctx(req);
        struct crypto_hash_walk walk;
        int nbytes;
 
@@ -214,13 +213,19 @@ static int shash_async_update(struct ahash_request *req)
 
        return nbytes;
 }
+EXPORT_SYMBOL_GPL(shash_ahash_update);
+
+static int shash_async_update(struct ahash_request *req)
+{
+       return shash_ahash_update(req, ahash_request_ctx(req));
+}
 
 static int shash_async_final(struct ahash_request *req)
 {
        return crypto_shash_final(ahash_request_ctx(req), req->result);
 }
 
-static int shash_async_digest(struct ahash_request *req)
+int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)
 {
        struct scatterlist *sg = req->src;
        unsigned int offset = sg->offset;
@@ -228,34 +233,31 @@ static int shash_async_digest(struct ahash_request *req)
        int err;
 
        if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {
-               struct crypto_shash **ctx =
-                       crypto_ahash_ctx(crypto_ahash_reqtfm(req));
-               struct shash_desc *desc = ahash_request_ctx(req);
                void *data;
 
-               desc->tfm = *ctx;
-               desc->flags = req->base.flags;
-
                data = crypto_kmap(sg_page(sg), 0);
                err = crypto_shash_digest(desc, data + offset, nbytes,
                                          req->result);
                crypto_kunmap(data, 0);
                crypto_yield(desc->flags);
-               goto out;
-       }
+       } else
+               err = crypto_shash_init(desc) ?:
+                     shash_ahash_update(req, desc) ?:
+                     crypto_shash_final(desc, req->result);
 
-       err = shash_async_init(req);
-       if (err)
-               goto out;
+       return err;
+}
+EXPORT_SYMBOL_GPL(shash_ahash_digest);
 
-       err = shash_async_update(req);
-       if (err)
-               goto out;
+static int shash_async_digest(struct ahash_request *req)
+{
+       struct crypto_shash **ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));
+       struct shash_desc *desc = ahash_request_ctx(req);
 
-       err = shash_async_final(req);
+       desc->tfm = *ctx;
+       desc->flags = req->base.flags;
 
-out:
-       return err;
+       return shash_ahash_digest(req, desc);
 }
 
 static void crypto_exit_shash_ops_async(struct crypto_tfm *tfm)
@@ -300,14 +302,16 @@ static int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
 static int shash_compat_setkey(struct crypto_hash *tfm, const u8 *key,
                               unsigned int keylen)
 {
-       struct shash_desc *desc = crypto_hash_ctx(tfm);
+       struct shash_desc **descp = crypto_hash_ctx(tfm);
+       struct shash_desc *desc = *descp;
 
        return crypto_shash_setkey(desc->tfm, key, keylen);
 }
 
 static int shash_compat_init(struct hash_desc *hdesc)
 {
-       struct shash_desc *desc = crypto_hash_ctx(hdesc->tfm);
+       struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
+       struct shash_desc *desc = *descp;
 
        desc->flags = hdesc->flags;
 
@@ -317,7 +321,8 @@ static int shash_compat_init(struct hash_desc *hdesc)
 static int shash_compat_update(struct hash_desc *hdesc, struct scatterlist *sg,
                               unsigned int len)
 {
-       struct shash_desc *desc = crypto_hash_ctx(hdesc->tfm);
+       struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
+       struct shash_desc *desc = *descp;
        struct crypto_hash_walk walk;
        int nbytes;
 
@@ -330,7 +335,9 @@ static int shash_compat_update(struct hash_desc *hdesc, struct scatterlist *sg,
 
 static int shash_compat_final(struct hash_desc *hdesc, u8 *out)
 {
-       return crypto_shash_final(crypto_hash_ctx(hdesc->tfm), out);
+       struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
+
+       return crypto_shash_final(*descp, out);
 }
 
 static int shash_compat_digest(struct hash_desc *hdesc, struct scatterlist *sg,
@@ -340,7 +347,8 @@ static int shash_compat_digest(struct hash_desc *hdesc, struct scatterlist *sg,
        int err;
 
        if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {
-               struct shash_desc *desc = crypto_hash_ctx(hdesc->tfm);
+               struct shash_desc **descp = crypto_hash_ctx(hdesc->tfm);
+               struct shash_desc *desc = *descp;
                void *data;
 
                desc->flags = hdesc->flags;
@@ -368,9 +376,11 @@ out:
 
 static void crypto_exit_shash_ops_compat(struct crypto_tfm *tfm)
 {
-       struct shash_desc *desc= crypto_tfm_ctx(tfm);
+       struct shash_desc **descp = crypto_tfm_ctx(tfm);
+       struct shash_desc *desc = *descp;
 
        crypto_free_shash(desc->tfm);
+       kzfree(desc);
 }
 
 static int crypto_init_shash_ops_compat(struct crypto_tfm *tfm)
@@ -378,8 +388,9 @@ static int crypto_init_shash_ops_compat(struct crypto_tfm *tfm)
        struct hash_tfm *crt = &tfm->crt_hash;
        struct crypto_alg *calg = tfm->__crt_alg;
        struct shash_alg *alg = __crypto_shash_alg(calg);
-       struct shash_desc *desc = crypto_tfm_ctx(tfm);
+       struct shash_desc **descp = crypto_tfm_ctx(tfm);
        struct crypto_shash *shash;
+       struct shash_desc *desc;
 
        if (!crypto_mod_get(calg))
                return -EAGAIN;
@@ -390,6 +401,14 @@ static int crypto_init_shash_ops_compat(struct crypto_tfm *tfm)
                return PTR_ERR(shash);
        }
 
+       desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(shash),
+                      GFP_KERNEL);
+       if (!desc) {
+               crypto_free_shash(shash);
+               return -ENOMEM;
+       }
+
+       *descp = desc;
        desc->tfm = shash;
        tfm->exit = crypto_exit_shash_ops_compat;
 
@@ -419,11 +438,9 @@ static int crypto_init_shash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type,
                                         u32 mask)
 {
-       struct shash_alg *salg = __crypto_shash_alg(alg);
-
        switch (mask & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_HASH_MASK:
-               return sizeof(struct shash_desc) + salg->descsize;
+               return sizeof(struct shash_desc *);
        case CRYPTO_ALG_TYPE_AHASH_MASK:
                return sizeof(struct crypto_shash *);
        }
@@ -431,14 +448,15 @@ static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type,
        return 0;
 }
 
-static int crypto_shash_init_tfm(struct crypto_tfm *tfm,
-                                const struct crypto_type *frontend)
+static int crypto_shash_init_tfm(struct crypto_tfm *tfm)
 {
+       struct crypto_shash *hash = __crypto_shash_cast(tfm);
+
+       hash->descsize = crypto_shash_alg(hash)->descsize;
        return 0;
 }
 
-static unsigned int crypto_shash_extsize(struct crypto_alg *alg,
-                                        const struct crypto_type *frontend)
+static unsigned int crypto_shash_extsize(struct crypto_alg *alg)
 {
        return alg->cra_ctxsize;
 }
@@ -452,7 +470,6 @@ static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
        seq_printf(m, "type         : shash\n");
        seq_printf(m, "blocksize    : %u\n", alg->cra_blocksize);
        seq_printf(m, "digestsize   : %u\n", salg->digestsize);
-       seq_printf(m, "descsize     : %u\n", salg->descsize);
 }
 
 static const struct crypto_type crypto_shash_type = {