| From 364a65a5644de59fd1557cca44eb47e6b93ba048 Mon Sep 17 00:00:00 2001 |
| From: YueHaibing <yuehaibing@huawei.com> |
| Date: Wed, 13 Nov 2019 17:55:50 +0800 |
| Subject: [PATCH] crypto: atmel - Fix build error of CRYPTO_AUTHENC |
| |
| 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 <hulkci@huawei.com> |
| Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...") |
| Signed-off-by: YueHaibing <yuehaibing@huawei.com> |
| Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig |
| index df178f8c4c2b..4bdd761a8ca9 100644 |
| --- a/drivers/crypto/Kconfig |
| +++ b/drivers/crypto/Kconfig |
| @@ -469,10 +469,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. |
| @@ -484,8 +483,9 @@ config CRYPTO_DEV_ATMEL_AES |
| depends on ARCH_AT91 || COMPILE_TEST |
| select CRYPTO_AES |
| select CRYPTO_AEAD |
| - select CRYPTO_AUTHENC |
| select CRYPTO_BLKCIPHER |
| + 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 |
| -- |
| 2.27.0 |
| |
