s390/pkey: fix/harmonize internal keyblob headers

Browse source

[ Upstream commit 37a08f010b ]

Commit 'fa6999e326 ("s390/pkey: support CCA and EP11 secure ECC
private keys")' introduced PKEY_TYPE_EP11_AES as a supplement to
PKEY_TYPE_EP11. All pkeys have an internal header/payload structure,
which is opaque to the userspace. The header structures for
PKEY_TYPE_EP11 and PKEY_TYPE_EP11_AES are nearly identical and there
is no reason, why different structures are used. In preparation to fix
the keyversion handling in the broken PKEY IOCTLs, the same header
structure is used for PKEY_TYPE_EP11 and PKEY_TYPE_EP11_AES. This
reduces the number of different code paths and increases the
readability.

Fixes: fa6999e326 ("s390/pkey: support CCA and EP11 secure ECC private keys")
Signed-off-by: Holger Dengler <dengler@linux.ibm.com>
Reviewed-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Holger Dengler 2023-07-26 11:33:45 +02:00 • committed by Greg Kroah-Hartman

parent f7595dd677

commit db98bf87de

3 changed files with 4 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/s390/crypto/pkey_api.c

View file

4

drivers/s390/crypto/zcrypt_ep11misc.c

View file

9

drivers/s390/crypto/zcrypt_ep11misc.h

View file