397a93
From d4bb3258779d757ce6faf5b698c70af77ab7647f Mon Sep 17 00:00:00 2001
397a93
From: Ingo Franzki <ifranzki@linux.ibm.com>
397a93
Date: Wed, 16 Feb 2022 13:51:16 +0100
397a93
Subject: [PATCH 17/34] COMMON: Add defines for Kyber
397a93
397a93
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
397a93
---
397a93
 usr/include/pkcs11types.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++
397a93
 usr/lib/common/p11util.c  |  4 ++++
397a93
 2 files changed, 53 insertions(+)
397a93
397a93
diff --git a/usr/include/pkcs11types.h b/usr/include/pkcs11types.h
397a93
index 6bf9c1fa..3d967a13 100644
397a93
--- a/usr/include/pkcs11types.h
397a93
+++ b/usr/include/pkcs11types.h
397a93
@@ -439,6 +439,11 @@ typedef CK_ULONG CK_KEY_TYPE;
397a93
 #endif
397a93
 #define CKK_IBM_DILITHIUM        CKK_IBM_PQC_DILITHIUM
397a93
 
397a93
+#ifndef OCK_NO_EP11_DEFINES
397a93
+#define CKK_IBM_PQC_KYBER        CKK_VENDOR_DEFINED + 0x10024
397a93
+#endif
397a93
+#define CKK_IBM_KYBER            CKK_IBM_PQC_KYBER
397a93
+
397a93
 /* CK_CERTIFICATE_TYPE is a value that identifies a certificate
397a93
  * type */
397a93
 /* CK_CERTIFICATE_TYPE was changed from CK_USHORT to CK_ULONG
397a93
@@ -614,6 +619,49 @@ typedef CK_ULONG CK_ATTRIBUTE_TYPE;
397a93
 #define CKA_IBM_DILITHIUM_T0      (CKA_VENDOR_DEFINED + 0xd0007)
397a93
 #define CKA_IBM_DILITHIUM_T1      (CKA_VENDOR_DEFINED + 0xd0008)
397a93
 
397a93
+#define CKA_IBM_KYBER_MODE        (CKA_VENDOR_DEFINED + 0x0000E)
397a93
+
397a93
+#define CKA_IBM_KYBER_KEYFORM     (CKA_VENDOR_DEFINED + 0xd0009)
397a93
+#define CKA_IBM_KYBER_PK          (CKA_VENDOR_DEFINED + 0xd000A)
397a93
+#define CKA_IBM_KYBER_SK          (CKA_VENDOR_DEFINED + 0xd000B)
397a93
+
397a93
+#define CK_IBM_KYBER_KEYFORM_ROUND2_768    1
397a93
+#define CK_IBM_KYBER_KEYFORM_ROUND2_1024   2
397a93
+
397a93
+#define CK_IBM_KYBER_KEM_VERSION           0
397a93
+
397a93
+typedef CK_ULONG CK_IBM_KYBER_KEM_MODE;
397a93
+
397a93
+#define CK_IBM_KYBER_KEM_ENCAPSULATE       1
397a93
+#define CK_IBM_KYBER_KEM_DECAPSULATE       2
397a93
+
397a93
+typedef CK_ULONG CK_IBM_KYBER_KDF_TYPE;
397a93
+
397a93
+#if !defined(CKD_VENDOR_DEFINED)
397a93
+#define CKD_VENDOR_DEFINED                 0x80000000UL
397a93
+#endif
397a93
+
397a93
+#ifndef OCK_NO_EP11_DEFINES
397a93
+#define CKD_IBM_HYBRID_NULL                CKD_VENDOR_DEFINED + 0x00000001UL
397a93
+#define CKD_IBM_HYBRID_SHA1_KDF            CKD_VENDOR_DEFINED + 0x00000002UL
397a93
+#define CKD_IBM_HYBRID_SHA224_KDF          CKD_VENDOR_DEFINED + 0x00000003UL
397a93
+#define CKD_IBM_HYBRID_SHA256_KDF          CKD_VENDOR_DEFINED + 0x00000004UL
397a93
+#define CKD_IBM_HYBRID_SHA384_KDF          CKD_VENDOR_DEFINED + 0x00000005UL
397a93
+#define CKD_IBM_HYBRID_SHA512_KDF          CKD_VENDOR_DEFINED + 0x00000006UL
397a93
+#endif
397a93
+
397a93
+typedef struct CK_IBM_KYBER_PARAMS {
397a93
+    CK_ULONG                ulVersion;
397a93
+    CK_IBM_KYBER_KEM_MODE   mode;
397a93
+    CK_IBM_KYBER_KDF_TYPE   kdf;
397a93
+    CK_BBOOL                bPrepend;
397a93
+    CK_BYTE                 *pCipher;
397a93
+    CK_ULONG                ulCipherLen;
397a93
+    CK_BYTE                 *pSharedData;
397a93
+    CK_ULONG                ulSharedDataLen;
397a93
+    CK_OBJECT_HANDLE        hSecret;
397a93
+} CK_IBM_KYBER_PARAMS;
397a93
+
397a93
 /* For NSS 3.30: */
397a93
 #define NSSCK_VENDOR_NSS          0x4E534350
397a93
 #define CKA_NSS                   (CKA_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
397a93
@@ -941,6 +989,7 @@ typedef CK_ULONG CK_MECHANISM_TYPE;
397a93
 #define CKM_IBM_SHA3_512               CKM_VENDOR_DEFINED + 0x00010004
397a93
 #define CKM_IBM_CMAC                   CKM_VENDOR_DEFINED + 0x00010007
397a93
 #define CKM_IBM_DILITHIUM              CKM_VENDOR_DEFINED + 0x00010023
397a93
+#define CKM_IBM_KYBER                  CKM_VENDOR_DEFINED + 0x00010024
397a93
 #define CKM_IBM_SHA3_224_HMAC          CKM_VENDOR_DEFINED + 0x00010025
397a93
 #define CKM_IBM_SHA3_256_HMAC          CKM_VENDOR_DEFINED + 0x00010026
397a93
 #define CKM_IBM_SHA3_384_HMAC          CKM_VENDOR_DEFINED + 0x00010027
397a93
diff --git a/usr/lib/common/p11util.c b/usr/lib/common/p11util.c
397a93
index f3a031e3..8b81ab42 100644
397a93
--- a/usr/lib/common/p11util.c
397a93
+++ b/usr/lib/common/p11util.c
397a93
@@ -234,6 +234,10 @@ const char *p11_get_cka(CK_ATTRIBUTE_TYPE atype)
397a93
         _sym2str(CKA_IBM_DILITHIUM_T0);
397a93
         _sym2str(CKA_IBM_DILITHIUM_T1);
397a93
         _sym2str(CKA_IBM_PQC_PARAMS);
397a93
+        _sym2str(CKA_IBM_KYBER_KEYFORM);
397a93
+        _sym2str(CKA_IBM_KYBER_MODE);
397a93
+        _sym2str(CKA_IBM_KYBER_PK);
397a93
+        _sym2str(CKA_IBM_KYBER_SK);
397a93
     default:
397a93
         sprintf(buf, "unknown attribute type 0x%08lx", atype);
397a93
         return buf;
397a93
-- 
397a93
2.16.2.windows.1
397a93