Fixed (?) and enabled RDP5 encryption.

diff --git a/rdp.c b/rdp.c
index 538e053ae821ea14f089036fd2c40c32aaf4dc02..4ea369807335fc929a60c15ee8037b632c2a41ef 100644 (file)
--- a/rdp.c
+++ b/rdp.c
@@ -154,7 +154,7 @@ void rdp_send_bitmap_update(unsigned x, unsigned y, unsigned width, unsigned hei
 
        int length = 10*2 + width*height*3 + 5;
 
-       s = rdp5_init(length, 0);
+       s = rdp5_init(length, 1);
 
        out_uint8(s, 1); // process bitmap update
        out_uint16_le(s, 10*2 + width*height*3 + 2); // RDP5 chunk length
@@ -174,7 +174,7 @@ void rdp_send_bitmap_update(unsigned x, unsigned y, unsigned width, unsigned hei
        out_uint8p(s, data, width*height*3);
        
        s_mark_end(s);
-       rdp5_send(s, 0);
+       rdp5_send(s, 1);
 }
 
 #define EXPECT16(value) { in_uint16_le(s, unknown); if (unknown != (value)) printf("Unknown value on code line %u; expected 0x%x, got 0x%x\n", __LINE__, (value), unknown); }

diff --git a/rdp5.c b/rdp5.c
index 1612643de0bf497390679563be8eb812b39e80fe..ac544b882b0e8a8186268364c4ef5a2ac3650967 100644 (file)
--- a/rdp5.c
+++ b/rdp5.c
@@ -55,7 +55,7 @@ rdp5_send(STREAM s, BOOL encryption)
        out_uint8(s, datalen & 0xff);
 
        if (encryption) {
-               datalen -= 8;
+               datalen -= 11;
 
                sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8, datalen);
                sec_encrypt(s->p + 8, datalen);