summaryrefslogtreecommitdiffstats
path: root/rdp/rdp_sec.c
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2006-04-29 01:47:06 +0000
committerjsorg71 <jsorg71>2006-04-29 01:47:06 +0000
commit770a27bfb39a64cb742f73156cfb1071fe8fd603 (patch)
treee65373df2434b8c6718f82bc9a8f7430bb863111 /rdp/rdp_sec.c
parentb1b3ff9e7d31da5fbfeedd3df8e40be240112f9c (diff)
downloadxrdp-proprietary-770a27bfb39a64cb742f73156cfb1071fe8fd603.tar.gz
xrdp-proprietary-770a27bfb39a64cb742f73156cfb1071fe8fd603.zip
printf -> writeln
Diffstat (limited to 'rdp/rdp_sec.c')
-rw-r--r--rdp/rdp_sec.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/rdp/rdp_sec.c b/rdp/rdp_sec.c
index 1fca5141..881d4af7 100644
--- a/rdp/rdp_sec.c
+++ b/rdp/rdp_sec.c
@@ -138,14 +138,14 @@ rdp_sec_recv(struct rdp_sec* self, struct stream* s, int* chan)
{
int flags;
- DEBUG((" in rdp_sec_recv\r\n"));
+ DEBUG((" in rdp_sec_recv"));
if (rdp_mcs_recv(self->mcs_layer, s, chan) != 0)
{
- DEBUG((" error in rdp_sec_recv, rdp_mcs_recv failed\r\n"));
+ DEBUG((" error in rdp_sec_recv, rdp_mcs_recv failed"));
return 1;
}
in_uint32_le(s, flags);
- DEBUG((" rdp_sec_recv flags %8.8x\r\n", flags));
+ DEBUG((" rdp_sec_recv flags %8.8x", flags));
if (flags & SEC_ENCRYPT) /* 0x08 */
{
in_uint8s(s, 8); /* signature */
@@ -153,11 +153,11 @@ rdp_sec_recv(struct rdp_sec* self, struct stream* s, int* chan)
}
if (flags & SEC_LICENCE_NEG) /* 0x80 */
{
- DEBUG((" in rdp_sec_recv, got SEC_LICENCE_NEG\r\n"));
+ DEBUG((" in rdp_sec_recv, got SEC_LICENCE_NEG"));
rdp_lic_process(self->lic_layer, s);
*chan = 0;
}
- DEBUG((" out rdp_sec_recv\r\n"));
+ DEBUG((" out rdp_sec_recv"));
return 0;
}
@@ -297,7 +297,7 @@ rdp_sec_parse_crypt_info(struct rdp_sec* self, struct stream* s,
in_uint16_le(s, tag);
in_uint16_le(s, length);
next_tag = s->p + length;
- DEBUG((" rdp_sec_parse_crypt_info tag %d length %d\r\n", tag, length));
+ DEBUG((" rdp_sec_parse_crypt_info tag %d length %d", tag, length));
switch (tag)
{
case SEC_TAG_PUBKEY:
@@ -398,8 +398,8 @@ rdp_sec_generate_keys(struct rdp_sec* self)
self->server_random);
rdp_sec_hash_16(self->encrypt_key, session_key + 32, self->client_random,
self->server_random);
- DEBUG((" rdp_sec_generate_keys, rc4_key_size is %d\r\n", self->rc4_key_size));
- DEBUG((" rdp_sec_generate_keys, crypt_level is %d\r\n", self->crypt_level));
+ DEBUG((" rdp_sec_generate_keys, rc4_key_size is %d", self->rc4_key_size));
+ DEBUG((" rdp_sec_generate_keys, crypt_level is %d", self->crypt_level));
if (self->rc4_key_size == 1)
{
rdp_sec_make_40bit(self->sign_key);
@@ -430,7 +430,7 @@ rdp_sec_process_crypt_info(struct rdp_sec* self, struct stream* s)
g_memset(exponent, 0, sizeof(exponent));
if (!rdp_sec_parse_crypt_info(self, s, modulus, exponent))
{
- DEBUG((" error in rdp_sec_process_crypt_info\r\n"));
+ DEBUG((" error in rdp_sec_process_crypt_info"));
return;
}
/* Generate a client random, and determine encryption keys */
@@ -463,7 +463,7 @@ rdp_sec_process_mcs_data(struct rdp_sec* self)
{
in_uint16_le(s, tag);
in_uint16_le(s, length);
- DEBUG((" rdp_sec_process_mcs_data tag %d length %d\r\n", tag, length));
+ DEBUG((" rdp_sec_process_mcs_data tag %d length %d", tag, length));
if (length <= 4)
{
return;
@@ -496,7 +496,7 @@ rdp_sec_establish_key(struct rdp_sec* self)
int flags;
struct stream* s;
- DEBUG((" sending client random\r\n"));
+ DEBUG((" sending client random"));
make_stream(s);
init_stream(s, 8192);
length = SEC_MODULUS_SIZE + SEC_PADDING_SIZE;
@@ -524,20 +524,20 @@ rdp_sec_establish_key(struct rdp_sec* self)
int APP_CC
rdp_sec_connect(struct rdp_sec* self, char* ip, char* port)
{
- DEBUG((" in rdp_sec_connect\r\n"));
+ DEBUG((" in rdp_sec_connect"));
rdp_sec_out_mcs_data(self);
if (rdp_mcs_connect(self->mcs_layer, ip, port) != 0)
{
- DEBUG((" out rdp_sec_connect error rdp_mcs_connect failed\r\n"));
+ DEBUG((" out rdp_sec_connect error rdp_mcs_connect failed"));
return 1;
}
rdp_sec_process_mcs_data(self);
if (rdp_sec_establish_key(self) != 0)
{
- DEBUG((" out rdp_sec_connect error rdp_sec_establish_key failed\r\n"));
+ DEBUG((" out rdp_sec_connect error rdp_sec_establish_key failed"));
return 1;
}
- DEBUG((" out rdp_sec_connect\r\n"));
+ DEBUG((" out rdp_sec_connect"));
return 0;
}
@@ -627,7 +627,7 @@ rdp_sec_send(struct rdp_sec* self, struct stream* s, int flags)
{
int datalen;
- DEBUG((" in rdp_sec_send flags %8.8x\r\n", flags));
+ DEBUG((" in rdp_sec_send flags %8.8x", flags));
s_pop_layer(s, sec_hdr);
out_uint32_le(s, flags);
if (flags & SEC_ENCRYPT)
@@ -639,9 +639,9 @@ rdp_sec_send(struct rdp_sec* self, struct stream* s, int flags)
}
if (rdp_mcs_send(self->mcs_layer, s) != 0)
{
- DEBUG((" out rdp_sec_send, rdp_mcs_send failed\r\n"));
+ DEBUG((" out rdp_sec_send, rdp_mcs_send failed"));
return 1;
}
- DEBUG((" out rdp_sec_send\r\n"));
+ DEBUG((" out rdp_sec_send"));
return 0;
}