]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: hisilicon - select CRYPTO_LIB_DES while compiling SEC driver
authorMao Wenan <maowenan@huawei.com>
Wed, 28 Aug 2019 08:07:40 +0000 (16:07 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 30 Aug 2019 08:05:31 +0000 (18:05 +1000)
When CRYPTO_DEV_HISI_SEC=y, below compilation error is found after
'commit 894b68d8be4b ("crypto: hisilicon/des - switch to new verification routines")':

drivers/crypto/hisilicon/sec/sec_algs.o: In function `sec_alg_skcipher_setkey_des_cbc':
sec_algs.c:(.text+0x11f0): undefined reference to `des_expand_key'
drivers/crypto/hisilicon/sec/sec_algs.o: In function `sec_alg_skcipher_setkey_des_ecb':
sec_algs.c:(.text+0x1390): undefined reference to `des_expand_key'
make: *** [vmlinux] Error 1

This because DES library has been moved to lib/crypto in this commit
'04007b0e6cbb ("crypto: des - split off DES library from generic DES cipher driver")'.
Fix this by selecting CRYPTO_LIB_DES in CRYPTO_DEV_HISI_SEC.

Fixes: 04007b0e6cbb ("crypto: des - split off DES library from generic DES cipher driver")
Fixes: 894b68d8be4b ("crypto: hisilicon/des - switch to new verification routines")
Signed-off-by: Mao Wenan <maowenan@huawei.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/hisilicon/Kconfig

index fa8aa063bb651d45e72e4ad56d50bf92424719d9..ebaf91e0146d17058e2ae8d344fdfda03044880b 100644 (file)
@@ -4,6 +4,7 @@ config CRYPTO_DEV_HISI_SEC
        tristate "Support for Hisilicon SEC crypto block cipher accelerator"
        select CRYPTO_BLKCIPHER
        select CRYPTO_ALGAPI
+       select CRYPTO_LIB_DES
        select SG_SPLIT
        depends on ARM64 || COMPILE_TEST
        depends on HAS_IOMEM