From fed89434476df13138421590ef629fd1f771836d Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 22 Apr 2024 17:46:50 +0200 Subject: [PATCH] [pkcs11.h] remove extra-semi-stmt --- winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h | 258 +++++++++--------- 1 file changed, 129 insertions(+), 129 deletions(-) diff --git a/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h b/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h index e31fc8ca3..9b8c0270f 100644 --- a/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h +++ b/winpr/libwinpr/ncrypt/pkcs11-headers/pkcs11.h @@ -36,42 +36,42 @@ typedef void ** CK_VOID_PTR_PTR; typedef CK_ULONG __name__; \ typedef __name__ * __name__ ## _PTR; -ULONGDEF(CK_ATTRIBUTE_TYPE); -ULONGDEF(CK_CERTIFICATE_CATEGORY); -ULONGDEF(CK_CERTIFICATE_TYPE); -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); -ULONGDEF(CK_OBJECT_CLASS); -ULONGDEF(CK_OBJECT_HANDLE); -ULONGDEF(CK_OTP_PARAM_TYPE); -ULONGDEF(CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE); -ULONGDEF(CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE); -ULONGDEF(CK_PRF_DATA_TYPE); -ULONGDEF(CK_PROFILE_ID); -ULONGDEF(CK_RC2_PARAMS); -ULONGDEF(CK_RSA_PKCS_MGF_TYPE); -ULONGDEF(CK_RSA_PKCS_OAEP_SOURCE_TYPE); -ULONGDEF(CK_RV); -ULONGDEF(CK_SESSION_HANDLE); -ULONGDEF(CK_SLOT_ID); -ULONGDEF(CK_SP800_108_DKM_LENGTH_METHOD); -ULONGDEF(CK_STATE); -ULONGDEF(CK_USER_TYPE); -ULONGDEF(CK_X2RATCHET_KDF_TYPE); -ULONGDEF(CK_X3DH_KDF_TYPE); -ULONGDEF(CK_X9_42_DH_KDF_TYPE); -ULONGDEF(CK_XEDDSA_HASH_TYPE); +ULONGDEF(CK_ATTRIBUTE_TYPE) +ULONGDEF(CK_CERTIFICATE_CATEGORY) +ULONGDEF(CK_CERTIFICATE_TYPE) +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) +ULONGDEF(CK_OBJECT_CLASS) +ULONGDEF(CK_OBJECT_HANDLE) +ULONGDEF(CK_OTP_PARAM_TYPE) +ULONGDEF(CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE) +ULONGDEF(CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE) +ULONGDEF(CK_PRF_DATA_TYPE) +ULONGDEF(CK_PROFILE_ID) +ULONGDEF(CK_RC2_PARAMS) +ULONGDEF(CK_RSA_PKCS_MGF_TYPE) +ULONGDEF(CK_RSA_PKCS_OAEP_SOURCE_TYPE) +ULONGDEF(CK_RV) +ULONGDEF(CK_SESSION_HANDLE) +ULONGDEF(CK_SLOT_ID) +ULONGDEF(CK_SP800_108_DKM_LENGTH_METHOD) +ULONGDEF(CK_STATE) +ULONGDEF(CK_USER_TYPE) +ULONGDEF(CK_X2RATCHET_KDF_TYPE) +ULONGDEF(CK_X3DH_KDF_TYPE) +ULONGDEF(CK_X9_42_DH_KDF_TYPE) +ULONGDEF(CK_XEDDSA_HASH_TYPE) /* domain specific values and constants */ @@ -1090,20 +1090,20 @@ typedef struct __name__ __name__; \ typedef struct __name__ * __name__ ## _PTR; \ typedef struct __name__ ** __name__ ## _PTR_PTR; -STRUCTDEF(CK_ATTRIBUTE); -STRUCTDEF(CK_C_INITIALIZE_ARGS); -STRUCTDEF(CK_DATE); -STRUCTDEF(CK_DERIVED_KEY); -STRUCTDEF(CK_FUNCTION_LIST); -STRUCTDEF(CK_FUNCTION_LIST_3_0); -STRUCTDEF(CK_INFO); -STRUCTDEF(CK_INTERFACE); -STRUCTDEF(CK_MECHANISM); -STRUCTDEF(CK_MECHANISM_INFO); -STRUCTDEF(CK_SESSION_INFO); -STRUCTDEF(CK_SLOT_INFO); -STRUCTDEF(CK_TOKEN_INFO); -STRUCTDEF(CK_VERSION); +STRUCTDEF(CK_ATTRIBUTE) +STRUCTDEF(CK_C_INITIALIZE_ARGS) +STRUCTDEF(CK_DATE) +STRUCTDEF(CK_DERIVED_KEY) +STRUCTDEF(CK_FUNCTION_LIST) +STRUCTDEF(CK_FUNCTION_LIST_3_0) +STRUCTDEF(CK_INFO) +STRUCTDEF(CK_INTERFACE) +STRUCTDEF(CK_MECHANISM) +STRUCTDEF(CK_MECHANISM_INFO) +STRUCTDEF(CK_SESSION_INFO) +STRUCTDEF(CK_SLOT_INFO) +STRUCTDEF(CK_TOKEN_INFO) +STRUCTDEF(CK_VERSION) /* Function type definitions */ typedef CK_RV (* CK_NOTIFY)(CK_SESSION_HANDLE, CK_NOTIFICATION, void *); @@ -1209,71 +1209,71 @@ struct CK_TOKEN_INFO { }; /* Param Structure definitions in alphabetical order */ -STRUCTDEF(CK_AES_CBC_ENCRYPT_DATA_PARAMS); -STRUCTDEF(CK_AES_CCM_PARAMS); -STRUCTDEF(CK_AES_CTR_PARAMS); -STRUCTDEF(CK_AES_GCM_PARAMS); -STRUCTDEF(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS); -STRUCTDEF(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS); -STRUCTDEF(CK_CAMELLIA_CTR_PARAMS); -STRUCTDEF(CK_CCM_MESSAGE_PARAMS); -STRUCTDEF(CK_CCM_PARAMS); -STRUCTDEF(CK_CHACHA20_PARAMS); -STRUCTDEF(CK_CMS_SIG_PARAMS); -STRUCTDEF(CK_DES_CBC_ENCRYPT_DATA_PARAMS); -STRUCTDEF(CK_DSA_PARAMETER_GEN_PARAM); -STRUCTDEF(CK_ECDH_AES_KEY_WRAP_PARAMS); -STRUCTDEF(CK_ECDH1_DERIVE_PARAMS); -STRUCTDEF(CK_ECDH2_DERIVE_PARAMS); -STRUCTDEF(CK_ECMQV_DERIVE_PARAMS); -STRUCTDEF(CK_EDDSA_PARAMS); -STRUCTDEF(CK_GCM_MESSAGE_PARAMS); -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); -STRUCTDEF(CK_KIP_PARAMS); -STRUCTDEF(CK_OTP_PARAM); -STRUCTDEF(CK_OTP_PARAMS); -STRUCTDEF(CK_OTP_SIGNATURE_INFO); -STRUCTDEF(CK_PBE_PARAMS); -STRUCTDEF(CK_PKCS5_PBKD2_PARAMS); -STRUCTDEF(CK_PKCS5_PBKD2_PARAMS2); -STRUCTDEF(CK_PRF_DATA_PARAM); -STRUCTDEF(CK_RC2_CBC_PARAMS); -STRUCTDEF(CK_RC2_MAC_GENERAL_PARAMS); -STRUCTDEF(CK_RC5_CBC_PARAMS); -STRUCTDEF(CK_RC5_MAC_GENERAL_PARAMS); -STRUCTDEF(CK_RC5_PARAMS); -STRUCTDEF(CK_RSA_AES_KEY_WRAP_PARAMS); -STRUCTDEF(CK_RSA_PKCS_OAEP_PARAMS); -STRUCTDEF(CK_RSA_PKCS_PSS_PARAMS); -STRUCTDEF(CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS); -STRUCTDEF(CK_SALSA20_CHACHA20_POLY1305_PARAMS); -STRUCTDEF(CK_SALSA20_PARAMS); -STRUCTDEF(CK_SEED_CBC_ENCRYPT_DATA_PARAMS); -STRUCTDEF(CK_SKIPJACK_PRIVATE_WRAP_PARAMS); -STRUCTDEF(CK_SKIPJACK_RELAYX_PARAMS); -STRUCTDEF(CK_SP800_108_COUNTER_FORMAT); -STRUCTDEF(CK_SP800_108_DKM_LENGTH_FORMAT); -STRUCTDEF(CK_SP800_108_FEEDBACK_KDF_PARAMS); -STRUCTDEF(CK_SP800_108_KDF_PARAMS); -STRUCTDEF(CK_X2RATCHET_INITIALIZE_PARAMS); -STRUCTDEF(CK_X2RATCHET_RESPOND_PARAMS); -STRUCTDEF(CK_X3DH_INITIATE_PARAMS); -STRUCTDEF(CK_X3DH_RESPOND_PARAMS); -STRUCTDEF(CK_X9_42_DH1_DERIVE_PARAMS); -STRUCTDEF(CK_X9_42_DH2_DERIVE_PARAMS); -STRUCTDEF(CK_X9_42_MQV_DERIVE_PARAMS); -STRUCTDEF(CK_XEDDSA_PARAMS); -STRUCTDEF(specifiedParams); +STRUCTDEF(CK_AES_CBC_ENCRYPT_DATA_PARAMS) +STRUCTDEF(CK_AES_CCM_PARAMS) +STRUCTDEF(CK_AES_CTR_PARAMS) +STRUCTDEF(CK_AES_GCM_PARAMS) +STRUCTDEF(CK_ARIA_CBC_ENCRYPT_DATA_PARAMS) +STRUCTDEF(CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS) +STRUCTDEF(CK_CAMELLIA_CTR_PARAMS) +STRUCTDEF(CK_CCM_MESSAGE_PARAMS) +STRUCTDEF(CK_CCM_PARAMS) +STRUCTDEF(CK_CHACHA20_PARAMS) +STRUCTDEF(CK_CMS_SIG_PARAMS) +STRUCTDEF(CK_DES_CBC_ENCRYPT_DATA_PARAMS) +STRUCTDEF(CK_DSA_PARAMETER_GEN_PARAM) +STRUCTDEF(CK_ECDH_AES_KEY_WRAP_PARAMS) +STRUCTDEF(CK_ECDH1_DERIVE_PARAMS) +STRUCTDEF(CK_ECDH2_DERIVE_PARAMS) +STRUCTDEF(CK_ECMQV_DERIVE_PARAMS) +STRUCTDEF(CK_EDDSA_PARAMS) +STRUCTDEF(CK_GCM_MESSAGE_PARAMS) +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) +STRUCTDEF(CK_KIP_PARAMS) +STRUCTDEF(CK_OTP_PARAM) +STRUCTDEF(CK_OTP_PARAMS) +STRUCTDEF(CK_OTP_SIGNATURE_INFO) +STRUCTDEF(CK_PBE_PARAMS) +STRUCTDEF(CK_PKCS5_PBKD2_PARAMS) +STRUCTDEF(CK_PKCS5_PBKD2_PARAMS2) +STRUCTDEF(CK_PRF_DATA_PARAM) +STRUCTDEF(CK_RC2_CBC_PARAMS) +STRUCTDEF(CK_RC2_MAC_GENERAL_PARAMS) +STRUCTDEF(CK_RC5_CBC_PARAMS) +STRUCTDEF(CK_RC5_MAC_GENERAL_PARAMS) +STRUCTDEF(CK_RC5_PARAMS) +STRUCTDEF(CK_RSA_AES_KEY_WRAP_PARAMS) +STRUCTDEF(CK_RSA_PKCS_OAEP_PARAMS) +STRUCTDEF(CK_RSA_PKCS_PSS_PARAMS) +STRUCTDEF(CK_SALSA20_CHACHA20_POLY1305_MSG_PARAMS) +STRUCTDEF(CK_SALSA20_CHACHA20_POLY1305_PARAMS) +STRUCTDEF(CK_SALSA20_PARAMS) +STRUCTDEF(CK_SEED_CBC_ENCRYPT_DATA_PARAMS) +STRUCTDEF(CK_SKIPJACK_PRIVATE_WRAP_PARAMS) +STRUCTDEF(CK_SKIPJACK_RELAYX_PARAMS) +STRUCTDEF(CK_SP800_108_COUNTER_FORMAT) +STRUCTDEF(CK_SP800_108_DKM_LENGTH_FORMAT) +STRUCTDEF(CK_SP800_108_FEEDBACK_KDF_PARAMS) +STRUCTDEF(CK_SP800_108_KDF_PARAMS) +STRUCTDEF(CK_X2RATCHET_INITIALIZE_PARAMS) +STRUCTDEF(CK_X2RATCHET_RESPOND_PARAMS) +STRUCTDEF(CK_X3DH_INITIATE_PARAMS) +STRUCTDEF(CK_X3DH_RESPOND_PARAMS) +STRUCTDEF(CK_X9_42_DH1_DERIVE_PARAMS) +STRUCTDEF(CK_X9_42_DH2_DERIVE_PARAMS) +STRUCTDEF(CK_X9_42_MQV_DERIVE_PARAMS) +STRUCTDEF(CK_XEDDSA_PARAMS) +STRUCTDEF(specifiedParams) struct CK_AES_CBC_ENCRYPT_DATA_PARAMS { CK_BYTE iv[16]; @@ -1805,20 +1805,20 @@ struct specifiedParams { }; /* TLS related structure definitions */ -STRUCTDEF(CK_SSL3_KEY_MAT_OUT); -STRUCTDEF(CK_SSL3_KEY_MAT_PARAMS); -STRUCTDEF(CK_SSL3_MASTER_KEY_DERIVE_PARAMS); -STRUCTDEF(CK_SSL3_RANDOM_DATA); -STRUCTDEF(CK_TLS_KDF_PARAMS); -STRUCTDEF(CK_TLS_MAC_PARAMS); -STRUCTDEF(CK_TLS_PRF_PARAMS); -STRUCTDEF(CK_TLS12_KEY_MAT_PARAMS); -STRUCTDEF(CK_TLS12_MASTER_KEY_DERIVE_PARAMS); -STRUCTDEF(CK_WTLS_KEY_MAT_OUT); -STRUCTDEF(CK_WTLS_KEY_MAT_PARAMS); -STRUCTDEF(CK_WTLS_MASTER_KEY_DERIVE_PARAMS); -STRUCTDEF(CK_WTLS_PRF_PARAMS); -STRUCTDEF(CK_WTLS_RANDOM_DATA); +STRUCTDEF(CK_SSL3_KEY_MAT_OUT) +STRUCTDEF(CK_SSL3_KEY_MAT_PARAMS) +STRUCTDEF(CK_SSL3_MASTER_KEY_DERIVE_PARAMS) +STRUCTDEF(CK_SSL3_RANDOM_DATA) +STRUCTDEF(CK_TLS_KDF_PARAMS) +STRUCTDEF(CK_TLS_MAC_PARAMS) +STRUCTDEF(CK_TLS_PRF_PARAMS) +STRUCTDEF(CK_TLS12_KEY_MAT_PARAMS) +STRUCTDEF(CK_TLS12_MASTER_KEY_DERIVE_PARAMS) +STRUCTDEF(CK_WTLS_KEY_MAT_OUT) +STRUCTDEF(CK_WTLS_KEY_MAT_PARAMS) +STRUCTDEF(CK_WTLS_MASTER_KEY_DERIVE_PARAMS) +STRUCTDEF(CK_WTLS_PRF_PARAMS) +STRUCTDEF(CK_WTLS_RANDOM_DATA) struct CK_SSL3_KEY_MAT_OUT { CK_OBJECT_HANDLE hClientMacSecret;