mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[server,proxy] improve error message for invalid base64

Browse Source 
If the certificate or private key are supplied as base64 encoded string
inform what happened before aborting.
This commit is contained in:
akallabeth 2023-04-14 14:21:22 +02:00 committed by David Fort
parent eb20b4ad5f
commit c3f6b665cc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/proxy/pf_config.c
View File

@ -393,7 +393,10 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t*
size_t decoded_length = 0; size_t decoded_length = 0;
char* decoded = NULL; char* decoded = NULL;
if (!data) if (!data)
{
WLog_ERR(TAG, "Invalid base64 data [%p] for %s", data, name);
return NULL; return NULL;
}
WINPR_ASSERT(name); WINPR_ASSERT(name);
WINPR_ASSERT(pLength); WINPR_ASSERT(pLength);
@ -401,7 +404,11 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t*
const size_t length = strlen(data); const size_t length = strlen(data);
crypto_base64_decode(data, length, (BYTE**)&decoded, &decoded_length); crypto_base64_decode(data, length, (BYTE**)&decoded, &decoded_length);
if (!decoded || decoded_length == 0) if (!decoded || decoded_length == 0)
WLog_ERR(TAG, "Failed to decode base64 data from %s of length %" PRIuz, name, length); {
WLog_ERR(TAG, "Failed to decode base64 data of length %" PRIuz " for %s", length, name);
free(decoded);
return NULL;
}
WINPR_ASSERT(strnlen(decoded, decoded_length) == decoded_length - 1); WINPR_ASSERT(strnlen(decoded, decoded_length) == decoded_length - 1);
*pLength = decoded_length; *pLength = decoded_length;
return decoded; return decoded;