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

Merge branch 'master' of github.com:FreeRDP/FreeRDP

This commit is contained in:
Marc-André Moreau 2013-01-19 19:45:12 -05:00
parent 49ee48e8d0 888fcf8d47
commit f38bc6d393
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/core/capabilities.c
View File

@ -2303,6 +2303,10 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings)
rdp_write_frame_acknowledge_capability_set(s, settings);
}
}
else
{
settings->FrameAcknowledge = 0;
}
if (settings->ReceivedCapabilities[CAPSET_TYPE_BITMAP_CACHE_V3_CODEC_ID])
{

7
libfreerdp/core/certificate.c
View File

@ -531,10 +531,13 @@ BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate,
DEBUG_CERTIFICATE("License Server Certificate");
ret = certificate_read_x509_certificate(&certificate->x509_cert_chain->array[i], &cert_info);
DEBUG_LICENSE("modulus length:%d", (int) cert_info.ModulusLength);
if(cert_info.Modulus)
if (cert_info.Modulus)
free(cert_info.Modulus);
if(!ret)
if (!ret) {
printf("failed to read License Server, content follows:\n");
winpr_HexDump(certificate->x509_cert_chain->array[i].data, certificate->x509_cert_chain->array[i].length);
return FALSE;
}
}
else if (numCertBlobs - i == 1)
{

9
libfreerdp/core/update.c
View File

@ -513,9 +513,12 @@ static void update_send_frame_acknowledge(rdpContext* context, UINT32 frameId)
STREAM* s;
rdpRdp* rdp = context->rdp;
s = rdp_data_pdu_init(rdp);
stream_write_UINT32(s, frameId);
//rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FRAME_ACKNOWLEDGE, rdp->mcs->user_id);
if (rdp->settings->ReceivedCapabilities[CAPSET_TYPE_FRAME_ACKNOWLEDGE])
{
s = rdp_data_pdu_init(rdp);
stream_write_UINT32(s, frameId);
rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FRAME_ACKNOWLEDGE, rdp->mcs->user_id);
}
}
static void update_send_synchronize(rdpContext* context)

8
libfreerdp/crypto/ber.c
View File

@ -21,6 +21,7 @@
#include "config.h"
#endif
#include <stdio.h>
#include <freerdp/crypto/ber.h>
BOOL ber_read_length(STREAM* s, int* length)
@ -372,7 +373,7 @@ BOOL ber_read_integer(STREAM* s, UINT32* value)
if (value == NULL)
{
// even if we don't care the integer value, check the announced size
if(length < 1 || length > 4)
if(length < 1 || length > 8)
return FALSE;
stream_seek(s, length);
return TRUE;
@ -391,6 +392,11 @@ BOOL ber_read_integer(STREAM* s, UINT32* value)
}
else if (length == 4)
stream_read_UINT32_be(s, *value);
else if (length == 8)
{
printf("%s: should implement reading an 8 bytes integer\n", __func__);
return FALSE;
}
else
return FALSE;