X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=secure.c;h=9147cbc21ba3b8903adc967866da4fa977af69e9;hb=63fa9a9043d4a58ee7994e669bcc566f09bc9e9b;hp=fd96936e09bebc0cff5a93cc52bb4dd9f38c2965;hpb=f7c77f1d801d69794ea81a97060f260a0af51e51;p=rdpsrv diff --git a/secure.c b/secure.c index fd96936..9147cbc 100644 --- a/secure.c +++ b/secure.c @@ -344,7 +344,7 @@ sec_send_to_channel(STREAM s, uint32 flags, uint16 channel) int datalen; s_pop_layer(s, sec_hdr); - //if (!g_licence_issued || (flags & SEC_ENCRYPT)) +// if (!g_licence_issued || (flags & SEC_ENCRYPT)) out_uint32_le(s, flags); if (flags & SEC_ENCRYPT) @@ -721,23 +721,33 @@ sec_recv(void) while ((s = mcs_recv(&channel)) != NULL) { - if (/*g_encryption || !g_licence_issued*/ 0) + if (/*g_encryption || !g_licence_issued*/ 1) { in_uint32_le(s, sec_flags); - + printf("sec_flags=%x\n", sec_flags); + if (sec_flags & SEC_ENCRYPT) { + printf("encrypt\n"); in_uint8s(s, 8); /* signature */ sec_decrypt(s->p, s->end - s->p); } if (sec_flags & SEC_LICENCE_NEG) { - licence_process(s); + printf("SEC_LICENSE_NEG unknown\n"); + //licence_process(s); continue; } + + if (sec_flags & SEC_LOGON_INFO) + { + printf("Received logon packet!\n"); + + } } + printf("Received MCS data on ch %u\n", channel); if (channel != MCS_GLOBAL_CHANNEL) { channel_process(s, channel);