Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / crypto / ghash-clmulni-intel_glue.c

diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index 4bcf841e47013d4474ed5ecd0054f736fcde6b77..3deb8e533359a8e3c062a7c5a68c467ee9938306 100644 (file)
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -218,6 +218,29 @@ static int ghash_async_final(struct ahash_request *req)
        }
 }
 
+static int ghash_async_import(struct ahash_request *req, const void *in)
+{
+       struct ahash_request *cryptd_req = ahash_request_ctx(req);
+       struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
+       struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+       ghash_async_init(req);
+       memcpy(dctx, in, sizeof(*dctx));
+       return 0;
+
+}
+
+static int ghash_async_export(struct ahash_request *req, void *out)
+{
+       struct ahash_request *cryptd_req = ahash_request_ctx(req);
+       struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
+       struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+       memcpy(out, dctx, sizeof(*dctx));
+       return 0;
+
+}
+
 static int ghash_async_digest(struct ahash_request *req)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -285,8 +308,11 @@ static struct ahash_alg ghash_async_alg = {
        .final          = ghash_async_final,
        .setkey         = ghash_async_setkey,
        .digest         = ghash_async_digest,
+       .export         = ghash_async_export,
+       .import         = ghash_async_import,
        .halg = {
                .digestsize     = GHASH_DIGEST_SIZE,
+               .statesize = sizeof(struct ghash_desc_ctx),
                .base = {
                        .cra_name               = "ghash",
                        .cra_driver_name        = "ghash-clmulni",