From: YueHaibing <yuehaib...@huawei.com>

commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.

If CRYPTO_DEV_ATMEL_AUTHENC is m, CRYPTO_DEV_ATMEL_SHA is m,
but CRYPTO_DEV_ATMEL_AES is y, building will fail:

drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_init_tfm':
atmel-aes.c:(.text+0x670): undefined reference to 
`atmel_sha_authenc_get_reqsize'
atmel-aes.c:(.text+0x67a): undefined reference to `atmel_sha_authenc_spawn'
drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_setkey':
atmel-aes.c:(.text+0x7e5): undefined reference to `atmel_sha_authenc_setkey'

Make CRYPTO_DEV_ATMEL_AUTHENC depend on CRYPTO_DEV_ATMEL_AES,
and select CRYPTO_DEV_ATMEL_SHA and CRYPTO_AUTHENC for it under there.

Reported-by: Hulk Robot <hul...@huawei.com>
Suggested-by: Herbert Xu <herb...@gondor.apana.org.au>
Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...")
Signed-off-by: YueHaibing <yuehaib...@huawei.com>
Reviewed-by: Tudor Ambarus <tudor.amba...@microchip.com>
Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>


---
 drivers/crypto/Kconfig |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -491,10 +491,9 @@ if CRYPTO_DEV_UX500
 endif # if CRYPTO_DEV_UX500
 
 config CRYPTO_DEV_ATMEL_AUTHENC
-       tristate "Support for Atmel IPSEC/SSL hw accelerator"
+       bool "Support for Atmel IPSEC/SSL hw accelerator"
        depends on ARCH_AT91 || COMPILE_TEST
-       select CRYPTO_DEV_ATMEL_AES
-       select CRYPTO_DEV_ATMEL_SHA
+       depends on CRYPTO_DEV_ATMEL_AES
        help
          Some Atmel processors can combine the AES and SHA hw accelerators
          to enhance support of IPSEC/SSL.
@@ -507,7 +506,8 @@ config CRYPTO_DEV_ATMEL_AES
        select CRYPTO_AES
        select CRYPTO_AEAD
        select CRYPTO_BLKCIPHER
-       select CRYPTO_AUTHENC
+       select CRYPTO_AUTHENC if CRYPTO_DEV_ATMEL_AUTHENC
+       select CRYPTO_DEV_ATMEL_SHA if CRYPTO_DEV_ATMEL_AUTHENC
        help
          Some Atmel processors have AES hw accelerator.
          Select this if you want to use the Atmel module for


Reply via email to