mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-28 04:14:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[proxy,config] PEM length must contain '\0'

Browse Source
This commit is contained in:
Armin Novak 2023-05-08 14:04:08 +02:00 committed by David Fort
parent 01e4624ed7
commit 7212621eae
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/crypto/crypto.c
View File

@ -219,7 +219,7 @@ char* crypto_read_pem(const char* filename, size_t* plength)
goto fail;
if (plength)
*plength = (size_t)size;
*plength = (size_t)strnlen(pem, size);
fclose(fp);
return pem;

2
server/proxy/pf_config.c
View File

@ -480,6 +480,7 @@ static BOOL pf_config_load_certificates(wIniFile* ini, proxyConfig* config)
crypto_read_pem(config->CertificateFile, &config->CertificatePEMLength);
if (!config->CertificatePEM)
return FALSE;
config->CertificatePEMLength += 1;
}
tmp2 = pf_config_get_str(ini, section_certificates, key_cert_content, FALSE);
if (tmp2)
@ -526,6 +527,7 @@ static BOOL pf_config_load_certificates(wIniFile* ini, proxyConfig* config)
crypto_read_pem(config->PrivateKeyFile, &config->PrivateKeyPEMLength);
if (!config->PrivateKeyPEM)
return FALSE;
config->PrivateKeyPEMLength += 1;
}
tmp2 = pf_config_get_str(ini, section_certificates, key_private_key_content, FALSE);
if (tmp2)