diff --git a/openrct2.common.props b/openrct2.common.props index d11b4e02f2..6c38bd49b4 100644 --- a/openrct2.common.props +++ b/openrct2.common.props @@ -53,7 +53,7 @@ C4549: 'operator': operator before comma has no effect; did you intend 'operator'? C4555: expression has no effect; expected expression with side-effect --> - __AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;__USE_CNG__;%(PreprocessorDefinitions) + __AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) MultiThreaded MultiThreadedDLL true @@ -61,7 +61,7 @@ /utf-8 /std:c++17 /permissive- /Zc:externConstexpr - wininet.lib;imm32.lib;version.lib;winmm.lib;crypt32.lib;wldap32.lib;shlwapi.lib;setupapi.lib;ncrypt.lib;%(AdditionalDependencies) + wininet.lib;imm32.lib;version.lib;winmm.lib;crypt32.lib;wldap32.lib;shlwapi.lib;setupapi.lib;bcrypt.lib;%(AdditionalDependencies) /OPT:NOLBR /ignore:4099 %(AdditionalOptions) diff --git a/src/openrct2/core/Crypt.CNG.cpp b/src/openrct2/core/Crypt.CNG.cpp index 72d9cdfe19..9803759d09 100644 --- a/src/openrct2/core/Crypt.CNG.cpp +++ b/src/openrct2/core/Crypt.CNG.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) // clang-format on @@ -617,12 +616,12 @@ public: { BCRYPT_PKCS1_PADDING_INFO paddingInfo{ BCRYPT_SHA256_ALGORITHM }; auto status = BCryptSignHash(hKey, &paddingInfo, pbHash, cbHash, NULL, 0, &cbSignature, BCRYPT_PAD_PKCS1); - CngThrowOnBadStatus("NCryptSignHash", status); + CngThrowOnBadStatus("BCryptSignHash", status); pbSignature = (PBYTE)HeapAlloc(GetProcessHeap(), 0, cbSignature); ThrowBadAllocOnNull(pbSignature); status = BCryptSignHash( hKey, &paddingInfo, pbHash, cbHash, pbSignature, cbSignature, &cbSignature, BCRYPT_PAD_PKCS1); - CngThrowOnBadStatus("NCryptSignHash", status); + CngThrowOnBadStatus("BCryptSignHash", status); auto result = std::vector(pbSignature, pbSignature + cbSignature); HeapFree(GetProcessHeap(), 0, pbSignature);