Go to 40-bit encryption, and ignore junk at end of logon packets. This makes us under...

diff --git a/mcs.c b/mcs.c
index e771a074a7dd65ce2bd1de0f15e0e228673fe0db..6c5bbb77ef4e3209de3dca695d520dd92a8e7499 100644 (file)
--- a/mcs.c
+++ b/mcs.c
@@ -370,7 +370,7 @@ mcs_send_connect_response()
        // crypto info
        out_uint16_le(s, SEC_TAG_SRV_CRYPT);
        out_uint16_le(s, 84 + sizeof(cacert) + sizeof(server_cert)); // length
        // crypto info
        out_uint16_le(s, SEC_TAG_SRV_CRYPT);
        out_uint16_le(s, 84 + sizeof(cacert) + sizeof(server_cert)); // length

-       out_uint32_le(s, 8); // 128-bit
+       out_uint32_le(s, 1); // 128-bit

        out_uint32_le(s, 2); // medium
 
        out_uint32_le(s, SEC_RANDOM_SIZE); // random_len
        out_uint32_le(s, 2); // medium
 
        out_uint32_le(s, SEC_RANDOM_SIZE); // random_len

diff --git a/rdp.c b/rdp.c
index 39d2ce8eeb2b3dbe9efd540fb0dff885ea3cb566..e8e69cd0a2f2bbe5472a7a9141374f210b0c900d 100644 (file)
--- a/rdp.c
+++ b/rdp.c
@@ -275,8 +275,9 @@ rdp_get_logon_info(STREAM s)
                printf("directory='%s'\n", directory);
        }
 
                printf("directory='%s'\n", directory);
        }
 

-       if (!s_check_end(s))
-               error("Unknown data at end of logon packet!\n");
+       if (!s_check_end(s)) {
+               printf("Unknown data at end of logon packet!\n");
+       }

 }
 
 /* Send a control PDU */
 }
 
 /* Send a control PDU */

diff --git a/secure.c b/secure.c
index 51e5f84c22062d965d3f6ea21a87ba34abd93049..3d0a42cf55c3c78b9b9664086e899299ed41cd15 100644 (file)
--- a/secure.c
+++ b/secure.c
@@ -763,6 +763,7 @@ sec_recv(void)
                        {
                                printf("Received logon packet!\n");
                                rdp_get_logon_info(s);
                        {
                                printf("Received logon packet!\n");
                                rdp_get_logon_info(s);

+                               continue;

                        }
 
                        if (sec_flags & SEC_CLIENT_RANDOM) {
                        }
 
                        if (sec_flags & SEC_CLIENT_RANDOM) {


@@ -794,7 +795,7 @@ sec_recv(void)
                                printf("\n");
 
                                // now we can generate the keys
                                printf("\n");
 
                                // now we can generate the keys

-                               sec_generate_keys(inr + SEC_RANDOM_SIZE, cacert, 8);
+                               sec_generate_keys(inr + SEC_RANDOM_SIZE, cacert, 1);

                                continue;
                        }
                }
                                continue;
                        }
                }