diff --git a/src/syncterm/st_crypt.h b/src/syncterm/st_crypt.h index e870e81d711a9f8e9a19e54b6758400535f3c762..799ed951a5f950255efdd3afb621c7930c044353 100644 --- a/src/syncterm/st_crypt.h +++ b/src/syncterm/st_crypt.h @@ -9,46 +9,34 @@ #define CRYPT_ATTRIBUTE_ERRORMESSAGE CRYPT_ATTRIBUTE_INT_ERRORMESSAGE #endif -#if defined(_MSC_VER) || defined(__MSVCRT__) - #undef C_RET - #define C_RET int -#endif - -#ifdef _WIN32 - #define HACK_HACK_HACK __stdcall -#else - #define HACK_HACK_HACK -#endif - struct crypt_funcs { - C_RET (HACK_HACK_HACK *PopData)( C_IN CRYPT_HANDLE envelope, C_OUT void C_PTR buffer, + int (*PopData)( C_IN CRYPT_HANDLE envelope, C_OUT void C_PTR buffer, C_IN int length, C_OUT int C_PTR bytesCopied ); - C_RET (HACK_HACK_HACK *PushData)( C_IN CRYPT_HANDLE envelope, C_IN void C_PTR buffer, + int (*PushData)( C_IN CRYPT_HANDLE envelope, C_IN void C_PTR buffer, C_IN int length, C_OUT int C_PTR bytesCopied ); - C_RET (HACK_HACK_HACK *FlushData)( C_IN CRYPT_HANDLE envelope ); - C_RET (HACK_HACK_HACK *Init)( void ); - C_RET (HACK_HACK_HACK *End)( void ); - C_RET (HACK_HACK_HACK *CreateSession)( C_OUT CRYPT_SESSION C_PTR session, + int (*FlushData)( C_IN CRYPT_HANDLE envelope ); + int (*Init)( void ); + int (*End)( void ); + int (*CreateSession)( C_OUT CRYPT_SESSION C_PTR session, C_IN CRYPT_USER cryptUser, C_IN CRYPT_SESSION_TYPE formatType ); - C_RET (HACK_HACK_HACK *GetAttribute)( C_IN CRYPT_HANDLE cryptHandle, + int (*GetAttribute)( C_IN CRYPT_HANDLE cryptHandle, C_IN CRYPT_ATTRIBUTE_TYPE attributeType, C_OUT int C_PTR value ); - C_RET (HACK_HACK_HACK *GetAttributeString)( C_IN CRYPT_HANDLE cryptHandle, + int (*GetAttributeString)( C_IN CRYPT_HANDLE cryptHandle, C_IN CRYPT_ATTRIBUTE_TYPE attributeType, C_OUT void C_PTR value, C_OUT int C_PTR valueLength ); - C_RET (HACK_HACK_HACK *SetAttribute)( C_IN CRYPT_HANDLE cryptHandle, + int (*SetAttribute)( C_IN CRYPT_HANDLE cryptHandle, C_IN CRYPT_ATTRIBUTE_TYPE attributeType, C_IN int value ); - C_RET (HACK_HACK_HACK *SetAttributeString)( C_IN CRYPT_HANDLE cryptHandle, + int (*SetAttributeString)( C_IN CRYPT_HANDLE cryptHandle, C_IN CRYPT_ATTRIBUTE_TYPE attributeType, C_IN void C_PTR value, C_IN int valueLength ); - C_RET (HACK_HACK_HACK *DestroySession)( C_IN CRYPT_SESSION session ); - C_RET (HACK_HACK_HACK *AddRandom)( C_IN void C_PTR randomData, C_IN int randomDataLength ); + int (*DestroySession)( C_IN CRYPT_SESSION session ); + int (*AddRandom)( C_IN void C_PTR randomData, C_IN int randomDataLength ); }; -#undef HACK_HACK_HACK #endif extern struct crypt_funcs cl;