mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[core,certificate] const correct write function

This commit is contained in:
akallabeth 2023-01-20 08:35:57 +01:00 committed by Martin Fleisz
parent 26c967a083
commit b69c00c448
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/core/certificate.c
View File

@ -807,35 +807,38 @@ BOOL certificate_read_server_certificate(rdpCertificate* certificate, const BYTE
return ret;
}
BOOL certificate_write_server_certificate(rdpCertificate* certificate, UINT32 dwVersion, wStream* s)
SSIZE_T certificate_write_server_certificate(const rdpCertificate* certificate, UINT32 dwVersion,
wStream* s)
{
BOOL ret;
const size_t start = Stream_GetPosition(s);
WINPR_ASSERT(certificate);
WINPR_ASSERT(s);
if (!Stream_EnsureRemainingCapacity(s, 4))
return FALSE;
return -1;
Stream_Write_UINT32(s, dwVersion); /* dwVersion (4 bytes) */
switch (dwVersion & CERT_CHAIN_VERSION_MASK)
{
case CERT_CHAIN_VERSION_1:
ret = certificate_write_server_proprietary_certificate(certificate, s);
if (!certificate_write_server_proprietary_certificate(certificate, s))
return -1;
break;
case CERT_CHAIN_VERSION_2:
ret = certificate_write_server_x509_certificate_chain(certificate, s);
if (!certificate_write_server_x509_certificate_chain(certificate, s))
return -1;
break;
default:
WLog_ERR(TAG, "invalid certificate chain version:%" PRIu32 "",
dwVersion & CERT_CHAIN_VERSION_MASK);
ret = FALSE;
break;
return -1;
}
return ret;
const size_t end = Stream_GetPosition(s);
return end - start;
}
rdpRsaKey* key_new_from_content(const char* keycontent, const char* keyfile)

4
libfreerdp/core/certificate.h
View File

@ -47,8 +47,8 @@
FREERDP_LOCAL BOOL certificate_read_server_certificate(rdpCertificate* certificate,
const BYTE* server_cert, size_t length);
FREERDP_LOCAL BOOL certificate_write_server_certificate(rdpCertificate* certificate,
UINT32 dwVersion, wStream* s);
FREERDP_LOCAL SSIZE_T certificate_write_server_certificate(const rdpCertificate* certificate,
UINT32 dwVersion, wStream* s);
FREERDP_LOCAL rdpCertificate* certificate_clone(const rdpCertificate* certificate);

5
libfreerdp/core/license.c
View File

@ -2751,9 +2751,10 @@ BOOL license_server_configure(rdpLicense* license)
return FALSE;
else
{
BOOL r =
BOOL r = FALSE;
SSIZE_T res =
certificate_write_server_certificate(license->certificate, CERT_CHAIN_VERSION_2, s);
if (r)
if (res >= 0)
r = license_read_binary_blob_data(license->ServerCertificate, BB_CERTIFICATE_BLOB,
Stream_Buffer(s), Stream_GetPosition(s));