Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4684f98 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Martin Schwidefsky
Browse files

s390/crypto: fix aes/paes Kconfig dependeny 



The s390_paes and the s390_aes kernel module used just one
config symbol CONFIG_CRYPTO_AES. As paes has a dependency
to PKEY and this requires ZCRYPT the aes module also had
a dependency to the zcrypt device driver which is not true.
Fixed by introducing a new config symbol CONFIG_CRYPTO_PAES
which has dependencies to PKEY and ZCRYPT. Removed the
dependency for the aes module to ZCRYPT.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a1b19d07

arch/s390/crypto/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o sha_common.o 
obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o

obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o paes_s390.o

obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o

obj-$(CONFIG_CRYPTO_PAES_S390) += paes_s390.o

obj-$(CONFIG_S390_PRNG) += prng.o

obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o

obj-$(CONFIG_CRYPTO_CRC32_S390) += crc32-vx_s390.o

drivers/crypto/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -89,6 +89,20 @@ config PKEY 
	  requires to have at least one CEX card in coprocessor mode

	  available at runtime.



config CRYPTO_PAES_S390

	tristate "PAES cipher algorithms"

	depends on S390

	depends on ZCRYPT

	depends on PKEY

	select CRYPTO_ALGAPI

	select CRYPTO_BLKCIPHER

	help

	  This is the s390 hardware accelerated implementation of the

	  AES cipher algorithms for use with protected key.



	  Select this option if you want to use the paes cipher

	  for example to use protected key encrypted devices.



config CRYPTO_SHA1_S390

	tristate "SHA1 digest algorithm"

	depends on S390
@@ -137,7 +151,6 @@ config CRYPTO_AES_S390 
	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_BLKCIPHER

	select PKEY

	help

	  This is the s390 hardware accelerated implementation of the

	  AES cipher algorithms (FIPS-197).