crypto: hisilicon/sec2 - Fix aead authentication setting key error

Fix aead auth setting key process error. if use soft shash function, driver
need to use digest size replace of the user input key length.

Signed-off-by: Kai Ye <yekai13@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
index 87bc08afe567d95eceea6b98c4db1a468a6ed65f..891e049146155c2a8531a3d70c983854ed83712d 100644 (file)
--- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
+++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
@@ -857,7 +857,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx,
                                 struct crypto_authenc_keys *keys)
 {
        struct crypto_shash *hash_tfm = ctx->hash_tfm;
-       int blocksize, ret;
+       int blocksize, digestsize, ret;
 
        if (!keys->authkeylen) {
                pr_err("hisi_sec2: aead auth key error!\n");
@@ -865,6 +865,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx,
        }
 
        blocksize = crypto_shash_blocksize(hash_tfm);
+       digestsize = crypto_shash_digestsize(hash_tfm);
        if (keys->authkeylen > blocksize) {
                ret = crypto_shash_tfm_digest(hash_tfm, keys->authkey,
                                              keys->authkeylen, ctx->a_key);
@@ -872,7 +873,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx,
                        pr_err("hisi_sec2: aead auth digest error!\n");
                        return -EINVAL;
                }
-               ctx->a_key_len = blocksize;
+               ctx->a_key_len = digestsize;
        } else {
                memcpy(ctx->a_key, keys->authkey, keys->authkeylen);
                ctx->a_key_len = keys->authkeylen;