Import PKCS#11 3.1 headers

Signed-off-by: Jakub Jelen <[email protected]>

Author: Jakuje

cryptoki-sys/vendor/README.md

@@ -1,7 +1,7 @@
 Vendor
 
-This is downloaded from https://github.com/latchset/pkcs11-headers/blob/b131b9e4599db6e0287a3d74f6768e08a0c82d23/public-domain/3.0/pkcs11.h:
+This is downloaded from https://github.com/latchset/pkcs11-headers/blob/b131b9e4599db6e0287a3d74f6768e08a0c82d23/public-domain/3.1/pkcs11.h:
 
 ```shell
-wget https://raw.githubusercontent.com/latchset/pkcs11-headers/b131b9e4599db6e0287a3d74f6768e08a0c82d23/public-domain/3.0/pkcs11.h
-```
+wget https://raw.githubusercontent.com/latchset/pkcs11-headers/0ecf659eaa743472192bf3af2579144c5f8c053f/public-domain/3.1/pkcs11.h
+```

cryptoki-sys/vendor/pkcs11.h

@@ -4,13 +4,9 @@
 #define _PD_PKCS11_
 
 #define CRYPTOKI_VERSION_MAJOR 3
-#define CRYPTOKI_VERSION_MINOR 0
+#define CRYPTOKI_VERSION_MINOR 1
 #define CRYPTOKI_VERSION_AMENDMENT 0
 
-#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
-#pragma pack(push, cryptoki, 1)
-#endif
-
 /* Basic types */
 typedef unsigned char CK_BBOOL;
 typedef unsigned char CK_BYTE;
@@ -47,9 +43,12 @@ ULONGDEF(CK_EC_KDF_TYPE);
 ULONGDEF(CK_EXTRACT_PARAMS);
 ULONGDEF(CK_FLAGS);
 ULONGDEF(CK_GENERATOR_FUNCTION);
+ULONGDEF(CK_HSS_LEVELS);
 ULONGDEF(CK_HW_FEATURE_TYPE);
 ULONGDEF(CK_JAVA_MIDP_SECURITY_DOMAIN);
 ULONGDEF(CK_KEY_TYPE);
+ULONGDEF(CK_LMS_TYPE);
+ULONGDEF(CK_LMOTS_TYPE);
 ULONGDEF(CK_MAC_GENERAL_PARAMS);
 ULONGDEF(CK_MECHANISM_TYPE);
 ULONGDEF(CK_NOTIFICATION);
@@ -240,6 +239,12 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKA_X2RATCHET_NS 0x00000610UL
 #define CKA_X2RATCHET_PNS 0x00000611UL
 #define CKA_X2RATCHET_RK 0x00000612UL
+#define CKA_HSS_LEVELS 0x00000617UL
+#define CKA_HSS_LMS_TYPE 0x00000618UL
+#define CKA_HSS_LMOTS_TYPE 0x00000619UL
+#define CKA_HSS_LMS_TYPES 0x0000061AUL
+#define CKA_HSS_LMOTS_TYPES 0x0000061BUL
+#define CKA_HSS_KEYS_REMAINING 0x0000061CUL
 #define CKA_VENDOR_DEFINED 0x80000000UL
 /* Array attributes */
 #define CKA_WRAP_TEMPLATE 0x40000211UL
@@ -385,6 +390,7 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKG_GENERATE 0x00000001UL
 #define CKG_GENERATE_COUNTER 0x00000002UL
 #define CKG_GENERATE_RANDOM 0x00000003UL
+#define CKG_GENERATE_COUNTER_XOR 0x00000004UL
 
 /* CKG (MFG) */
 #define CKG_MGF1_SHA1 0x00000001UL
@@ -464,6 +470,7 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKK_SHA512_224_HMAC 0x00000043UL
 #define CKK_SHA512_256_HMAC 0x00000044UL
 #define CKK_SHA512_T_HMAC 0x00000045UL
+#define CKK_HSS 0x00000046UL
 #define CKK_VENDOR_DEFINED 0x80000000UL
 /* Deprecated */
 #ifdef PKCS11_DEPRECATED
@@ -844,6 +851,7 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKM_AES_KEY_WRAP 0x00002109UL
 #define CKM_AES_KEY_WRAP_PAD 0x0000210AUL
 #define CKM_AES_KEY_WRAP_KWP 0x0000210BUL
+#define CKM_AES_KEY_WRAP_PKCS7 0x0000210CUL
 #define CKM_RSA_PKCS_TPM_1_1 0x00004001UL
 #define CKM_RSA_PKCS_OAEP_TPM_1_1 0x00004002UL
 #define CKM_SHA_1_KEY_GEN 0x00004003UL
@@ -899,6 +907,12 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKM_SP800_108_COUNTER_KDF 0x000003ACUL
 #define CKM_SP800_108_FEEDBACK_KDF 0x000003ADUL
 #define CKM_SP800_108_DOUBLE_PIPELINE_KDF 0x000003AEUL
+#define CKM_IKE2_PRF_PLUS_DERIVE 0x0000402EUL
+#define CKM_IKE_PRF_DERIVE 0x0000402FUL
+#define CKM_IKE1_PRF_DERIVE 0x00004030UL
+#define CKM_IKE1_EXTENDED_DERIVE 0x00004031UL
+#define CKM_HSS_KEY_PAIR_GEN 0x00004032UL
+#define CKM_HSS 0x00004033UL
 #define CKM_VENDOR_DEFINED             0x80000000UL
 /* Deprecated */
 #ifdef PKCS11_DEPRECATED
@@ -935,6 +949,8 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKP_EXTENDED_PROVIDER 0x00000002UL
 #define CKP_AUTHENTICATION_TOKEN 0x00000003UL
 #define CKP_PUBLIC_CERTIFICATES_TOKEN 0x00000004UL
+#define CKP_COMPLETE_PROVIDER 0x00000005UL
+#define CKP_HKDF_TLS_TOKEN 0x00000006UL
 #define CKP_VENDOR_DEFINED 0x80000000UL
 
 /* CKP (PBKD2) */
@@ -1045,6 +1061,7 @@ ULONGDEF(CK_XEDDSA_HASH_TYPE);
 #define CKR_FUNCTION_REJECTED 0x00000200UL
 #define CKR_TOKEN_RESOURCE_EXCEEDED 0x00000201UL
 #define CKR_OPERATION_CANCEL_FAILED 0x00000202UL
+#define CKR_KEY_EXHAUSTED 0x00000203UL
 #define CKR_VENDOR_DEFINED 0x80000000UL
 
 
@@ -1215,6 +1232,10 @@ STRUCTDEF(CK_GCM_PARAMS);
 STRUCTDEF(CK_GOSTR3410_DERIVE_PARAMS);
 STRUCTDEF(CK_GOSTR3410_KEY_WRAP_PARAMS);
 STRUCTDEF(CK_HKDF_PARAMS);
+STRUCTDEF(CK_IKE_PRF_DERIVE_PARAMS);
+STRUCTDEF(CK_IKE1_EXTENDED_DERIVE_PARAMS);
+STRUCTDEF(CK_IKE1_PRF_DERIVE_PARAMS);
+STRUCTDEF(CK_IKE2_PRF_PLUS_DERIVE_PARAMS);
 STRUCTDEF(CK_KEA_DERIVE_PARAMS);
 STRUCTDEF(CK_KEY_DERIVATION_STRING_DATA);
 STRUCTDEF(CK_KEY_WRAP_SET_OAEP_PARAMS);
@@ -1442,6 +1463,45 @@ struct CK_HKDF_PARAMS {
     CK_ULONG ulInfoLen;
 };
 
+struct CK_IKE_PRF_DERIVE_PARAMS {
+    CK_MECHANISM_TYPE prfMechanism;
+    CK_BBOOL bDataAsKey;
+    CK_BBOOL bRekey;
+    CK_BYTE * pNi;
+    CK_ULONG ulNiLen;
+    CK_BYTE * pNr;
+    CK_ULONG ulNrLen;
+    CK_OBJECT_HANDLE hNewKey;
+};
+
+struct CK_IKE1_EXTENDED_DERIVE_PARAMS {
+    CK_MECHANISM_TYPE prfMechanism;
+    CK_BBOOL bHasKeygxy;
+    CK_OBJECT_HANDLE hKeygxy;
+    CK_BYTE * pExtraData;
+    CK_ULONG ulExtraDataLen;
+};
+
+struct CK_IKE1_PRF_DERIVE_PARAMS {
+    CK_MECHANISM_TYPE prfMechanism;
+    CK_BBOOL bHasPrevKey;
+    CK_OBJECT_HANDLE hKeygxy;
+    CK_OBJECT_HANDLE hPrevKey;
+    CK_BYTE * pCKYi;
+    CK_ULONG ulCKYiLen;
+    CK_BYTE * pCKYr;
+    CK_ULONG ulCKYrLen;
+    CK_BYTE keyNumber;
+};
+
+struct CK_IKE2_PRF_PLUS_DERIVE_PARAMS {
+    CK_MECHANISM_TYPE prfMechanism;
+    CK_BBOOL bHasSeedKey;
+    CK_OBJECT_HANDLE hSeedKey;
+    CK_BYTE * pSeedData;
+    CK_ULONG ulSeedDataLen;
+};
+
 struct CK_KEA_DERIVE_PARAMS {
     CK_BBOOL isSender;
     CK_ULONG ulRandomLen;
@@ -1738,6 +1798,12 @@ struct CK_XEDDSA_PARAMS {
     CK_XEDDSA_HASH_TYPE hash;
 };
 
+struct specifiedParams {
+    CK_HSS_LEVELS levels;
+    CK_LMS_TYPE lm_type[8];
+    CK_LMOTS_TYPE lm_ots_type[8];
+};
+
 /* TLS related structure definitions */
 STRUCTDEF(CK_SSL3_KEY_MAT_OUT);
 STRUCTDEF(CK_SSL3_KEY_MAT_PARAMS);
@@ -2342,8 +2408,4 @@ struct CK_FUNCTION_LIST {
 };
 
 
-#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
-#pragma pack(pop, cryptoki)
-#endif
-
 #endif