pkcs11 0.2.5 → 0.2.6

data/ext/pk11_struct.doc

@@ -190,28 +190,6 @@ attr_accessor :pPublicData
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
 end
-class PKCS11::CK_ECDH2_DERIVE_PARAMS < PKCS11::CStruct
-# Size of corresponding C struct in bytes
-SIZEOF_STRUCT=Integer
-# @return [String] Binary copy of the C struct
-def to_s; end
-# @return [Array<String>] Attributes of this struct
-def members; end
-# @return [String, nil] accessor for pSharedData and ulSharedDataLen
-attr_accessor :pSharedData
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
-attr_accessor :pPublicData
-# @return [String, nil] accessor for pPublicData2
-attr_accessor :pPublicData2
-# @return [Integer] accessor for kdf (CK_ULONG)
-attr_accessor :kdf
-# @return [Integer] accessor for ulPrivateDataLen (CK_ULONG)
-attr_accessor :ulPrivateDataLen
-# @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
-attr_accessor :hPrivateData
-# @return [Integer] accessor for ulPublicDataLen2 (CK_ULONG)
-attr_accessor :ulPublicDataLen2
-end
 class PKCS11::CK_ECMQV_DERIVE_PARAMS < PKCS11::CStruct
 # Size of corresponding C struct in bytes
 SIZEOF_STRUCT=Integer
@@ -546,22 +524,6 @@ attr_accessor :RandomInfo
 # @return [PKCS11::CK_SSL3_KEY_MAT_OUT, nil] pointer to struct
 attr_accessor :pReturnedKeyMaterial
 end
-class PKCS11::CK_TLS_PRF_PARAMS < PKCS11::CStruct
-# Size of corresponding C struct in bytes
-SIZEOF_STRUCT=Integer
-# @return [String] Binary copy of the C struct
-def to_s; end
-# @return [Array<String>] Attributes of this struct
-def members; end
-# @return [String, nil] accessor for pSeed and ulSeedLen
-attr_accessor :pSeed
-# @return [String, nil] accessor for pLabel and ulLabelLen
-attr_accessor :pLabel
-# @return [String, nil] accessor for pOutput
-attr_accessor :pOutput
-# @return [Integer, nil] accessor for pulOutputLen (CK_ULONG_PTR)
-attr_accessor :pulOutputLen
-end
 class PKCS11::CK_WTLS_RANDOM_DATA < PKCS11::CStruct
 # Size of corresponding C struct in bytes
 SIZEOF_STRUCT=Integer
@@ -754,17 +716,37 @@ attr_accessor :ulCounterBits
 # @return [String] accessor for cb (max 16 bytes)
 attr_accessor :cb
 end
-class PKCS11::CK_CAMELLIA_CTR_PARAMS < PKCS11::CStruct
+class PKCS11::CK_GCM_PARAMS < PKCS11::CStruct
 # Size of corresponding C struct in bytes
 SIZEOF_STRUCT=Integer
 # @return [String] Binary copy of the C struct
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [Integer] accessor for ulCounterBits (CK_ULONG)
-attr_accessor :ulCounterBits
-# @return [String] accessor for cb (max 16 bytes)
-attr_accessor :cb
+# @return [String, nil] accessor for pIv and ulIvLen
+attr_accessor :pIv
+# @return [String, nil] accessor for pAAD and ulAADLen
+attr_accessor :pAAD
+# @return [Integer] accessor for ulIvBits (CK_ULONG)
+attr_accessor :ulIvBits
+# @return [Integer] accessor for ulTagBits (CK_ULONG)
+attr_accessor :ulTagBits
+end
+class PKCS11::CK_CCM_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pNonce and ulNonceLen
+attr_accessor :pNonce
+# @return [String, nil] accessor for pAAD and ulAADLen
+attr_accessor :pAAD
+# @return [Integer] accessor for ulDataLen (CK_ULONG)
+attr_accessor :ulDataLen
+# @return [Integer] accessor for ulMACLen (CK_ULONG)
+attr_accessor :ulMACLen
 end
 class PKCS11::CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS < PKCS11::CStruct
 # Size of corresponding C struct in bytes
@@ -790,3 +772,141 @@ attr_accessor :pData
 # @return [String] accessor for iv (max 16 bytes)
 attr_accessor :iv
 end
+class PKCS11::CK_DSA_PARAMETER_GEN_PARAM < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pSeed and ulSeedLen
+attr_accessor :pSeed
+# @return [Integer] accessor for hash (CK_ULONG)
+attr_accessor :hash
+# @return [Integer] accessor for ulIndex (CK_ULONG)
+attr_accessor :ulIndex
+end
+class PKCS11::CK_ECDH_AES_KEY_WRAP_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pSharedData and ulSharedDataLen
+attr_accessor :pSharedData
+# @return [Integer] accessor for ulAESKeyBits (CK_ULONG)
+attr_accessor :ulAESKeyBits
+# @return [Integer] accessor for kdf (CK_ULONG)
+attr_accessor :kdf
+end
+class PKCS11::CK_RSA_AES_KEY_WRAP_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [Integer] accessor for ulAESKeyBits (CK_ULONG)
+attr_accessor :ulAESKeyBits
+# @return [PKCS11::CK_RSA_PKCS_OAEP_PARAMS, nil] pointer to struct
+attr_accessor :pOAEPParams
+end
+class PKCS11::CK_TLS12_MASTER_KEY_DERIVE_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [PKCS11::CK_SSL3_RANDOM_DATA] inline struct
+attr_accessor :RandomInfo
+# @return [PKCS11::CK_VERSION, nil] pointer to struct
+attr_accessor :pVersion
+# @return [Integer] accessor for prfHashMechanism (CK_ULONG)
+attr_accessor :prfHashMechanism
+end
+class PKCS11::CK_TLS12_KEY_MAT_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [Integer] accessor for ulMacSizeInBits (CK_ULONG)
+attr_accessor :ulMacSizeInBits
+# @return [Integer] accessor for ulKeySizeInBits (CK_ULONG)
+attr_accessor :ulKeySizeInBits
+# @return [Integer] accessor for ulIVSizeInBits (CK_ULONG)
+attr_accessor :ulIVSizeInBits
+# @return [Boolean]  Bool value
+attr_accessor :bIsExport
+# @return [PKCS11::CK_SSL3_RANDOM_DATA] inline struct
+attr_accessor :RandomInfo
+# @return [PKCS11::CK_SSL3_KEY_MAT_OUT, nil] pointer to struct
+attr_accessor :pReturnedKeyMaterial
+# @return [Integer] accessor for prfHashMechanism (CK_ULONG)
+attr_accessor :prfHashMechanism
+end
+class PKCS11::CK_TLS_KDF_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pLabel
+attr_accessor :pLabel
+# @return [String, nil] accessor for pContextData
+attr_accessor :pContextData
+# @return [Integer] accessor for prfMechanism (CK_ULONG)
+attr_accessor :prfMechanism
+# @return [Integer] accessor for ulLabelLength (CK_ULONG)
+attr_accessor :ulLabelLength
+# @return [PKCS11::CK_SSL3_RANDOM_DATA] inline struct
+attr_accessor :RandomInfo
+# @return [Integer] accessor for ulContextDataLength (CK_ULONG)
+attr_accessor :ulContextDataLength
+end
+class PKCS11::CK_TLS_MAC_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [Integer] accessor for prfHashMechanism (CK_ULONG)
+attr_accessor :prfHashMechanism
+# @return [Integer] accessor for ulMacLength (CK_ULONG)
+attr_accessor :ulMacLength
+# @return [Integer] accessor for ulServerOrClient (CK_ULONG)
+attr_accessor :ulServerOrClient
+end
+class PKCS11::CK_GOSTR3410_DERIVE_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+attr_accessor :pPublicData
+# @return [String, nil] accessor for pUKM and ulUKMLen
+attr_accessor :pUKM
+# @return [Integer] accessor for kdf (CK_ULONG)
+attr_accessor :kdf
+end
+class PKCS11::CK_GOSTR3410_KEY_WRAP_PARAMS < PKCS11::CStruct
+# Size of corresponding C struct in bytes
+SIZEOF_STRUCT=Integer
+# @return [String] Binary copy of the C struct
+def to_s; end
+# @return [Array<String>] Attributes of this struct
+def members; end
+# @return [String, nil] accessor for pWrapOID and ulWrapOIDLen
+attr_accessor :pWrapOID
+# @return [String, nil] accessor for pUKM and ulUKMLen
+attr_accessor :pUKM
+# @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
+attr_accessor :hKey
+end

data/ext/pk11_struct_def.inc

@@ -76,15 +76,6 @@ PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, pSharedData);
 PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, pPublicData);
 PKCS11_DEFINE_MEMBER(CK_ECDH1_DERIVE_PARAMS, kdf);
 
-PKCS11_DEFINE_STRUCT(CK_ECDH2_DERIVE_PARAMS);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pSharedData);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, kdf);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, ulPrivateDataLen);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
-PKCS11_DEFINE_MEMBER(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
-
 PKCS11_DEFINE_STRUCT(CK_ECMQV_DERIVE_PARAMS);
 PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pSharedData);
 PKCS11_DEFINE_MEMBER(CK_ECMQV_DERIVE_PARAMS, pPublicData);
@@ -212,12 +203,6 @@ PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, bIsExport);
 PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, RandomInfo);
 PKCS11_DEFINE_MEMBER(CK_SSL3_KEY_MAT_PARAMS, pReturnedKeyMaterial);
 
-PKCS11_DEFINE_STRUCT(CK_TLS_PRF_PARAMS);
-PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pSeed);
-PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pLabel);
-PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pOutput);
-PKCS11_DEFINE_MEMBER(CK_TLS_PRF_PARAMS, pulOutputLen);
-
 PKCS11_DEFINE_STRUCT(CK_WTLS_RANDOM_DATA);
 PKCS11_DEFINE_MEMBER(CK_WTLS_RANDOM_DATA, pClientRandom);
 PKCS11_DEFINE_MEMBER(CK_WTLS_RANDOM_DATA, pServerRandom);
@@ -288,9 +273,17 @@ PKCS11_DEFINE_STRUCT(CK_AES_CTR_PARAMS);
 PKCS11_DEFINE_MEMBER(CK_AES_CTR_PARAMS, ulCounterBits);
 PKCS11_DEFINE_MEMBER(CK_AES_CTR_PARAMS, cb);
 
-PKCS11_DEFINE_STRUCT(CK_CAMELLIA_CTR_PARAMS);
-PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CTR_PARAMS, ulCounterBits);
-PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CTR_PARAMS, cb);
+PKCS11_DEFINE_STRUCT(CK_GCM_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_GCM_PARAMS, pIv);
+PKCS11_DEFINE_MEMBER(CK_GCM_PARAMS, pAAD);
+PKCS11_DEFINE_MEMBER(CK_GCM_PARAMS, ulIvBits);
+PKCS11_DEFINE_MEMBER(CK_GCM_PARAMS, ulTagBits);
+
+PKCS11_DEFINE_STRUCT(CK_CCM_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_CCM_PARAMS, pNonce);
+PKCS11_DEFINE_MEMBER(CK_CCM_PARAMS, pAAD);
+PKCS11_DEFINE_MEMBER(CK_CCM_PARAMS, ulDataLen);
+PKCS11_DEFINE_MEMBER(CK_CCM_PARAMS, ulMACLen);
 
 PKCS11_DEFINE_STRUCT(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS);
 PKCS11_DEFINE_MEMBER(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, pData);
@@ -300,3 +293,54 @@ PKCS11_DEFINE_STRUCT(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS);
 PKCS11_DEFINE_MEMBER(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, pData);
 PKCS11_DEFINE_MEMBER(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, iv);
 
+PKCS11_DEFINE_STRUCT(CK_DSA_PARAMETER_GEN_PARAM);
+PKCS11_DEFINE_MEMBER(CK_DSA_PARAMETER_GEN_PARAM, pSeed);
+PKCS11_DEFINE_MEMBER(CK_DSA_PARAMETER_GEN_PARAM, hash);
+PKCS11_DEFINE_MEMBER(CK_DSA_PARAMETER_GEN_PARAM, ulIndex);
+
+PKCS11_DEFINE_STRUCT(CK_ECDH_AES_KEY_WRAP_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_ECDH_AES_KEY_WRAP_PARAMS, pSharedData);
+PKCS11_DEFINE_MEMBER(CK_ECDH_AES_KEY_WRAP_PARAMS, ulAESKeyBits);
+PKCS11_DEFINE_MEMBER(CK_ECDH_AES_KEY_WRAP_PARAMS, kdf);
+
+PKCS11_DEFINE_STRUCT(CK_RSA_AES_KEY_WRAP_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_RSA_AES_KEY_WRAP_PARAMS, ulAESKeyBits);
+PKCS11_DEFINE_MEMBER(CK_RSA_AES_KEY_WRAP_PARAMS, pOAEPParams);
+
+PKCS11_DEFINE_STRUCT(CK_TLS12_MASTER_KEY_DERIVE_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, RandomInfo);
+PKCS11_DEFINE_MEMBER(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, pVersion);
+PKCS11_DEFINE_MEMBER(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, prfHashMechanism);
+
+PKCS11_DEFINE_STRUCT(CK_TLS12_KEY_MAT_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, ulMacSizeInBits);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, ulKeySizeInBits);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, ulIVSizeInBits);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, bIsExport);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, RandomInfo);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, pReturnedKeyMaterial);
+PKCS11_DEFINE_MEMBER(CK_TLS12_KEY_MAT_PARAMS, prfHashMechanism);
+
+PKCS11_DEFINE_STRUCT(CK_TLS_KDF_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, pLabel);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, pContextData);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, prfMechanism);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, ulLabelLength);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, RandomInfo);
+PKCS11_DEFINE_MEMBER(CK_TLS_KDF_PARAMS, ulContextDataLength);
+
+PKCS11_DEFINE_STRUCT(CK_TLS_MAC_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_TLS_MAC_PARAMS, prfHashMechanism);
+PKCS11_DEFINE_MEMBER(CK_TLS_MAC_PARAMS, ulMacLength);
+PKCS11_DEFINE_MEMBER(CK_TLS_MAC_PARAMS, ulServerOrClient);
+
+PKCS11_DEFINE_STRUCT(CK_GOSTR3410_DERIVE_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_DERIVE_PARAMS, pPublicData);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_DERIVE_PARAMS, pUKM);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_DERIVE_PARAMS, kdf);
+
+PKCS11_DEFINE_STRUCT(CK_GOSTR3410_KEY_WRAP_PARAMS);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_KEY_WRAP_PARAMS, pWrapOID);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_KEY_WRAP_PARAMS, pUKM);
+PKCS11_DEFINE_MEMBER(CK_GOSTR3410_KEY_WRAP_PARAMS, hKey);
+

data/ext/pk11_struct_impl.inc

@@ -76,15 +76,6 @@ PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, pSharedData, ul
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH1_DERIVE_PARAMS, kdf);
 
-PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECDH2_DERIVE_PARAMS);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pSharedData, ulSharedDataLen);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
-PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, pPublicData2);
-PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, kdf);
-PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, ulPrivateDataLen);
-PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, hPrivateData);
-PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH2_DERIVE_PARAMS, ulPublicDataLen2);
-
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECMQV_DERIVE_PARAMS);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pSharedData, ulSharedDataLen);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECMQV_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
@@ -212,12 +203,6 @@ PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, bIsExport);
 PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
 PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_SSL3_KEY_MAT_PARAMS, CK_SSL3_KEY_MAT_OUT, pReturnedKeyMaterial);
 
-PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS_PRF_PARAMS);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_TLS_PRF_PARAMS, pSeed, ulSeedLen);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_TLS_PRF_PARAMS, pLabel, ulLabelLen);
-PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_TLS_PRF_PARAMS, pOutput);
-PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_TLS_PRF_PARAMS, pulOutputLen);
-
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_WTLS_RANDOM_DATA);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_WTLS_RANDOM_DATA, pClientRandom, ulClientRandomLen);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_WTLS_RANDOM_DATA, pServerRandom, ulServerRandomLen);
@@ -288,9 +273,17 @@ PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_AES_CTR_PARAMS);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_AES_CTR_PARAMS, ulCounterBits);
 PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_AES_CTR_PARAMS, cb);
 
-PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CAMELLIA_CTR_PARAMS);
-PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_CAMELLIA_CTR_PARAMS, ulCounterBits);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_CAMELLIA_CTR_PARAMS, cb);
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_GCM_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GCM_PARAMS, pIv, ulIvLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GCM_PARAMS, pAAD, ulAADLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_GCM_PARAMS, ulIvBits);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_GCM_PARAMS, ulTagBits);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CCM_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CCM_PARAMS, pNonce, ulNonceLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CCM_PARAMS, pAAD, ulAADLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_CCM_PARAMS, ulDataLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_CCM_PARAMS, ulMACLen);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, pData, length);
@@ -300,3 +293,54 @@ PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS);
 PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, pData, length);
 PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, iv);
 
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DSA_PARAMETER_GEN_PARAM);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_DSA_PARAMETER_GEN_PARAM, pSeed, ulSeedLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_DSA_PARAMETER_GEN_PARAM, hash);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_DSA_PARAMETER_GEN_PARAM, ulIndex);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECDH_AES_KEY_WRAP_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_ECDH_AES_KEY_WRAP_PARAMS, pSharedData, ulSharedDataLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH_AES_KEY_WRAP_PARAMS, ulAESKeyBits);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECDH_AES_KEY_WRAP_PARAMS, kdf);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_RSA_AES_KEY_WRAP_PARAMS);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_RSA_AES_KEY_WRAP_PARAMS, ulAESKeyBits);
+PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_RSA_AES_KEY_WRAP_PARAMS, CK_RSA_PKCS_OAEP_PARAMS, pOAEPParams);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS12_MASTER_KEY_DERIVE_PARAMS);
+PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
+PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, CK_VERSION, pVersion);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS12_MASTER_KEY_DERIVE_PARAMS, prfHashMechanism);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS12_KEY_MAT_PARAMS);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, ulMacSizeInBits);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, ulKeySizeInBits);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, ulIVSizeInBits);
+PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, bIsExport);
+PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
+PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, CK_SSL3_KEY_MAT_OUT, pReturnedKeyMaterial);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS12_KEY_MAT_PARAMS, prfHashMechanism);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS_KDF_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_TLS_KDF_PARAMS, pLabel);
+PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_TLS_KDF_PARAMS, pContextData);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_KDF_PARAMS, prfMechanism);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_KDF_PARAMS, ulLabelLength);
+PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_TLS_KDF_PARAMS, CK_SSL3_RANDOM_DATA, RandomInfo);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_KDF_PARAMS, ulContextDataLength);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TLS_MAC_PARAMS);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_MAC_PARAMS, prfHashMechanism);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_MAC_PARAMS, ulMacLength);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_TLS_MAC_PARAMS, ulServerOrClient);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_GOSTR3410_DERIVE_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GOSTR3410_DERIVE_PARAMS, pPublicData, ulPublicDataLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GOSTR3410_DERIVE_PARAMS, pUKM, ulUKMLen);
+PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_GOSTR3410_DERIVE_PARAMS, kdf);
+
+PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_GOSTR3410_KEY_WRAP_PARAMS);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GOSTR3410_KEY_WRAP_PARAMS, pWrapOID, ulWrapOIDLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_GOSTR3410_KEY_WRAP_PARAMS, pUKM, ulUKMLen);
+PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_GOSTR3410_KEY_WRAP_PARAMS, hKey);
+

data/ext/pk11_version.h

@@ -1,6 +1,6 @@
 #ifndef RUBY_PK11_VERSION_H
 #define RUBY_PK11_VERSION_H
 
-static const char *VERSION = "0.2.5";
+static const char *VERSION = "0.2.6";
 
 #endif