AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 11:29:53 +03:00
Code Releases Activity

Merge pull request #1954 from chipitsine/gcc_14_fix

Browse Source 
adjust types of variables found by gcc14
This commit is contained in:
Ilya Shipitsin 2024-02-24 10:45:17 +01:00 committed by GitHub
commit b58d57ffeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mayaqua/pkcs11f.h
View File

@ -73,7 +73,7 @@ CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
( (
CK_BBOOL tokenPresent, /* only slots with tokens? */ CK_BBOOL tokenPresent, /* only slots with tokens? */
CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */ CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */
CK_ULONG_PTR pulCount /* receives number of slots */ CK_UINT_PTR pulCount /* receives number of slots */
); );
#endif #endif
@ -351,7 +351,7 @@ CK_PKCS11_FUNCTION_INFO(C_FindObjects)
CK_SESSION_HANDLE hSession, /* session's handle */ CK_SESSION_HANDLE hSession, /* session's handle */
CK_OBJECT_HANDLE_PTR phObject, /* gets obj. handles */ CK_OBJECT_HANDLE_PTR phObject, /* gets obj. handles */
CK_ULONG ulMaxObjectCount, /* max handles to get */ CK_ULONG ulMaxObjectCount, /* max handles to get */
CK_ULONG_PTR pulObjectCount /* actual # returned */ CK_UINT_PTR pulObjectCount /* actual # returned */
); );
#endif #endif
@ -558,7 +558,7 @@ CK_PKCS11_FUNCTION_INFO(C_Sign)
CK_BYTE_PTR pData, /* the data to sign */ CK_BYTE_PTR pData, /* the data to sign */
CK_ULONG ulDataLen, /* count of bytes to sign */ CK_ULONG ulDataLen, /* count of bytes to sign */
CK_BYTE_PTR pSignature, /* gets the signature */ CK_BYTE_PTR pSignature, /* gets the signature */
CK_ULONG_PTR pulSignatureLen /* gets signature length */ CK_UINT_PTR pulSignatureLen /* gets signature length */
); );
#endif #endif

9
src/Mayaqua/pkcs11t.h
View File

@ -51,6 +51,8 @@ typedef CK_BYTE CK_BBOOL;
/* an unsigned value, at least 32 bits long */ /* an unsigned value, at least 32 bits long */
typedef unsigned long int CK_ULONG; typedef unsigned long int CK_ULONG;
typedef unsigned int CK_UINT;
/* a signed value, the same size as a CK_ULONG */ /* a signed value, the same size as a CK_ULONG */
/* CK_LONG is new for v2.0 */ /* CK_LONG is new for v2.0 */
typedef long int CK_LONG; typedef long int CK_LONG;
@ -68,6 +70,7 @@ typedef CK_BYTE CK_PTR CK_BYTE_PTR;
typedef CK_CHAR CK_PTR CK_CHAR_PTR; typedef CK_CHAR CK_PTR CK_CHAR_PTR;
typedef CK_UTF8CHAR CK_PTR CK_UTF8CHAR_PTR; typedef CK_UTF8CHAR CK_PTR CK_UTF8CHAR_PTR;
typedef CK_ULONG CK_PTR CK_ULONG_PTR; typedef CK_ULONG CK_PTR CK_ULONG_PTR;
typedef CK_UINT CK_PTR CK_UINT_PTR;
typedef void CK_PTR CK_VOID_PTR; typedef void CK_PTR CK_VOID_PTR;
/* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */ /* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */
@ -110,7 +113,7 @@ typedef CK_ULONG CK_NOTIFICATION;
#define CKN_SURRENDER 0 #define CKN_SURRENDER 0
typedef CK_ULONG CK_SLOT_ID; typedef CK_UINT CK_SLOT_ID;
typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR; typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR;
@ -262,7 +265,7 @@ typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
/* CK_SESSION_HANDLE is a Cryptoki-assigned value that /* CK_SESSION_HANDLE is a Cryptoki-assigned value that
* identifies a session */ * identifies a session */
typedef CK_ULONG CK_SESSION_HANDLE; typedef CK_UINT CK_SESSION_HANDLE;
typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR; typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR;
@ -310,7 +313,7 @@ typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
/* CK_OBJECT_HANDLE is a token-specific identifier for an /* CK_OBJECT_HANDLE is a token-specific identifier for an
* object */ * object */
typedef CK_ULONG CK_OBJECT_HANDLE; typedef CK_UINT CK_OBJECT_HANDLE;
typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR; typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;