Commit cbbc6755 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Herbert Xu
Browse files

crypto: s390 - New s390 specific protected key hash phmac 



Add support for protected key hmac ("phmac") for s390 arch.

With the latest machine generation there is now support for
protected key (that is a key wrapped by a master key stored
in firmware) hmac for sha2 (sha224, sha256, sha384 and sha512)
for the s390 specific CPACF instruction kmac.

This patch adds support via 4 new ahashes registered as
phmac(sha224), phmac(sha256), phmac(sha384) and phmac(sha512).

Co-developed-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 86ca5cb8

arch/s390/configs/debug_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ CONFIG_PKEY_EP11=m 
CONFIG_PKEY_PCKMO=m

CONFIG_PKEY_UV=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_PHMAC_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

arch/s390/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -806,6 +806,7 @@ CONFIG_PKEY_EP11=m 
CONFIG_PKEY_PCKMO=m

CONFIG_PKEY_UV=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_PHMAC_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

arch/s390/crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,4 +13,5 @@ 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_HMAC_S390) += hmac_s390.o

obj-$(CONFIG_CRYPTO_PHMAC_S390) += phmac_s390.o

obj-y += arch_random.o

arch/s390/crypto/phmac_s390.c

0 → 100644
+911 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/crypto/Kconfig

+13 −0

File changed.

Preview size limit exceeded, changes collapsed.