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

Merge pull request #350 from pjd/fixes

Browse Source 
Fixes
This commit is contained in:
Marc-André Moreau 2012-01-17 12:02:57 -08:00
commit 75a2988600
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp-core/certificate.c
View File

@ -279,7 +279,7 @@ boolean certificate_read_server_proprietary_certificate(rdpCertificate* certific
stream_read_uint32(s, dwSigAlgId); stream_read_uint32(s, dwSigAlgId);
stream_read_uint32(s, dwKeyAlgId); stream_read_uint32(s, dwKeyAlgId);
if (!(dwSigAlgId == 1 && dwKeyAlgId == 1)) if (!(dwSigAlgId == SIGNATURE_ALG_RSA && dwKeyAlgId == KEY_EXCHANGE_ALG_RSA))
{ {
printf("certificate_read_server_proprietary_certificate: parse error 1\n"); printf("certificate_read_server_proprietary_certificate: parse error 1\n");
return false; return false;

3
libfreerdp-core/certificate.h
View File

@ -36,6 +36,9 @@
#define CERT_PERMANENTLY_ISSUED 0x00000000 #define CERT_PERMANENTLY_ISSUED 0x00000000
#define CERT_TEMPORARILY_ISSUED 0x80000000 #define CERT_TEMPORARILY_ISSUED 0x80000000
#define SIGNATURE_ALG_RSA 0x00000001
#define KEY_EXCHANGE_ALG_RSA 0x00000001
#define BB_RSA_KEY_BLOB 6 #define BB_RSA_KEY_BLOB 6
#define BB_RSA_SIGNATURE_BLOB 8 #define BB_RSA_SIGNATURE_BLOB 8

2
libfreerdp-core/connection.c
View File

@ -480,7 +480,7 @@ boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s)
ret = transport_accept_nla(rdp->transport); ret = transport_accept_nla(rdp->transport);
else if (rdp->nego->selected_protocol & PROTOCOL_TLS) else if (rdp->nego->selected_protocol & PROTOCOL_TLS)
ret = transport_accept_tls(rdp->transport); ret = transport_accept_tls(rdp->transport);
else if (rdp->nego->selected_protocol & PROTOCOL_RDP) else if (rdp->nego->selected_protocol == PROTOCOL_RDP) /* 0 */
ret = transport_accept_rdp(rdp->transport); ret = transport_accept_rdp(rdp->transport);
if (!ret) if (!ret)