1 files changed, 93 insertions, 9 deletions
diff --git a/crypto/hash.c b/crypto/hash.c
index 7dcff671c19b..f9400a014e74 100644
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -59,24 +59,108 @@ static int hash_setkey(struct crypto_hash *crt, const u8 *key,
        return alg->setkey(crt, key, keylen);
 }
-static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
+static int hash_async_setkey(struct crypto_ahash *tfm_async, const u8 *key,
+                        unsigned int keylen)
+{
+        struct crypto_tfm  *tfm      = crypto_ahash_tfm(tfm_async);
+        struct crypto_hash *tfm_hash = __crypto_hash_cast(tfm);
+        struct hash_alg    *alg      = &tfm->__crt_alg->cra_hash;
+        return alg->setkey(tfm_hash, key, keylen);
+}
+static int hash_async_init(struct ahash_request *req)
+{
+        struct crypto_tfm *tfm = req->base.tfm;
+        struct hash_alg   *alg = &tfm->__crt_alg->cra_hash;
+        struct hash_desc  desc = {
+                .tfm = __crypto_hash_cast(tfm),
+                .flags = req->base.flags,
+        };
+        return alg->init(&desc);
+}
+static int hash_async_update(struct ahash_request *req)
+{
+        struct crypto_tfm *tfm = req->base.tfm;
+        struct hash_alg   *alg = &tfm->__crt_alg->cra_hash;
+        struct hash_desc  desc = {
+                .tfm = __crypto_hash_cast(tfm),
+                .flags = req->base.flags,
+        };
+        return alg->update(&desc, req->src, req->nbytes);
+}
+static int hash_async_final(struct ahash_request *req)
+{
+        struct crypto_tfm *tfm = req->base.tfm;
+        struct hash_alg   *alg = &tfm->__crt_alg->cra_hash;
+        struct hash_desc  desc = {
+                .tfm = __crypto_hash_cast(tfm),
+                .flags = req->base.flags,
+        };
+        return alg->final(&desc, req->result);
+}
+static int hash_async_digest(struct ahash_request *req)
+{
+        struct crypto_tfm *tfm = req->base.tfm;
+        struct hash_alg   *alg = &tfm->__crt_alg->cra_hash;
+        struct hash_desc  desc = {
+                .tfm = __crypto_hash_cast(tfm),
+                .flags = req->base.flags,
+        };
+        return alg->digest(&desc, req->src, req->nbytes, req->result);
+}
+static int crypto_init_hash_ops_async(struct crypto_tfm *tfm)
+{
+        struct ahash_tfm *crt = &tfm->crt_ahash;
+        struct hash_alg  *alg = &tfm->__crt_alg->cra_hash;
+        crt->init       = hash_async_init;
+        crt->update     = hash_async_update;
+        crt->final      = hash_async_final;
+        crt->digest     = hash_async_digest;
+        crt->setkey     = hash_async_setkey;
+        crt->digestsize = alg->digestsize;
+        crt->base       = __crypto_ahash_cast(tfm);
+        return 0;
+}
+static int crypto_init_hash_ops_sync(struct crypto_tfm *tfm)
 {
        struct hash_tfm *crt = &tfm->crt_hash;
        struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
-        if (alg->digestsize > crypto_tfm_alg_blocksize(tfm))
+        crt->init       = alg->init;
-                return -EINVAL;
+        crt->update     = alg->update;
+        crt->final      = alg->final;
-        crt->init = alg->init;
+        crt->digest     = alg->digest;
-        crt->update = alg->update;
+        crt->setkey     = hash_setkey;
-        crt->final = alg->final;
-        crt->digest = alg->digest;
-        crt->setkey = hash_setkey;
        crt->digestsize = alg->digestsize;
        return 0;
 }
+static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
+{
+        struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+        if (alg->digestsize > crypto_tfm_alg_blocksize(tfm))
+                return -EINVAL;
+        if ((mask & CRYPTO_ALG_TYPE_HASH_MASK) != CRYPTO_ALG_TYPE_HASH_MASK)
+                return crypto_init_hash_ops_async(tfm);
+        else
+                return crypto_init_hash_ops_sync(tfm);
+}
 static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
        __attribute__ ((unused));
 static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)

diff --git a/crypto/hash.c b/crypto/hash.c index 7dcff671c19b..f9400a014e74 100644 --- a/crypto/hash.c +++ b/crypto/hash.c
@@ -59,24 +59,108 @@ static int hash_setkey(struct crypto_hash crt, const u8 key,
59	return alg->setkey(crt, key, keylen);	59	return alg->setkey(crt, key, keylen);
60	}	60	}
61		61
62	static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)	62	static int hash_async_setkey(struct crypto_ahash tfm_async, const u8 key,
		63	unsigned int keylen)
		64	{
		65	struct crypto_tfm *tfm = crypto_ahash_tfm(tfm_async);
		66	struct crypto_hash *tfm_hash = __crypto_hash_cast(tfm);
		67	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		68
		69	return alg->setkey(tfm_hash, key, keylen);
		70	}
		71
		72	static int hash_async_init(struct ahash_request *req)
		73	{
		74	struct crypto_tfm *tfm = req->base.tfm;
		75	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		76	struct hash_desc desc = {
		77	.tfm = __crypto_hash_cast(tfm),
		78	.flags = req->base.flags,
		79	};
		80
		81	return alg->init(&desc);
		82	}
		83
		84	static int hash_async_update(struct ahash_request *req)
		85	{
		86	struct crypto_tfm *tfm = req->base.tfm;
		87	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		88	struct hash_desc desc = {
		89	.tfm = __crypto_hash_cast(tfm),
		90	.flags = req->base.flags,
		91	};
		92
		93	return alg->update(&desc, req->src, req->nbytes);
		94	}
		95
		96	static int hash_async_final(struct ahash_request *req)
		97	{
		98	struct crypto_tfm *tfm = req->base.tfm;
		99	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		100	struct hash_desc desc = {
		101	.tfm = __crypto_hash_cast(tfm),
		102	.flags = req->base.flags,
		103	};
		104
		105	return alg->final(&desc, req->result);
		106	}
		107
		108	static int hash_async_digest(struct ahash_request *req)
		109	{
		110	struct crypto_tfm *tfm = req->base.tfm;
		111	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		112	struct hash_desc desc = {
		113	.tfm = __crypto_hash_cast(tfm),
		114	.flags = req->base.flags,
		115	};
		116
		117	return alg->digest(&desc, req->src, req->nbytes, req->result);
		118	}
		119
		120	static int crypto_init_hash_ops_async(struct crypto_tfm *tfm)
		121	{
		122	struct ahash_tfm *crt = &tfm->crt_ahash;
		123	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		124
		125	crt->init = hash_async_init;
		126	crt->update = hash_async_update;
		127	crt->final = hash_async_final;
		128	crt->digest = hash_async_digest;
		129	crt->setkey = hash_async_setkey;
		130	crt->digestsize = alg->digestsize;
		131	crt->base = __crypto_ahash_cast(tfm);
		132
		133	return 0;
		134	}
		135
		136	static int crypto_init_hash_ops_sync(struct crypto_tfm *tfm)
63	{	137	{
64	struct hash_tfm *crt = &tfm->crt_hash;	138	struct hash_tfm *crt = &tfm->crt_hash;
65	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;	139	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
66		140
67	if (alg->digestsize > crypto_tfm_alg_blocksize(tfm))	141	crt->init = alg->init;
68	return -EINVAL;	142	crt->update = alg->update;
69		143	crt->final = alg->final;
70	crt->init = alg->init;	144	crt->digest = alg->digest;
71	crt->update = alg->update;	145	crt->setkey = hash_setkey;
72	crt->final = alg->final;
73	crt->digest = alg->digest;
74	crt->setkey = hash_setkey;
75	crt->digestsize = alg->digestsize;	146	crt->digestsize = alg->digestsize;
76		147
77	return 0;	148	return 0;
78	}	149	}
79		150
		151	static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
		152	{
		153	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
		154
		155	if (alg->digestsize > crypto_tfm_alg_blocksize(tfm))
		156	return -EINVAL;
		157
		158	if ((mask & CRYPTO_ALG_TYPE_HASH_MASK) != CRYPTO_ALG_TYPE_HASH_MASK)
		159	return crypto_init_hash_ops_async(tfm);
		160	else
		161	return crypto_init_hash_ops_sync(tfm);
		162	}
		163
80	static void crypto_hash_show(struct seq_file m, struct crypto_alg alg)	164	static void crypto_hash_show(struct seq_file m, struct crypto_alg alg)
81	__attribute__ ((unused));	165	__attribute__ ((unused));
82	static void crypto_hash_show(struct seq_file m, struct crypto_alg alg)	166	static void crypto_hash_show(struct seq_file m, struct crypto_alg alg)