crypto: img-hash - Add support for export and import

Currently the img-hash accelerator does not probe
successfully due to a change in the checks made during
registration with the crypto framework. This is due to
import and export functions not being defined. Correct
this.

Signed-off-by: James Hartley <james.hartley@imgtec.com>
Signed-off-by: Will Thomas <will.thomas@imgtec.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index 2622c0174232b9504fd29e5dfc7b29765e56fdab..fd4cd5120f9e7cdaa6ed09254f40c6a2b57fa217 100644 (file)
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -590,6 +590,32 @@ static int img_hash_finup(struct ahash_request *req)
        return crypto_ahash_finup(&rctx->fallback_req);
 }
 
+static int img_hash_import(struct ahash_request *req, const void *in)
+{
+       struct img_hash_request_ctx *rctx = ahash_request_ctx(req);
+       struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+       struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
+
+       ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
+       rctx->fallback_req.base.flags = req->base.flags
+               & CRYPTO_TFM_REQ_MAY_SLEEP;
+
+       return crypto_ahash_import(&rctx->fallback_req, in);
+}
+
+static int img_hash_export(struct ahash_request *req, void *out)
+{
+       struct img_hash_request_ctx *rctx = ahash_request_ctx(req);
+       struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+       struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
+
+       ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
+       rctx->fallback_req.base.flags = req->base.flags
+               & CRYPTO_TFM_REQ_MAY_SLEEP;
+
+       return crypto_ahash_export(&rctx->fallback_req, out);
+}
+
 static int img_hash_digest(struct ahash_request *req)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -646,10 +672,9 @@ static int img_hash_digest(struct ahash_request *req)
        return err;
 }
 
-static int img_hash_cra_init(struct crypto_tfm *tfm)
+static int img_hash_cra_init(struct crypto_tfm *tfm, const char *alg_name)
 {
        struct img_hash_ctx *ctx = crypto_tfm_ctx(tfm);
-       const char *alg_name = crypto_tfm_alg_name(tfm);
        int err = -ENOMEM;
 
        ctx->fallback = crypto_alloc_ahash(alg_name, 0,
@@ -669,6 +694,26 @@ err:
        return err;
 }
 
+static int img_hash_cra_md5_init(struct crypto_tfm *tfm)
+{
+       return img_hash_cra_init(tfm, "md5-generic");
+}
+
+static int img_hash_cra_sha1_init(struct crypto_tfm *tfm)
+{
+       return img_hash_cra_init(tfm, "sha1-generic");
+}
+
+static int img_hash_cra_sha224_init(struct crypto_tfm *tfm)
+{
+       return img_hash_cra_init(tfm, "sha224-generic");
+}
+
+static int img_hash_cra_sha256_init(struct crypto_tfm *tfm)
+{
+       return img_hash_cra_init(tfm, "sha256-generic");
+}
+
 static void img_hash_cra_exit(struct crypto_tfm *tfm)
 {
        struct img_hash_ctx *tctx = crypto_tfm_ctx(tfm);
@@ -714,9 +759,12 @@ static struct ahash_alg img_algs[] = {
                .update = img_hash_update,
                .final = img_hash_final,
                .finup = img_hash_finup,
+               .export = img_hash_export,
+               .import = img_hash_import,
                .digest = img_hash_digest,
                .halg = {
                        .digestsize = MD5_DIGEST_SIZE,
+                       .statesize = sizeof(struct md5_state),
                        .base = {
                                .cra_name = "md5",
                                .cra_driver_name = "img-md5",
@@ -726,7 +774,7 @@ static struct ahash_alg img_algs[] = {
                                CRYPTO_ALG_NEED_FALLBACK,
                                .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct img_hash_ctx),
-                               .cra_init = img_hash_cra_init,
+                               .cra_init = img_hash_cra_md5_init,
                                .cra_exit = img_hash_cra_exit,
                                .cra_module = THIS_MODULE,
                        }
@@ -737,9 +785,12 @@ static struct ahash_alg img_algs[] = {
                .update = img_hash_update,
                .final = img_hash_final,
                .finup = img_hash_finup,
+               .export = img_hash_export,
+               .import = img_hash_import,
                .digest = img_hash_digest,
                .halg = {
                        .digestsize = SHA1_DIGEST_SIZE,
+                       .statesize = sizeof(struct sha1_state),
                        .base = {
                                .cra_name = "sha1",
                                .cra_driver_name = "img-sha1",
@@ -749,7 +800,7 @@ static struct ahash_alg img_algs[] = {
                                CRYPTO_ALG_NEED_FALLBACK,
                                .cra_blocksize = SHA1_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct img_hash_ctx),
-                               .cra_init = img_hash_cra_init,
+                               .cra_init = img_hash_cra_sha1_init,
                                .cra_exit = img_hash_cra_exit,
                                .cra_module = THIS_MODULE,
                        }
@@ -760,9 +811,12 @@ static struct ahash_alg img_algs[] = {
                .update = img_hash_update,
                .final = img_hash_final,
                .finup = img_hash_finup,
+               .export = img_hash_export,
+               .import = img_hash_import,
                .digest = img_hash_digest,
                .halg = {
                        .digestsize = SHA224_DIGEST_SIZE,
+                       .statesize = sizeof(struct sha256_state),
                        .base = {
                                .cra_name = "sha224",
                                .cra_driver_name = "img-sha224",
@@ -772,7 +826,7 @@ static struct ahash_alg img_algs[] = {
                                CRYPTO_ALG_NEED_FALLBACK,
                                .cra_blocksize = SHA224_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct img_hash_ctx),
-                               .cra_init = img_hash_cra_init,
+                               .cra_init = img_hash_cra_sha224_init,
                                .cra_exit = img_hash_cra_exit,
                                .cra_module = THIS_MODULE,
                        }
@@ -783,9 +837,12 @@ static struct ahash_alg img_algs[] = {
                .update = img_hash_update,
                .final = img_hash_final,
                .finup = img_hash_finup,
+               .export = img_hash_export,
+               .import = img_hash_import,
                .digest = img_hash_digest,
                .halg = {
                        .digestsize = SHA256_DIGEST_SIZE,
+                       .statesize = sizeof(struct sha256_state),
                        .base = {
                                .cra_name = "sha256",
                                .cra_driver_name = "img-sha256",
@@ -795,7 +852,7 @@ static struct ahash_alg img_algs[] = {
                                CRYPTO_ALG_NEED_FALLBACK,
                                .cra_blocksize = SHA256_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct img_hash_ctx),
-                               .cra_init = img_hash_cra_init,
+                               .cra_init = img_hash_cra_sha256_init,
                                .cra_exit = img_hash_cra_exit,
                                .cra_module = THIS_MODULE,
                        }