OSDN Git Service

crypto: inside-secure - Fix build error with CONFIG_CRYPTO_SM3=m
authorPascal van Leeuwen <pascalvanl@gmail.com>
Thu, 17 Oct 2019 15:36:28 +0000 (17:36 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 23 Oct 2019 08:47:01 +0000 (19:47 +1100)
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.

Fixes: 0f2bc13181ce ("crypto: inside-secure - Added support for...")
Signed-off-by: Pascal van Leeuwen <pvanleeuwen@verimatrix.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/inside-secure/safexcel_hash.c

index a07a291..b60f9fb 100644 (file)
@@ -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;