kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autodetect RDP4-style or X.509 exchange (RDP5 still uses the earlier

Browse Source 
if you don't have a licence server).


git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@362 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman 2003-04-16 08:03:59 +00:00
parent 7e7560d205
commit 748a2b7485
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
secure.c
View File

@ -538,7 +538,7 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
uint8 ** server_random, uint8 ** modulus, uint8 ** exponent)
{
uint32 crypt_level, random_len, rsa_info_len;
uint32 cacert_len, cert_len;
uint32 cacert_len, cert_len, flags;
X509 *cacert, *server_cert;
uint16 tag, length;
uint8 *next_tag, *end;
@ -563,10 +563,11 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
if (end > s->end)
return False;
if (!use_rdp5 || 1 == server_rdp_version)
in_uint32_le(s, flags); /* 1 = RDP4-style, 0x80000002 = X.509 */
if (flags & 1)
{
DEBUG_RDP5(("We're going for the RDP4-style encryption\n"));
in_uint8s(s, 12); /* unknown */
in_uint8s(s, 8); /* unknown */
while (s->p < end)
{
@ -598,10 +599,10 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
s->p = next_tag;
}
}
else if (4 == server_rdp_version)
else
{
DEBUG_RDP5(("We're going for the RDP5-style encryption\n"));
in_uint8s(s, 8); /* Unknown */
in_uint8s(s, 4); /* Number of certificates */
/* Do da funky X.509 stuffy
@ -653,11 +654,6 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
}
return True; /* There's some garbage here we don't care about */
}
else
{
error("Unknown Server RDP version %d", server_rdp_version);
return False;
}
return s_check_end(s);
}