Debug message cleanup.

[rdpsrv] / secure.c

diff --git a/secure.c b/secure.c
index 4a16ceaec2cbbc0f2605f908d03a45cab060f63c..45cebf02a0ff3c4283153ce74ea4ee33230a8c19 100644 (file)
--- a/secure.c
+++ b/secure.c
@@ -39,12 +39,12 @@ extern uint16 mcs_userid;
 extern VCHANNEL g_channels[];
 extern unsigned int g_num_channels;
 
-static int rc4_key_len;
+int rc4_key_len;
 static RC4_KEY rc4_decrypt_key;
 static RC4_KEY rc4_encrypt_key;
 static RSA *server_public_key;
 
-static uint8 sec_sign_key[16];
+uint8 sec_sign_key[16];
 static uint8 sec_decrypt_key[16];
 static uint8 sec_encrypt_key[16];
 static uint8 sec_decrypt_update_key[16];
@@ -254,7 +254,7 @@ sec_update(uint8 * key, uint8 * update_key)
 }
 
 /* Encrypt data using RC4 */
-static void
+void
 sec_encrypt(uint8 * data, int length)
 {
        static int use_count;
@@ -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);