Added comment about TAG_SRV_SRV_3. And some debug output.
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@418 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
ebdb982a1f
commit
f335405bc5
12
channels.c
12
channels.c
@ -29,6 +29,18 @@ get_num_channels(void)
|
|||||||
return num_channels;
|
return num_channels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* FIXME: We should use the information in TAG_SRV_SRV_3 to map RDP5
|
||||||
|
channels to MCS channels.
|
||||||
|
|
||||||
|
The format of TAG_SRV_SRV_3 seems to be
|
||||||
|
|
||||||
|
global_channel_no (uint16le)
|
||||||
|
number_of_other_channels (uint16le)
|
||||||
|
..followed by uint16les for the other channels.
|
||||||
|
Might be a few (two) bytes of padding at the end.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
register_channel(char *name, uint32 flags, void (*callback) (STREAM, uint16))
|
register_channel(char *name, uint32 flags, void (*callback) (STREAM, uint16))
|
||||||
{
|
{
|
||||||
|
5
secure.c
5
secure.c
@ -640,6 +640,7 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
in_uint32_le(s, cacert_len);
|
in_uint32_le(s, cacert_len);
|
||||||
|
DEBUG_RDP5(("CA Certificate length is %d\n", cacert_len));
|
||||||
cacert = d2i_X509(NULL, &(s->p), cacert_len);
|
cacert = d2i_X509(NULL, &(s->p), cacert_len);
|
||||||
/* Note: We don't need to move s->p here - d2i_X509 is
|
/* Note: We don't need to move s->p here - d2i_X509 is
|
||||||
"kind" enough to do it for us */
|
"kind" enough to do it for us */
|
||||||
@ -660,6 +661,7 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
in_uint32_le(s, cert_len);
|
in_uint32_le(s, cert_len);
|
||||||
|
DEBUG_RDP5(("Certificate length is %d\n", cert_len));
|
||||||
server_cert = d2i_X509(NULL, &(s->p), cert_len);
|
server_cert = d2i_X509(NULL, &(s->p), cert_len);
|
||||||
if (NULL == server_cert)
|
if (NULL == server_cert)
|
||||||
{
|
{
|
||||||
@ -772,6 +774,9 @@ sec_process_mcs_data(STREAM s)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case SEC_TAG_SRV_3:
|
case SEC_TAG_SRV_3:
|
||||||
|
/* FIXME: We should parse this information and
|
||||||
|
use it to map RDP5 channels to MCS
|
||||||
|
channels */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SEC_TAG_SRV_CRYPT:
|
case SEC_TAG_SRV_CRYPT:
|
||||||
|
Loading…
Reference in New Issue
Block a user