Skip to content

Commit cbbc675

Browse files
hfreudeherbertx
authored andcommitted
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: Holger Dengler <dengler@linux.ibm.com> Signed-off-by: Harald Freudenberger <freude@linux.ibm.com> Reviewed-by: Holger Dengler <dengler@linux.ibm.com> Signed-off-by: Holger Dengler <dengler@linux.ibm.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 86ca5cb commit cbbc675

File tree

5 files changed

+927
-0
lines changed

5 files changed

+927
-0
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ CONFIG_PKEY_EP11=m
819819
CONFIG_PKEY_PCKMO=m
820820
CONFIG_PKEY_UV=m
821821
CONFIG_CRYPTO_PAES_S390=m
822+
CONFIG_CRYPTO_PHMAC_S390=m
822823
CONFIG_CRYPTO_DEV_VIRTIO=m
823824
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
824825
CONFIG_CRYPTO_KRB5=m

arch/s390/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,7 @@ CONFIG_PKEY_EP11=m
806806
CONFIG_PKEY_PCKMO=m
807807
CONFIG_PKEY_UV=m
808808
CONFIG_CRYPTO_PAES_S390=m
809+
CONFIG_CRYPTO_PHMAC_S390=m
809810
CONFIG_CRYPTO_DEV_VIRTIO=m
810811
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
811812
CONFIG_CRYPTO_KRB5=m

arch/s390/crypto/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ obj-$(CONFIG_CRYPTO_PAES_S390) += paes_s390.o
1313
obj-$(CONFIG_S390_PRNG) += prng.o
1414
obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o
1515
obj-$(CONFIG_CRYPTO_HMAC_S390) += hmac_s390.o
16+
obj-$(CONFIG_CRYPTO_PHMAC_S390) += phmac_s390.o
1617
obj-y += arch_random.o

0 commit comments

Comments
 (0)