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

[server,proxy] allow PEM in config file

Browse Source 
CertificateContent and PrivateKeyContent now have two valid formats:
It can be in format PEM (multiple lines) or a single line base64 encoded
PEM.
The first format is preferrable in case the pf_config* API is used to
set the certificate/key,  the latter in case an actual config file is in
use where multiline configuration data can not be directly entered.
This commit is contained in:
Armin Novak 2023-04-24 08:41:20 +02:00 committed by Martin Fleisz
parent 58cdc9e82b
commit c1cd48cb3c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/proxy/pf_config.c
View File

@ -390,6 +390,9 @@ static BOOL pf_config_load_gfx_settings(wIniFile* ini, proxyConfig* config)
static char* pf_config_decode_base64(const char* data, const char* name, size_t* pLength) static char* pf_config_decode_base64(const char* data, const char* name, size_t* pLength)
{ {
const char cert_header[27] = "-----BEGIN CERTIFICATE-----";
const char key_header[27] = "-----BEGIN PRIVATE KEY-----";
size_t decoded_length = 0; size_t decoded_length = 0;
char* decoded = NULL; char* decoded = NULL;
if (!data) if (!data)
@ -402,6 +405,13 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t*
WINPR_ASSERT(pLength); WINPR_ASSERT(pLength);
const size_t length = strlen(data); const size_t length = strlen(data);
if ((strncmp(data, cert_header, ARRAYSIZE(cert_header)) == 0) ||
(strncmp(data, key_header, ARRAYSIZE(key_header)) == 0))
{
*pLength = length + 1;
return _strdup(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)
{ {