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

s390/pkey: Introduce pkey kernel module 



This patch introcudes a new kernel module pkey which is providing
protected key handling and management functions. The pkey API is
available within the kernel for other s390 specific code to create
and manage protected keys. Additionally the functions are exported
to user space via IOCTL calls. The implementation makes extensive
use of functions provided by the zcrypt device driver. For
generating protected keys from secure keys there is also a CEX
coprocessor card needed.

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

arch/s390/configs/default_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -678,6 +678,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA512_S390=m

arch/s390/configs/performance_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -628,6 +628,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA512_S390=m

arch/s390/defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -229,6 +229,7 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_ZCRYPT=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA512_S390=m

arch/s390/include/asm/pkey.h

0 → 100644
+90 −0
Original line number Original line Diff line number Diff line 
/*

 * Kernelspace interface to the pkey device driver

 *

 * Copyright IBM Corp. 2016

 *

 * Author: Harald Freudenberger <freude@de.ibm.com>

 *

 */



#ifndef _KAPI_PKEY_H

#define _KAPI_PKEY_H



#include <linux/ioctl.h>

#include <linux/types.h>

#include <uapi/asm/pkey.h>



/*

 * Generate (AES) random secure key.

 * @param cardnr may be -1 (use default card)

 * @param domain may be -1 (use default domain)

 * @param keytype one of the PKEY_KEYTYPE values

 * @param seckey pointer to buffer receiving the secure key

 * @return 0 on success, negative errno value on failure

 */

int pkey_genseckey(__u16 cardnr, __u16 domain,

		   __u32 keytype, struct pkey_seckey *seckey);



/*

 * Generate (AES) secure key with given key value.

 * @param cardnr may be -1 (use default card)

 * @param domain may be -1 (use default domain)

 * @param keytype one of the PKEY_KEYTYPE values

 * @param clrkey pointer to buffer with clear key data

 * @param seckey pointer to buffer receiving the secure key

 * @return 0 on success, negative errno value on failure

 */

int pkey_clr2seckey(__u16 cardnr, __u16 domain, __u32 keytype,

		    const struct pkey_clrkey *clrkey,

		    struct pkey_seckey *seckey);



/*

 * Derive (AES) proteced key from the (AES) secure key blob.

 * @param cardnr may be -1 (use default card)

 * @param domain may be -1 (use default domain)

 * @param seckey pointer to buffer with the input secure key

 * @param protkey pointer to buffer receiving the protected key and

 *	  additional info (type, length)

 * @return 0 on success, negative errno value on failure

 */

int pkey_sec2protkey(__u16 cardnr, __u16 domain,

		     const struct pkey_seckey *seckey,

		     struct pkey_protkey *protkey);



/*

 * Derive (AES) protected key from a given clear key value.

 * @param keytype one of the PKEY_KEYTYPE values

 * @param clrkey pointer to buffer with clear key data

 * @param protkey pointer to buffer receiving the protected key and

 *	  additional info (type, length)

 * @return 0 on success, negative errno value on failure

 */

int pkey_clr2protkey(__u32 keytype,

		     const struct pkey_clrkey *clrkey,

		     struct pkey_protkey *protkey);



/*

 * Search for a matching crypto card based on the Master Key

 * Verification Pattern provided inside a secure key.

 * @param seckey pointer to buffer with the input secure key

 * @param cardnr pointer to cardnr, receives the card number on success

 * @param domain pointer to domain, receives the domain number on success

 * @param verify if set, always verify by fetching verification pattern

 *	  from card

 * @return 0 on success, negative errno value on failure. If no card could be

 *	   found, -ENODEV is returned.

 */

int pkey_findcard(const struct pkey_seckey *seckey,

		  __u16 *cardnr, __u16 *domain, int verify);



/*

 * Find card and transform secure key to protected key.

 * @param seckey pointer to buffer with the input secure key

 * @param protkey pointer to buffer receiving the protected key and

 *	  additional info (type, length)

 * @return 0 on success, negative errno value on failure

 */

int pkey_skey2pkey(const struct pkey_seckey *seckey,

		   struct pkey_protkey *protkey);



#endif /* _KAPI_PKEY_H */

arch/s390/include/uapi/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ header-y += mman.h 
header-y += monwriter.h

header-y += monwriter.h

header-y += msgbuf.h

header-y += msgbuf.h

header-y += param.h

header-y += param.h

header-y += pkey.h

header-y += poll.h

header-y += poll.h

header-y += posix_types.h

header-y += posix_types.h

header-y += ptrace.h

header-y += ptrace.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE