Debug message cleanup.

diff --git a/rdp.c b/rdp.c
index 4ea369807335fc929a60c15ee8037b632c2a41ef..bcb1bd8c05f445b20b0441ce02d0a040e765603a 100644 (file)
--- a/rdp.c
+++ b/rdp.c
@@ -72,7 +72,7 @@ rdp_recv(uint8 * type)
 
 #if WITH_DEBUG
        DEBUG(("RDP packet #%d, (type %x, length %u)\n", ++g_packetno, *type, length));
-       //hexdump(g_next_packet, length);
+       hexdump(g_next_packet, length);
 #endif /*  */
 
        g_next_packet += length;

diff --git a/rdp5.c b/rdp5.c
index ac544b882b0e8a8186268364c4ef5a2ac3650967..e8fd59749ab8a86278be0b35c3bbc59792427d03 100644 (file)
--- a/rdp5.c
+++ b/rdp5.c
@@ -119,7 +119,7 @@ rdp5_process(STREAM s, BOOL encryption)
                                break;
                        }
                        default:
-                               printf("Unimplemented RDP5 opcode %d (len=%u)\n", type, length);
+                               printf("Unimplemented RDP5 opcode %d\n", type);
                                return;
                }
        }

diff --git a/secure.c b/secure.c
index 1f7797b023e73fc05601a09ad89dfe9fbc8d0ebf..45cebf02a0ff3c4283153ce74ea4ee33230a8c19 100644 (file)
--- a/secure.c
+++ b/secure.c
@@ -266,8 +266,6 @@ sec_encrypt(uint8 * data, int length)
                use_count = 0;
        }
 
-       printf("RC4-ing %u bytes with DECRYPT, uc=%u\n", length, use_count);
-
        RC4(&rc4_decrypt_key, length, data, data);
        use_count++;
 }
@@ -847,11 +845,9 @@ sec_recv(void)
                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);
                        }
@@ -860,7 +856,6 @@ sec_recv(void)
                        {
                                uint8 tag;
                                in_uint8(s, tag);
-                               printf("SEC_LICENSE_NEG tag %x\n", tag);
                                
                                if (tag == LICENCE_TAG_PRESENT) {
                                        process_presented_license(s);
@@ -875,7 +870,6 @@ sec_recv(void)
                                        
                                        {
                                                STREAM s;
-                                               printf("Sending DEMAND_ACTIVE (0x%x bytes)\n", sizeof(demand_active));
                                                s = sec_init(SEC_ENCRYPT, sizeof(demand_active));
                                                out_uint8p(s, demand_active, sizeof(demand_active));
                                                s_mark_end(s);
@@ -888,7 +882,6 @@ sec_recv(void)
 
                        if (sec_flags & SEC_LOGON_INFO) 
                        {
-                               printf("Received logon packet!\n");
                                rdp_get_logon_info(s);
                        
                                // demand a license
@@ -909,7 +902,6 @@ sec_recv(void)
                                uint8 inr[SEC_MODULUS_SIZE];
                                int i;
                                
-                               printf("Receiving the client random!\n");
                                in_uint32_le(s, length);
                                if (length != SEC_MODULUS_SIZE + SEC_PADDING_SIZE) {
                                        error("Client random was wrong size, %u bytes\n", length);