mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some debugging messages

Browse Source
This commit is contained in:
Jay Sorg 2011-09-14 21:37:37 -07:00
parent 405026575b
commit fa4aa9f297
5 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfreerdp-core/capabilities.c
View File

@ -1522,7 +1522,6 @@ boolean rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 number
{
stream_get_mark(s, bm);
freerdp_hexdump(s->p, 4);
rdp_read_capability_set_header(s, &length, &type);
//printf("%s Capability Set (0x%02X), length:%d\n", CAPSET_TYPE_STRINGS[type], type, length);
settings->received_caps[type] = True;
@ -1530,7 +1529,7 @@ boolean rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 number
if (stream_get_left(s) < length - 4)
{
printf("stream problem\n");
printf("error processing stream\n");
return False;
}

12
libfreerdp-core/connection.c
View File

@ -156,7 +156,6 @@ static boolean rdp_establish_keys(rdpRdp* rdp)
uint32 length;
STREAM* s;
printf("rdp_establish_keys:\n");
if (rdp->settings->encryption == False)
{
/* no RDP encryption */
@ -167,15 +166,10 @@ static boolean rdp_establish_keys(rdpRdp* rdp)
memset(crypt_client_random, 0, sizeof(crypt_client_random));
memset(client_random, 0x5e, 32);
crypto_nonce(client_random, 32);
printf("client random\n");
freerdp_hexdump(client_random, 32);
key_len = rdp->settings->server_cert->cert_info.modulus.length;
printf("key_len %d %d %d\n", key_len, rdp->mcs->user_id, MCS_BASE_CHANNEL_ID);
mod = rdp->settings->server_cert->cert_info.modulus.data;
exp = rdp->settings->server_cert->cert_info.exponent;
crypto_rsa_encrypt(client_random, 32, key_len, mod, exp, crypt_client_random);
printf("client crypt random\n");
freerdp_hexdump(crypt_client_random, key_len);
/* send crypt client random to server */
length = 7 + 8 + 4 + 4 + key_len + 8;
@ -207,12 +201,6 @@ static boolean rdp_establish_keys(rdpRdp* rdp)
rdp->rc4_decrypt_key = crypto_rc4_init(rdp->settings->decrypt_key, rdp->settings->rc4_key_len);
rdp->rc4_encrypt_key = crypto_rc4_init(rdp->settings->encrypt_key, rdp->settings->rc4_key_len);
printf("key_len %d\n", rdp->settings->rc4_key_len);
printf("decrypt_key\n");
freerdp_hexdump(rdp->settings->decrypt_key, rdp->settings->rc4_key_len);
printf("encrypt_key\n");
freerdp_hexdump(rdp->settings->encrypt_key, rdp->settings->rc4_key_len);
rdp->do_crypt = True;
return True;

1
libfreerdp-core/gcc.c
View File

@ -792,7 +792,6 @@ boolean gcc_read_server_security_data(STREAM* s, rdpSettings *settings)
freerdp_blob_alloc(&settings->server_random, serverRandomLen);
memcpy(settings->server_random.data, s->p, serverRandomLen);
stream_seek(s, serverRandomLen);
freerdp_hexdump(settings->server_random.data, settings->server_random.length);
}
else
{

4
libfreerdp-core/rdp.c
View File

@ -310,7 +310,6 @@ boolean rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id)
uint32 sec_bytes;
uint8* sec_hold;
printf("rdp_send:\n");
length = stream_get_length(s);
stream_set_pos(s, 0);
@ -536,12 +535,9 @@ boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length)
{
int cryptlen;
//printf("rdp_decrypt:\n");
stream_seek(s, 8); /* signature */
cryptlen = length - 8;
//printf("length %d cryptlen %d\n", length, cryptlen);
security_decrypt(s->p, cryptlen, rdp);
//freerdp_hexdump(s->p, cryptlen);
return True;
}

5
libfreerdp-core/security.c
View File

@ -199,13 +199,8 @@ boolean security_establish_keys(uint8* client_random, rdpSettings* settings)
uint8* server_random;
uint8 salt40[] = { 0xD1, 0x26, 0x9E };
printf("security_establish_keys:\n");
server_random = settings->server_random.data;
freerdp_hexdump(client_random, 32);
freerdp_hexdump(server_random, 32);
memcpy(pre_master_secret, client_random, 24);
memcpy(pre_master_secret + 24, server_random, 24);