2019-10-18 21:10:36

by Pascal van Leeuwen

Subject: [PATCH] crypto: inside-secure - Fix build error with CONFIG_CRYPTO_SM3=m

Always take the zero length hash value for SM3 from the local constant
to avoid a reported build error when SM3 is configured to be a module.

Signed-off-by: Pascal van Leeuwen <[email protected]>
---
drivers/crypto/inside-secure/safexcel_hash.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index 85c3a07..c906509a 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -785,12 +785,8 @@ static int safexcel_ahash_final(struct ahash_request *areq)
memcpy(areq->result, sha512_zero_message_hash,
SHA512_DIGEST_SIZE);
else if (ctx->alg == CONTEXT_CONTROL_CRYPTO_ALG_SM3) {
- if (IS_ENABLED(CONFIG_CRYPTO_SM3))
- memcpy(areq->result, sm3_zero_message_hash,
- SM3_DIGEST_SIZE);
- else
- memcpy(areq->result,
- EIP197_SM3_ZEROM_HASH, SM3_DIGEST_SIZE);
+ memcpy(areq->result,
+ EIP197_SM3_ZEROM_HASH, SM3_DIGEST_SIZE);
}

return 0;
--
1.8.3.1

2019-10-19 07:57:30

by Herbert Xu

Subject: Re: [PATCH] crypto: inside-secure - Fix build error with CONFIG_CRYPTO_SM3=m

On Thu, Oct 17, 2019 at 05:36:28PM +0200, Pascal van Leeuwen wrote:
> Always take the zero length hash value for SM3 from the local constant
> to avoid a reported build error when SM3 is configured to be a module.
>
> Signed-off-by: Pascal van Leeuwen <[email protected]>
> ---
> drivers/crypto/inside-secure/safexcel_hash.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt