morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,ncrypt] fix convertKeyType

Browse Source 
* use _wcsnlen
* fix inverted length check
This commit is contained in:
akallabeth
2024-12-31 20:07:23 +01:00
parent b94411b79e
commit 1644b96875
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
View File

@@ -486,10 +486,12 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
static BOOL convertKeyType(CK_KEY_TYPE k, LPWSTR dest, DWORD len, DWORD* outlen)
{
const WCHAR* r = NULL;
size_t retLen = 0;
#define ALGO_CASE(V, S) \
case V: \
r = S; \
#define ALGO_CASE(V, S) \
case V: \
r = S; \
retLen = _wcsnlen((S), ARRAYSIZE((S))); \
break
switch (k)
{
@@ -522,7 +524,6 @@ static BOOL convertKeyType(CK_KEY_TYPE k, LPWSTR dest, DWORD len, DWORD* outlen)
}
#undef ALGO_CASE
size_t retLen = _wcslen(r);
if (retLen > UINT32_MAX)
return FALSE;
@@ -537,7 +538,7 @@ static BOOL convertKeyType(CK_KEY_TYPE k, LPWSTR dest, DWORD len, DWORD* outlen)
}
else
{
if (retLen + 1 < len)
if (retLen + 1 > len)
{
WLog_ERR(TAG, "target buffer is too small for algo name");
return FALSE;